summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'kpov_judge/tasks')
-rw-r--r--kpov_judge/tasks/nat_port_forward/task.py2
-rw-r--r--kpov_judge/tasks/public_ip_ssh/task.py12
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('/')