diff options
| author | sr5154@student.uni-lj.si <sr5154@student.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2017-03-28 15:38:13 +0000 |
|---|---|---|
| committer | sr5154@student.uni-lj.si <sr5154@student.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2017-03-28 15:38:13 +0000 |
| commit | 31c240deba9d07913ee6e4f39bfd0f04669013b3 (patch) | |
| tree | 62ee12572eb4889b556a6d91b971ac218a697dc6 | |
| parent | 4f7a1da24814b74606ee7e4aa6d161a9ed2347d8 (diff) | |
Pravilno preveri nmcli
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@410 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
| -rw-r--r-- | kpov_judge/tasks/dhcp_dns_predefined_ip/task.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py index 0a5b853..525e5bb 100644 --- a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py +++ b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py @@ -63,7 +63,7 @@ params_meta = { 'DNS_NM': {'descriptions': {'si': 'DNS za maliNetworkManager'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True}, 'IP_static': {'descriptions': {'si': 'Naslov maliBrezNetworkManager'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True}, 'DNS_static': {'descriptions': {'si': 'DNS za maliBrezNetworkManager'}, 'w': False, 'public': True, 'type': 'IP', 'generated': True}, - 'HOSTNAME_X_IP': {'descriptions': {'si': 'Naslov HOSTNAME_X'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True}, + 'HOSTNAME_X_IP': {'descriptions': {'si': 'Naslov HOSTNAME_X'}, 'w': False, 'public':True, 'type': 'IP', 'generated': True}, } def task(IP_NM, DNS_NM, IP_static, DNS_static): @@ -78,11 +78,17 @@ def task(IP_NM, DNS_NM, IP_static, DNS_static): sB.login(IP_static, peer_user, peer_passwd) # sA # make sure NM is not handling eth0 - results['NM_nmcli'] = sA.run('nmcli d') + sA.sendline('nmcli -c no d') + sA.prompt() + results['NM_nmcli'] = sA.before + results['NM_nslookup'] = sA.run('nslookup www.arnes.si') # sB # check whether NM is handling eth0 - results['static_nmcli'] = sB.run('nmcli d') + sA.sendline('nmcli -c no d') + sA.prompt() + results['static_nmcli'] = sA.before + results['static_nslookup'] = sB.run('nslookup www.arnes.si') sA.logout() sB.logout() @@ -95,7 +101,7 @@ def gen_params(user_id, params_meta): dns_servers = ['193.2.1.66', '193.2.1.72', '8.8.8.8', '8.8.4.4', '208.67.222.222', '208.67.220.220'] net = kpov_random_helpers.IPv4_subnet_gen(r, '172.23.128.0/18', 24) params['DNS_NM'] = r.choice(dns_servers) - params['IP_NM'], params['IP_static'] = kpov_random_helpers.IPv4_addr_gen(r, net, 2) + params['IP_NM'], params['IP_static'], params['HOSTNAME_X_IP'] = kpov_random_helpers.IPv4_addr_gen(r, net, 3) params['DNS_static'] = r.choice(dns_servers) return params @@ -111,14 +117,16 @@ def task_check(results, params): score += 3 else: hint += ["Static DNS wrong"] - if re.search(r'eth0 +802-.*connected', results['NM_nmcli']): + if re.search(r'e(th0|np0s3|ns3) +ethernet +connected', results['NM_nmcli']): + # print "NM_nmcli OK" score += 2 else: - hint += ["NM wrong"] - if not re.search(r'eth0 +802-.*connected', results['static_nmcli']): + hints += ['nmcli incorrect'] + if not re.search(r'e(th0|np0s3|ns3) +ethernet +connected', results['static_nmcli']): + # print "NM_nmcli OK" score += 2 else: - hint += ["static wrong"] + hints += ['static nmcli incorrect'] return score, hints def prepare_disks(templates, task_params, global_params): |