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

3 files changed, 0 insertions, 231 deletions

diff --git a/kpov_judge/tasks/dhcp_dns/evaluation/task.py b/kpov_judge/tasks/dhcp_dns/evaluation/task.py
deleted file mode 100644
index 5e443ce..0000000
--- a/kpov_judge/tasks/dhcp_dns/evaluation/task.py
+++ /dev/null
@@ -1,118 +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 enega (SimpleArbiter) uporabi sliko diska simpleArbiter. Na drugega (DHCP_server) postavi strežnika
-DHCP in DNS. Poskrbi, da bo preostali računalnik (DHCP_client) dobil naslov, ki ga prebereš na SimpleArbiterju. Na SimpleArbiterju preberi
-še ime in IP nekega računalnika (HOSTNAME_X in IP_X). Poskrbi, da bo DNS strežnik za HOSTNAME_X vrnil naslov IP_X.
-"""
-}
-
-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
-    score = 0
-    return score
-
-def prepare_disks(templates, params):
-#    d = templates['simpleArbiterDhcp']
-    pass   
-
diff --git a/kpov_judge/tasks/dhcp_dns/lecture/ideja.txt b/kpov_judge/tasks/dhcp_dns/lecture/ideja.txt
deleted file mode 100644
index 89f3a3a..0000000
--- a/kpov_judge/tasks/dhcp_dns/lecture/ideja.txt
+++ /dev/null
@@ -1 +0,0 @@
-Nastavi strežnik dhcp tako, da bodo računalniki v različnih skupinah dobili različna imena zagonskih datotek. Nastavi syslinux tako, da se bo ob zagonu syslinux pokazala slika.
diff --git a/kpov_judge/tasks/dhcp_dns/preparation/task.py b/kpov_judge/tasks/dhcp_dns/preparation/task.py
deleted file mode 100644
index c060db6..0000000
--- a/kpov_judge/tasks/dhcp_dns/preparation/task.py
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# TODO: dokoncaj!
-# kpovRandomHelpers should be imported by add_assignment.py
-
-instructions = {
-    'si':u"""
-Postavi štiri navidezne računalnike - simpleArbiter, DHCP_server,
-BootableClientA ter BootableClientB. Na simpleArbiter preberi naslove IP_GW, IP_DHCP,
-IP_B ter najdi datoteko A.
-
-Na DHCP_server postavi DHCP strežnik s pomočjo ISC dhcp 3 na naslovu IP_DHCP.
-SimpleArbiter naj dobi IP_GW. DHCP_server naj ga uporabi kot gateway.
-Če se zaganja BootableClientB, naj se sistem zažene z live ISO in dobi svoj IP.
-Če se zaganja katerikoli drug, naj se sistem zažene v datoteko z imenom A.
-Tako BootableClientA kot BootableClientB naj bosta brez diskov.
-"""
-}
-
-computers = {
-    'DHCPServer': {
-        'disks': [
-            {   'name': 'DHCPServer',
-            },
-            {   'name': 'bootable_iso',
-                'options':{'readonly': True},
-                'parts': [],
-            },
-            #{   'name': 'CDROM',
-            #    'options':{'readonly': True},
-            #    'parts': [],# no parts, no mounting.
-            #}
-        ],
-        'network_interfaces': [{'network': 'net1'}],
-        'flavor': 'm1.tiny',
-        'config_drive': False
-    },
-    'BootableClientA': {
-        'disks': [
-        ],
-        'network_interfaces': [{'network': 'net1'}],
-        'flavor': 'm1.tiny',
-        'config_drive': False
-    },
-    'BootableClientB': {
-        'disks': [
-        ],
-        'network_interfaces': [{'network': 'net1'}],
-        'flavor': 'm1.tiny',
-        'config_drive': False
-    },
-    'SimpleArbiter': {
-        'disks': [
-            {   'name': 'simpleArbiterDhcp',
-            },
-            #{   '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_DHCP': {'opis': 'IP DHCP streznika', 'w': False, 'public': True, 'type':'IP', 'generated': True},
-    'IP_GW': {'opis': 'IP SimpleArbiterja', 'w': False, 'public': True, 'type':'IP', 'generated': True},
-    'MAC_BOOT': {'opis': 'MAC racunalnika, ki se zazene z ISO', 'w': True, 'public': True, 'type':'MAC', 'generated': False},
-    'IP_BOOT': {'opis': 'IP racunalnika, ki se zazene z ISO', 'w': True, 'public': True, 'type':'IP', 'generated': False},
-    'BOOT_FNAME': {'opis': 'Ime datoteke', 'w': False, 'public': True, 'type': 'filename', 'generated': True},
-}
-
-def task(IP_DHCP, IP_GW, MAC_BOOT, BOOT_FNAME):
-    # check the IP
-    # ping the DHCP server
-    # check whether the fname served by the dhcp server is correct
-    # connect to the service in the special ISO
-    # check the MAC of the server on IP_BOOT
-    return results
-    
-def gen_params(user_id, params_meta):
-    params = dict()
-    r = random.Random(user_id)
-    net = kpovRandomHelpers.IPv4_subnet_gen(r, '10.75.0.0/10', 24)
-    params['IP_DHCP'], params['IP_GW'] = kpovRandomHelpers.IPv4_addr_gen(r, net, 2)
-    params['BOOT_FNAME'] = kpovRandomHelpers.filename_gen(r)
-    # IP_NM, DNS_NM, IP_static, DNS_static)
-    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
-    score = 0
-    return score
-
-def prepare_disks(templates, params):
-#    d = templates['simpleArbiterDhcp']
-    pass   
-