Merge branch 'fix-tasks'

Fixes pexpect usage in most tasks. Several other cleanups and minor
refactoring.

1 files changed, 3 insertions, 19 deletions

diff --git a/kpov_judge/tasks/openwrt/task.py b/kpov_judge/tasks/openwrt/task.py
index 057fb96..ed2783a 100644
--- a/kpov_judge/tasks/openwrt/task.py
+++ b/kpov_judge/tasks/openwrt/task.py
@@ -1,7 +1,4 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# kpov_random_helpers should be imported by add_assignment.py
+# kpov_util should be imported by add_assignment.py
 
 instructions = {
     'si':"""
@@ -18,10 +15,6 @@ computers = {
         'disks': [
             {   'name': 'maliNetworkManager',
             },
-            #{   'name': 'CDROM',
-            #    'options':{'readonly': True},
-            #    'parts': [],# no parts, no mounting.
-            #}
         ],
         'network_interfaces': [{'network': 'net1'}],
         'flavor': 'm1.tiny',
@@ -32,10 +25,6 @@ computers = {
         'disks': [
             {   'name': 'maliBrezNetworkManager',
             },
-            #{   'name': 'CDROM',
-            #    'options':{'readonly': True},
-            #    'parts': [],# no parts, no mounting.
-            #}
         ],
         'network_interfaces': [{'network': 'net1'}],
         'flavor': 'm1.tiny',
@@ -45,12 +34,7 @@ computers = {
     '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',
@@ -94,9 +78,9 @@ def gen_params(user_id, params_meta):
     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 = kpov_random_helpers.IPv4_subnet_gen(r, '172.23.128.0/18', 24)
+    net = kpov_util.IPv4_subnet_gen(r, '172.23.128.0/18', 24)
     params['DNS_NM'] = r.choice(dns_servers)
-    params['IP_NM'], params['IP_static'] = kpov_random_helpers.IPv4_addr_gen(r, net, 2)
+    params['IP_NM'], params['IP_static'] = kpov_util.IPv4_addr_gen(r, net, 2)
     params['DNS_static'] = r.choice(dns_servers)
     return params