Fixed instructions

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

1 files changed, 29 insertions, 31 deletions

diff --git a/kpov_judge/tasks/nat_vlc/task.py b/kpov_judge/tasks/nat_vlc/task.py
index 1d6728c..c393267 100644
--- a/kpov_judge/tasks/nat_vlc/task.py
+++ b/kpov_judge/tasks/nat_vlc/task.py
@@ -12,35 +12,46 @@ instructions = {
     'si':u"""
 Postavi dva navidezna računalnika - SimpleArbiter z diskom simpleArbiter
 ter NATServer. NATServer naj ima dva omrežna vmesnika - z enim naj bo povezan
-na simpleArbiter, z drugim pa na Internet. Na NATServer z ukazom ifconfig in z datoteko /etc/network/interfaces skonfiguriraj omrežne vmesnike tako da bo en vmesnik povezan v WAN (Internet) in en vmesnik na LAN (simpleArbiter). SimpleArbiter skonfiguriraj tako, da 
-bo za privzeti prehod uporabljal NATServer. Nastavi DNS (etc/resolv.conf). če še ni, omogoči posredovanje IP naslovov. Nastavi NAT 
-z uporabo paketa iptables. Na simpleArbiter z vlc preberi naslov, na katerem si lahko ogledaš kratek filmček.
+na lokalno omrežje, na katerem naj bo tudi simpleArbiter, z drugim pa na 
+Internet. Na NATServer skonfiguriraj omrežne vmesnike tako, da bo imel dostop
+do Interneta in da bo imel na lokalnem omrežju {IP_NAT}. Na NATServer
+ustvarite še uporabnika {IP_NAT_user}.
+
+Poskrbi, da bo SimpleArbiter prek DHCP dobil naslov {IP_simple}.
+Poskrbi, da bo NATServer deloval kot prehod za SimpleArbiter in izvajal NAT.
 """,
 	'en':u"""
-Set up two virtual machines - SimpleArbiter (using the disc simpleArbiter) and NATServer. NATServer should have two network adapters. The first is to connect to SimpleArbiter and the second is for connecting to the internet.
-On NATServer use the instruction ifconfig and the file /etc/network/interfaces to configure the network adapters - the first one should be connected to WAN(Internet) and the second one to LAN(SimpleArbiter).
-Configure SimpleArbiter to use NATServer as the default gateway. Setup DNS: /etc/resolv.conf, enable IP forwarding, using the iptables command. On SimpleArbiter, use vlc (network stream) to watch the video.
+Set up two virtual machines - SimpleArbiter (using the disc simpleArbiter) and
+NATServer. NATServer should have two network adapters. Connect the first
+adapter to SimpleArbiter and the second adapter to the Internet. Configure the
+network in NATServer so that one interface is connected to the Internet while
+the other is connected to SimpleArbiter and has the address {IP_NAT}. Create
+a user called {IP_NAT_user} on NATServer.
+
+Configure a DHCP server on NATServer so that SimpleArbiter gets the IP
+{IP_simple}. Also, set up NAT on NATServer and set it as the gateway for 
+SimpleArbiter.
 """
 }
 
 computers = {
-    'maliNetworkManager': {
+    'NATServer': {
         'disks': [
-            {   'name': 'maliNetworkManager',
+            {   'name': 'NATServer',
+                # attempt automount
             },
             #{   'name': 'CDROM',
-            #    'options':{'readonly': True},
-            #    'parts': [],# no parts, no mounting.
-            #}
+            #    'options': {'readonly': True},
+            #    'parts': [{'dev': 'b1', 'path': '/cdrom'}],
+            #},
         ],
-        'network_interfaces': [{'network': 'net1'}],
+        'network_interfaces': [{'network': 'net1'}, {'network': 'test-net'}],
         'flavor': 'm1.tiny',
         'config_drive': False
-
     },
-    'maliBrezNetworkManager': {
+    'SimpleArbiter': {
         'disks': [
-            {   'name': 'maliBrezNetworkManager',
+            {   'name': 'simpleArbiterDhcp',
             },
             #{   'name': 'CDROM',
             #    'options':{'readonly': True},
@@ -52,20 +63,7 @@ computers = {
         '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} }
@@ -76,8 +74,8 @@ params_meta = {
 #   'DNS_NM': {'descriptions': {'si': 'DNS za maliNetworkManager'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True},
    'IP_simple': {'descriptions': {'si': 'Naslov SimpleArbiter'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True},
    'IP_NAT': {'descriptions': {'si': 'Naslov NAT'}, 'w': False, 'public': True,  'type': 'IP', 'generated': True },    
-   'IP_NAT_user': {'descriptions': {'si': 'Username NAT virtualke'}, 'w': False, 'public' : True, 'type' : 'username', 'generated' : True},
-   'IP_NAT_passwd': {'descriptions': {'si': 'Password NAT virtualke'}, 'w': True,'public' : True, 'type' : 'passwd', 'generated' : False},
+   'IP_NAT_user': {'descriptions': {'si': 'Username na NATServer'}, 'w': False, 'public' : True, 'type' : 'username', 'generated' : True},
+   'IP_NAT_passwd': {'descriptions': {'si': 'Password na NATServer'}, 'w': True,'public' : True, 'type' : 'passwd', 'generated' : False},
 #    'DNS_static': {'descriptions': {'si': 'DNS za maliBrezNetworkManager'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True},
 }