Initial commit

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

2 files changed, 109 insertions, 0 deletions

diff --git a/kpov_judge/tasks/set_ip_static_dhcp/evaluation/navodila.html b/kpov_judge/tasks/set_ip_static_dhcp/evaluation/navodila.html
new file mode 100644
index 0000000..df4c68d
--- /dev/null
+++ b/kpov_judge/tasks/set_ip_static_dhcp/evaluation/navodila.html
@@ -0,0 +1,9 @@
+<p>Usposobite tri računalnike:
+<ul>
+<li>SimpleArbiter - testni računalnik</li>
+<li>Z_DHCP - računalnik, ki bo svoje nastavitve dobil prek DHCP</li>
+<li>BREZ_DHCP - računalnik, ki bo imel svoj IP nastavljen statično.</li>
+</ul>
+</p>
+<p>Prvi omrežni vmesnik računalnika SimpleArbiter naj bo povezan na Internet. Drugi naj bo povezan na neko lokalno omrežje, na katerega bosta priklopljena računalnika Z_DHCP ter BREZ_DHCP. Na računalniku Z_DHCP poskrbite, da bo ob pridobivanju naslova DHCP strežniku poslal tudi posebej nastavljeno ime računalnika (hostname), ki ne bo enako dejanskemu imenu računalnika (tistemu, ki ga izpiše ukaz hostname).</p>
+<p>Naslov BREZ_DHCP ter ime računalnika za Z_DHCP dobite ob zagonu run_test.py na računalniku SimpleArbiter. Uporabniško ime ter geslo na SimpleArbiter sta <pre>tester</pre> in <pre>SedemKrogovPekla</pre>.</p>
diff --git a/kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py b/kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py
new file mode 100644
index 0000000..0fad134
--- /dev/null
+++ b/kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# TODO: finish thi
+# kpovRandomHelpers should be imported by add_assignment.py
+
+instructions = {
+    'si':u"""
+Ustvari tri navidezne računalnike. Za disk prvega uporabi sliko diska simpleArbiterDhcp.
+Za enega od ostalih dveh (Z_DHCP) poskrbi, da bo dobil IP prek DHCP, pri čemer
+naj kot hostname strežniku pošlje ime, ki ga dobiš na simpleArbiterDhcp. 
+Za drugega poskrbi, da bo imel statično nastavljen IP.
+"""
+}
+
+computers = {
+    'Z_DHCP': {
+        'disks': [
+            {   'name': 'Z_DHCP',
+            },
+            #{   'name': 'CDROM',
+            #    'options':{'readonly': True},
+            #    'parts': [],# no parts, no mounting.
+            #}
+        ],
+        'network_interfaces': [{'network': 'net1'}],
+        'flavor': 'm1.tiny',
+        'config_drive': False
+
+    },
+    'BREZ_DHCP': {
+        'disks': [
+            {   'name': 'BREZ_DHCP',
+            },
+            #{   '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_DHCP': {'opis': 'Naslov za DHCP', 'w': False, 'public': False, 'type': 'IP', 'generated': True},
+    'Hostname_DHCP': {'opis': 'Ime DHCP', 'w': False, 'public': True, 'type': 'hostname', 'generated': True},
+    'IP_static': {'opis': 'Naslov BREZ_DHCP', 'w': False, 'public': True, 'type': 'IP', 'generated': True},
+    'IP_dhcp_static': {'opis': 'Dodeljen IP brez DHCP', 'w': False, 'public': False, 'type': 'IP', 'generated': True},
+}
+
+def task(IP_DHCP, Hostname_DHCP, IP_static, MAC_static, IP_dhcp_static):
+    import pxssh
+    import pexpect
+    results = dict()
+    # check hostname of DHCP
+    # check the hostname in the response of IP_DHCP
+    # check availability of IP_static
+    # check non-availability of IP_dhcp_static
+    return results
+                       
+def gen_params(user_id, params_meta):
+    r = random.Random(user_id)
+    # IP_NM, DNS_NM, IP_static, DNS_static)
+    net = kpovRandomHelpers.IPv4_subnet_gen(r, '172.23.128.0/18', 24)
+    params['IP_DHCP'], params['IP_static'], params['IP_dhcp_static'] = kpovRandomHelpers.IPv4_addr_gen(r, net, 3)
+    params['Hostname_DHCP'] = kpovRandomHelpers.hostname_gen(r)
+    return params
+
+def task_check(results, params):
+    import re
+    score = -9
+    if results['bla']:
+        score += 3
+    return score
+
+def prepare_disks(templates, params):
+#    d = templates['simpleArbiterDhcp']
+#   create config for static_DHCP
+#   set static_DHCP hostname
+    pass
+