From fa8934667ad8eae30c81081bbaa868b227c119ed Mon Sep 17 00:00:00 2001 From: "gasperfele@fri1.uni-lj.si" Date: Sat, 1 Oct 2016 21:46:34 +0000 Subject: added a global_params parameter to prepare_disks so that the task_name, username and task_url are pre-entered on the arbiters git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@351 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414 --- kpov_judge/tasks/nat_port_forward/task.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'kpov_judge/tasks/nat_port_forward') diff --git a/kpov_judge/tasks/nat_port_forward/task.py b/kpov_judge/tasks/nat_port_forward/task.py index 0996d97..1f8bc79 100644 --- a/kpov_judge/tasks/nat_port_forward/task.py +++ b/kpov_judge/tasks/nat_port_forward/task.py @@ -71,7 +71,7 @@ params_meta = { def task(IP_TEST_CLIENT, IP_NAT, PORT_OUTER, PORT_INNER, NET): import pexpect - import pxssh + from pexpect import pxssh import re import random import time @@ -195,7 +195,5 @@ def task_check(results, params): hints += [s + str(results['tcpdump'])] return score, hints -def prepare_disks(templates, params): -# d = templates['simpleArbiterDhcp'] - pass - +def prepare_disks(templates, task_params, global_params): + write_default_config(templates['simpleArbiter'], global_params) -- cgit v1.2.1