Separated tasks from lectures

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@2 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414

9 files changed, 0 insertions, 194 deletions

diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/04.png b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/04.png
deleted file mode 100644
index 754c200..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/04.png
+++ /dev/null
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/09.png b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/09.png
deleted file mode 100644
index 866a51d..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/09.png
+++ /dev/null
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/10.png b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/10.png
deleted file mode 100644
index d6ccf42..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/10.png
+++ /dev/null
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/11.png b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/11.png
deleted file mode 100644
index 10b5ec7..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/11.png
+++ /dev/null
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/12.png b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/12.png
deleted file mode 100644
index 0a87ae6..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/12.png
+++ /dev/null
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/13.png b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/13.png
deleted file mode 100644
index e71474a..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/13.png
+++ /dev/null
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/17.png b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/17.png
deleted file mode 100644
index d4bba87..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/images/17.png
+++ /dev/null
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/si/index.html b/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/si/index.html
deleted file mode 100644
index 9b56a81..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/howtos/si/index.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<p>
-<h2>Namen vaje</h2>
-Naučite se, kako se nastavljajo omrežni vmesniki v večini sodobnih Linux distribucij (NetworkManager).
-</p>
-<p>
-<h2>Naloga na hitro</h2>
-Nastavi statičen IP v NetworkManager-ju, nastavi statični IP in DNS strežnik v /etc/network/interfaces. Oba naslova računalnikov in DNS strežnikov dobite ob zagonu run_test.py.
-</p>
-<p>
-<h2>Navodila</p>
-<ol>
-<li>Iz imenika s slikami virtualnih računalnikov povlecite slike maliNetworkManager, maliBrezNetworkManager, SimpleArbiterDhcp</li>
-
-<li>Nastavite omrežja navideznih računalnikov tako, da bo<br/>1. omrežni vmesnik SimpleArbiterDhcp povezan na isto omrežje kot edini omrežni vmesnik maliNetworkManager in maliBrezNetworkManager,<br/>
-  2. vmesnik SimpleArbiterDhcp bo povezan na NAT ali fizično omrežje, kjer prek DHCP dobi naslov in pot (prehod, gateway) do Interneta.</li>
-
-<li>Zaženite SimpleArbiterDhcp. Prijavite se kot uporabnik tester z geslom SedemKrogovPekla</li>
-<li>
-<img alt="slika-04" src="/sites/lusy.fri.uni-lj.si/files/public_files/courses/fri-courses/kpov/Vaje/03.predvaja/sshots/04_0.png" style="width: 800px; height: 600px;" /><br/>
-Z ukazom <pre>ping 193.2.1.66</pre> preverite, ali je SimpleArbiterDhcp na Internetu. Če je, boste približno vsako sekundo dobili odziv. Ping prekinete
-s kombinacijo tipk CTRL+C.<br/>
- Če SimpleArbiterDhcp ne pride do Interneta, v VirtualBox zamenjajte nastavitve 1. in 2. omrežni vmesnik ter ponovno zaženite navidezni računalnik.
-</li>
-<li>Poženite run_test.py.</li>
-
-<li>Kot ime naloge vpišite 03.predvaja</li>
-
-<li>Preberite statični IP maliNetworkManager. Pustite SimpleArbiterDhcp da teče v ozadju, dokler niste nastavili maliNetworkManager</li>
-
-<li>Zaženite maliNetworkManager.</li>
-
-<li>
-Prijavite se v grafično okolje z uporabniškim imenom student, geslom vaje</li>
-<li><img alt="ikona network manager" src="/sites/lusy.fri.uni-lj.si/files/public_files/courses/fri-courses/kpov/Vaje/03.predvaja/sshots/10.png" style="width: 800px; height: 600px;" /><br/>
-Desno-kliknite na ikono za mrežne nastavitve</br>
-
-<li>
-<img alt="Menu NetworkManager" src="/sites/lusy.fri.uni-lj.si/files/public_files/courses/fri-courses/kpov/Vaje/03.predvaja/sshots/11.png" style="width: 800px; height: 600px;" /><br/>
-Izberite "Edit Connections"</li>
-
-<li>
-<img alt="Menu NetworkManager" src="/sites/lusy.fri.uni-lj.si/files/public_files/courses/fri-courses/kpov/Vaje/03.predvaja/sshots/12.png" style="width: 800px; height: 600px;" /><br/>
-Kliknite "Edit"</li>
-
-<li>
-<img alt="Menu NetworkManager" src="/sites/lusy.fri.uni-lj.si/files/public_files/courses/fri-courses/kpov/Vaje/03.predvaja/sshots/13.png" style="width: 800px; height: 600px;" /><br/>
-V zavihku "IPv4" spremenite "Method" na "Manual". Kliknite na "Add". Nastavite statični IP, ki ste ga prebrali na SimpleArbiterDhcp kot statični IP A.<br/>
-V DNS servers dodajte naslov Arnesovega DNS: 193.2.1.66
-</li>
-<li>Kliknite "Save"</li>
-
-<li>Preklopite na SimpleArbiterDhcp. Pritisnite "Enter" oz. "OK".</li>
-
-<li>Preberite IP maliBrezNetworkManager. Pritisnite "OK". Preberite naslov DNS strežnika.</li>
-
-<li> Preklopite na maliBrezNetworkManager. Preklopite na prvo konzolo s kombinacijo CTRL+ALT+F1. Prijavite se kot root z geslom kaboom.</li>
-
-<li> Odprite datoteko /etc/network/interfaces. Popravite nastavitve v skladu s podatki, ki ste jih dobili na SimpleArbiter. Vnos za omrežni vmesnik mora izgledati približno takole:<br/>
-<pre>
-allow-hotplug eth0
-iface eth0 inet static
-    10.0.1.2
-    netmask 255.255.255.128
-    dns-nameservers 10.0.1.5
-</pre>
-</li>
-
-<li> Shranite nastavitve. Z ukazom reboot ponovno zaženite maliBrezNetworkManager. NetworkManager ob zagonu računalnika
-prebere, kateri omrežni vmesniki so nastavljeni v /etc/network/interfaces. Za te vmesnike potem ne skrbi več.</li>
-
-</li>Na SimpleArbiterDhcp pritisnite OK. Če je šlo vse po sreči, ste opravili tokratno nalogo.</li>
-</ol>
-</p>
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/preparation/task.py b/kpov_judge/tasks/set_ip_static_dhcp/preparation/task.py
deleted file mode 100644
index 1d79a61..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/preparation/task.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# kpovRandomHelpers should be imported by add_assignment.py
-
-instructions = {
-    'si':u"""
-Ustvari tri navidezne računalnike. Za prvega
-uporabi sliko diska simpleArbiterDhcp, za drugega sliko diska
-maliNetworkManager, za tretjega sliko diska maliBrezNetworkManager.
-Računalnike imenujmo enako kot slike diska.
-Na maliBrezNetworkManager izklopi networkmanager. Na 
-Izklopi NetworkManager. Na obeh ročno nastavi IP naslova ter naslova
-DNS strežnikov. Naslove dobiš na simpleArbiterDhcp.
-"""
-}
-
-computers = {
-    'maliNetworkManager': {
-        'disks': [
-            {   'name': 'maliNetworkManager',
-            },
-            #{   'name': 'CDROM',
-            #    'options':{'readonly': True},
-            #    'parts': [],# no parts, no mounting.
-            #}
-        ],
-        'network_interfaces': [{'network': 'net1'}],
-        'flavor': 'm1.tiny',
-        'config_drive': False
-
-    },
-    'maliBrezNetworkManager': {
-        'disks': [
-            {   'name': 'maliBrezNetworkManager',
-            },
-            #{   'name': 'CDROM',
-            #    'options':{'readonly': True},
-            #    'parts': [],# no parts, no mounting.
-            #}
-        ],
-        'network_interfaces': [{'network': 'net1'}],
-        'flavor': 'm1.tiny',
-        'config_drive': False
-
-    },
-    'SimpleArbiter': {
-        'disks': [
-            {   'name': 'simpleArbiterDhcp',
-                # attempt automount
-            },
-            #{   'name': 'CDROM',
-            #    'options': {'readonly': True},
-            #    'parts': [{'dev': 'b1', 'path': '/cdrom'}],
-            #},
-        ],
-        'network_interfaces': [{'network': 'net1'}, {'network': 'test-net'}],
-        'flavor': 'm1.tiny',
-        'config_drive': False
-    }
-}
-
-networks = { 'net1': {'public': False}, 'test-net': {'public': True} }
-
-params_meta = {
-    'IP_NM': {'opis': 'Naslov maliNetworkManager', 'w': False, 'public':True, 'type': 'IP', 'generated': True},
-    'DNS_NM': {'opis': 'DNS za maliNetworkManager', 'w': False, 'public':True, 'type': 'IP', 'generated': True},
-    'IP_static': {'opis': 'Naslov maliBrezNetworkManager', 'w': False, 'public': True, 'type': 'IP', 'generated': True},
-    'DNS_static': {'opis': 'DNS za maliBrezNetworkManager', 'w': False, 'public': True, 'type': 'IP', 'generated': True},
-}
-
-def task(IP_NM, DNS_NM, IP_static, DNS_static):
-    import pxssh
-    import pexpect
-    results = dict()
-    peer_user = 'student'
-    peer_passwd = 'vaje'
-    sA = pxssh.pxssh()
-    sB = pxssh.pxssh()
-    sA.login(IP_NM, peer_user, peer_passwd)
-    sB.login(IP_static, peer_user, peer_passwd)
-    # sA
-    # make sure NM is not handling eth0
-    results['NM_nmcli'] = sA.run('nmcli d')
-    results['NM_nslookup'] = sA.run('nslookup www.arnes.si')
-    # sB
-    # check whether NM is handling eth0
-    results['static_nmcli'] = sB.run('nmcli d')
-    results['static_nslookup'] = sB.run('nslookup www.arnes.si')
-    sA.logout()
-    sB.logout()
-    return results
-    
-def gen_params(user_id, params_meta):
-    params = dict()
-    r = random.Random(user_id)
-    # IP_NM, DNS_NM, IP_static, DNS_static)
-    dns_servers = ['193.2.1.66', '193.2.1.72', '8.8.8.8', '8.8.4.4', '208.67.222.222', '208.67.220.220']
-    net = kpovRandomHelpers.IPv4_subnet_gen(r, '172.23.128.0/18', 24)
-    params['DNS_NM'] = r.choice(dns_servers)
-    params['IP_NM'], params['IP_static'] = kpovRandomHelpers.IPv4_addr_gen(r, net, 2)
-    params['DNS_static'] = r.choice(dns_servers)
-    return params
-
-def task_check(results, params):
-    import re
-    score = -9
-    if results['NM_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_NM'])) > -1:
-        score += 3
-    if results['static_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_static'])) > -1:
-        score += 3
-    if re.search(r'eth0 +802-.*connected', results['NM_nmcli']):
-        score += 2
-    if not re.search(r'eth0 +802-.*connected', results['static_nmcli']):
-        score += 2
-    return score
-
-def prepare_disks(templates, params):
-#    d = templates['simpleArbiterDhcp']
-    pass   
-