From 4ce9fe9a726b148c13fb98e8ac00715d438516a0 Mon Sep 17 00:00:00 2001
From: "gasperfele@fri1.uni-lj.si"
 <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414>
Date: Fri, 21 Nov 2014 08:33:49 +0000
Subject: Updated the instructions on how to use the system

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@8 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
---
 .../tasks/set_ip_static_dhcp/evaluation/task.py    | 100 ---------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py

(limited to 'kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py')

diff --git a/kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py b/kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py
deleted file mode 100644
index 0fad134..0000000
--- a/kpov_judge/tasks/set_ip_static_dhcp/evaluation/task.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/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
-
-- 
cgit v1.2.1