summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks/openvpn_simple_smb/task.py
diff options
context:
space:
mode:
Diffstat (limited to 'kpov_judge/tasks/openvpn_simple_smb/task.py')
-rw-r--r--kpov_judge/tasks/openvpn_simple_smb/task.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/kpov_judge/tasks/openvpn_simple_smb/task.py b/kpov_judge/tasks/openvpn_simple_smb/task.py
index 2e66efb..d4bb510 100644
--- a/kpov_judge/tasks/openvpn_simple_smb/task.py
+++ b/kpov_judge/tasks/openvpn_simple_smb/task.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
# kpov_util should be imported by add_assignment.py
instructions = {
@@ -44,12 +42,7 @@ computers = {
'disks': [
{
'name': 'simpleArbiterDhcpGWVPN',
- # attempt automount
},
- #{ 'name': 'CDROM',
- # 'options': {'readonly': True},
- # 'parts': [{'dev': 'b1', 'path': '/cdrom'}],
- #},
],
'network_interfaces': [
{
@@ -66,10 +59,6 @@ computers = {
'disks': [
{ 'name': 'student-VPNClient1',
},
- #{ 'name': 'CDROM',
- # 'options':{'readonly': True},
- # 'parts': [],# no parts, no mounting.
- #}
],
'network_interfaces': [
{
@@ -90,6 +79,7 @@ networks = {
'public': False
}
}
+
#Tukaj sem generiral tri parametre, prosil bi če se upoštevajo pri Tasku.
params_meta = {
'IP_SimpleArbiterVPN': {'descriptions':{'si':'IP za SimpleArbiter na VPN'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True},
@@ -99,7 +89,6 @@ params_meta = {
'secret_random_seed': {'descriptions':{'si':'Seme za skrivnost'}, 'w': False, 'public': False, 'type': None, 'generated': True},
}
-
def task(IP_SimpleArbiterVPN, IP_VPNClient1, IP_LANClient1, DIRNAME):
import collections
from pexpect import pxssh # Used to set up an SSH connection to a remote machine