summaryrefslogtreecommitdiff
path: root/kpov_judge/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'kpov_judge/tasks')
-rw-r--r--kpov_judge/tasks/dhcp_dns_predefined_ip/task.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py
index 525e5bb..b5d8f7c 100644
--- a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py
+++ b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py
@@ -85,9 +85,9 @@ def task(IP_NM, DNS_NM, IP_static, DNS_static):
results['NM_nslookup'] = sA.run('nslookup www.arnes.si')
# sB
# check whether NM is handling eth0
- sA.sendline('nmcli -c no d')
- sA.prompt()
- results['static_nmcli'] = sA.before
+ sB.sendline('nmcli -c no d')
+ sB.prompt()
+ results['static_nmcli'] = sB.before
results['static_nslookup'] = sB.run('nslookup www.arnes.si')
sA.logout()
@@ -122,11 +122,11 @@ def task_check(results, params):
score += 2
else:
hints += ['nmcli incorrect']
- if not re.search(r'e(th0|np0s3|ns3) +ethernet +connected', results['static_nmcli']):
- # print "NM_nmcli OK"
+ if re.search(r'e(th0|np0s3|ns3) +ethernet +unmanaged', results['static_nmcli']):
+ # print "static_nmcli OK"
score += 2
else:
- hints += ['static nmcli incorrect']
+ hints += ['nmcli on malibrez incorrect']
return score, hints
def prepare_disks(templates, task_params, global_params):