From 6a3b2ea76cbcae063b7f70e3965f14b1ffa2772a 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, 7 Oct 2016 20:33:16 +0000
Subject: Fixed the computers for task public_ip_ssh

git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@359 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
---
 kpov_judge/tasks/nat_port_forward/task.py |  2 +-
 kpov_judge/tasks/public_ip_ssh/task.py    | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/kpov_judge/tasks/nat_port_forward/task.py b/kpov_judge/tasks/nat_port_forward/task.py
index 1f8bc79..645b20f 100644
--- a/kpov_judge/tasks/nat_port_forward/task.py
+++ b/kpov_judge/tasks/nat_port_forward/task.py
@@ -31,7 +31,7 @@ computers = {
     },
     'NATServer': {
         'disks': [
-            {   'name': 'NATServer',
+            {   'name': 'student-NATServer',
             },
             #{   'name': 'CDROM',
             #    'options':{'readonly': True},
diff --git a/kpov_judge/tasks/public_ip_ssh/task.py b/kpov_judge/tasks/public_ip_ssh/task.py
index 114d1b3..9640b27 100644
--- a/kpov_judge/tasks/public_ip_ssh/task.py
+++ b/kpov_judge/tasks/public_ip_ssh/task.py
@@ -17,10 +17,18 @@ uporabnik s svojim geslom lahko na A prijavil z Interneta.
 computers = {
     'SimpleArbiter': {
         'disks':[
-            { 'name': 'Test' }]
+            { 'name': 'simpleArbiter' }],
+        'network_interfaces':[{'network':'net1'}],
+    },
+    'A': {
+        'disks':[],
+        'network_interfaces':[{'network':'net2'}],
     }
+
 }
 
+networks = { 'net1': {'public': True}, 'net2': {'public': True} }
+
 params_meta = {
     'peer_ip': {'descriptions': {'si': 'Naslov ssh strežnika'}, 'w': True, 'public':True, 'type': 'IP', 'generated': False},
     'peer_user': {'descriptions': {'si': 'ime uporabnika'}, 'w': False, 'public': True, 'type': 'username', 'generated': True},
@@ -47,5 +55,5 @@ def task_check(results, params):
     return 10, []
 
 def prepare_disks(templates, task_params, global_params):
-    write_default_config(templates['Test'], global_params) 
+    write_default_config(templates['simpleArbiter'], global_params) 
     # print d1.ls('/')
-- 
cgit v1.2.1