diff options
| author | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2016-10-01 21:46:34 +0000 |
|---|---|---|
| committer | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2016-10-01 21:46:34 +0000 |
| commit | fa8934667ad8eae30c81081bbaa868b227c119ed (patch) | |
| tree | d2a69178cfb693c0da0ffbefaff2da70a64f52f5 /kpov_judge/tasks/openvpn_multiple_hops | |
| parent | 7210b74d6241a4264532aaaa2e1d771eaca4e073 (diff) | |
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
Diffstat (limited to 'kpov_judge/tasks/openvpn_multiple_hops')
| -rw-r--r-- | kpov_judge/tasks/openvpn_multiple_hops/task.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kpov_judge/tasks/openvpn_multiple_hops/task.py b/kpov_judge/tasks/openvpn_multiple_hops/task.py index 25a4229..dbf7eef 100644 --- a/kpov_judge/tasks/openvpn_multiple_hops/task.py +++ b/kpov_judge/tasks/openvpn_multiple_hops/task.py @@ -70,7 +70,7 @@ params_meta = { } def task(IP_NM, DNS_NM, IP_static, DNS_static): - import pxssh + from pexpect import pxssh import pexpect results = dict() peer_user = 'student' @@ -117,7 +117,6 @@ def task_check(results, params): score = 0 return score, hints -def prepare_disks(templates, params): +def prepare_disks(templates, task_params, global_params): # d = templates['simpleArbiterDhcp'] - pass - + write_default_config(templates['simpleArbiterDhcp'], global_params) |