Continued work on nat_port_forward and vlc_stream_rtp

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

1 files changed, 21 insertions, 41 deletions

diff --git a/kpov_judge/tasks/nat_port_forward/task.py b/kpov_judge/tasks/nat_port_forward/task.py
index 88b2b3c..d7dde03 100644
--- a/kpov_judge/tasks/nat_port_forward/task.py
+++ b/kpov_judge/tasks/nat_port_forward/task.py
@@ -5,18 +5,17 @@
 
 instructions = {
     'si':u"""
-Postavi dva računalnika - SimpleArbiter z diska ter
-NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo
-povezan v Internet, z drugim pa na SimpleArbiter. Poskrbi, da bo
-NATServer služil kot DHCP strežnik ter privzeti prehod za SimpleArbiter.
-Na SimpleArbiter preberi vrednosti NET, PORT_OUTER in PORT_INNER. Poskrbi, da
+Postavi tri računalnike - SimpleArbiter z diska simpleArbiter, TestClient z diska testClient in NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo
+povezan na omrežje, od koder bo imel dostop do Interneta, z drugim pa na SimpleArbiter. TestClient naj bo povezan na isto omrežje z dostopom do Interneta kot NATServer.
+Poskrbi, da bo NATServer služil kot DHCP strežnik ter privzeti prehod za SimpleArbiter.
+Na SimpleArbiter preberi vrednosti NET, PORT_OUTER in PORT_INNER ter vpiši IP_TEST_CLIENT. Poskrbi, da
 bo omrežje med SimpleArbiter in NATServer na področju NET. Nato poskrbi, da se
-bo promet z Interneta na vrata PORT_OUTER prepošiljal na SimpleArbiter na vrata PORT_INNER.
+bo TCP promet z omrežja z dostopom do Interneta na vrata PORT_OUTER prepošiljal na SimpleArbiter na vrata PORT_INNER.
 """
 }
 
 computers = {
-    'maliNetworkManager': {
+    'TestClient': {
         'disks': [
             {   'name': 'maliNetworkManager',
             },
@@ -25,28 +24,28 @@ computers = {
             #    'parts': [],# no parts, no mounting.
             #}
         ],
-        'network_interfaces': [{'network': 'net1'}],
+        'network_interfaces': [{'network': 'test-net'}],
         'flavor': 'm1.tiny',
         'config_drive': False
 
     },
-    'maliBrezNetworkManager': {
+    'NATServer': {
         'disks': [
-            {   'name': 'maliBrezNetworkManager',
+            {   'name': 'NATServer',
             },
             #{   'name': 'CDROM',
             #    'options':{'readonly': True},
             #    'parts': [],# no parts, no mounting.
             #}
         ],
-        'network_interfaces': [{'network': 'net1'}],
+        'network_interfaces': [{'network': 'net1'}, {'network': 'test-net'}],
         'flavor': 'm1.tiny',
         'config_drive': False
 
     },
     'SimpleArbiter': {
         'disks': [
-            {   'name': 'simpleArbiterDhcp',
+            {   'name': 'simpleArbiter',
                 # attempt automount
             },
             #{   'name': 'CDROM',
@@ -54,7 +53,7 @@ computers = {
             #    'parts': [{'dev': 'b1', 'path': '/cdrom'}],
             #},
         ],
-        'network_interfaces': [{'network': 'net1'}, {'network': 'test-net'}],
+        'network_interfaces': [{'network': 'net1'}],
         'flavor': 'm1.tiny',
         'config_drive': False
     }
@@ -63,43 +62,24 @@ computers = {
 networks = { 'net1': {'public': False}, 'test-net': {'public': True} }
 
 params_meta = {
-    'IP_NM': {'descriptions': {'si': 'Naslov maliNetworkManager'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True},
-    'DNS_NM': {'descriptions': {'si': 'DNS za maliNetworkManager'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True},
-    'IP_static': {'descriptions': {'si': 'Naslov maliBrezNetworkManager'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True},
-    'DNS_static': {'descriptions': {'si': 'DNS za maliBrezNetworkManager'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True},
+    'IP_TEST_CLIENT': {'descriptions': {'si': 'Naslov TestClient'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False},
+    'PORT_OUTER': {'descriptions': {'si': 'Zunanja vrata'}, 'w': False, 'public':True, 'type': 'port', 'generated': True},
+    'PORT_INNER': {'descriptions': {'si': 'Notranja vrata'}, 'w': False, 'public': True, 'type': 'port', 'generated': True},
+    'NET': {'descriptions': {'si': u'Področje naslovov med SimpleArbiter in TestClient'}, 'w': False, 'public': True, 'type': 'NET', 'generated': True},
 }
 
-def task(IP_NM, DNS_NM, IP_static, DNS_static):
-    import pxssh
+def task(IP_TEST_CLIENT, PORT_OUTER, PORT_INNER, NET):
     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 = kpov_random_helpers.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['DNS_static'] = r.choice(dns_servers)
+    params['PORT_INNER'] = r.randint(6000, 10000)
+    params['PORT_OUTER'] = r.randint(10001, 15000)
+    params['NET'] = kpov_random_helpers.IPv4_subnet_gen("10.36.0.0/14", 24)
     return params
 
 def task_check(results, params):