diff options
author | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2015-04-01 20:32:28 +0000 |
---|---|---|
committer | gasperfele@fri1.uni-lj.si <gasperfele@fri1.uni-lj.si@5cf9fbd1-b2bc-434c-b4b7-e852f4f63414> | 2015-04-01 20:32:28 +0000 |
commit | 53fea983a90447865c429c2573bfb36cba179054 (patch) | |
tree | 42a0fa57a43103378144607d16e575e82071f7e1 /kpov_judge/tasks/dhcp_dns_predefined_ip | |
parent | 2fe40ec78ce6ab3a8c2c5659713b7f947a5686fc (diff) |
added hints to task results
git-svn-id: https://svn.lusy.fri.uni-lj.si/kpov-public-svn/kpov-public@296 5cf9fbd1-b2bc-434c-b4b7-e852f4f63414
Diffstat (limited to 'kpov_judge/tasks/dhcp_dns_predefined_ip')
-rw-r--r-- | kpov_judge/tasks/dhcp_dns_predefined_ip/task.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py index d251ebd..f6e0ded 100644 --- a/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py +++ b/kpov_judge/tasks/dhcp_dns_predefined_ip/task.py @@ -100,17 +100,25 @@ def gen_params(user_id, params_meta): def task_check(results, params): import re - score = -9 + score = 0 + hints = [] if results['NM_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_NM'])) > -1: score += 3 + else: + hint += ["NM DNS wrong"] if results['static_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_static'])) > -1: score += 3 + else: + hint += ["Static DNS wrong"] if re.search(r'eth0 +802-.*connected', results['NM_nmcli']): score += 2 + else: + hint += ["NM wrong"] if not re.search(r'eth0 +802-.*connected', results['static_nmcli']): score += 2 - score = 0 - return score + else: + hint += ["static wrong"] + return score, hints def prepare_disks(templates, params): # d = templates['simpleArbiterDhcp'] |