2 files changed, 113 insertions, 0 deletions
diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/lecture/ideja.txt b/kpov_judge/tasks/isc_dhcp_live_boot/lecture/ideja.txt
new file mode 100644
index 0000000..89f3a3a
--- /dev/null
+++ b/kpov_judge/tasks/isc_dhcp_live_boot/lecture/ideja.txt
@@ -0,0 +1 @@
+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/isc_dhcp_live_boot/task.py b/kpov_judge/tasks/isc_dhcp_live_boot/task.py
new file mode 100644
index 0000000..c060db6
--- /dev/null
+++ b/kpov_judge/tasks/isc_dhcp_live_boot/task.py
@@ -0,0 +1,112 @@
+#!/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   
+