diff options
| -rw-r--r-- | kpov_judge/tasks/isc_dhcp_live_boot/task.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kpov_judge/tasks/isc_dhcp_live_boot/task.py b/kpov_judge/tasks/isc_dhcp_live_boot/task.py index b446450..3667f8c 100644 --- a/kpov_judge/tasks/isc_dhcp_live_boot/task.py +++ b/kpov_judge/tasks/isc_dhcp_live_boot/task.py @@ -136,16 +136,26 @@ def gen_params(user_id, params_meta): def task_check(results, params): import re - score = -9 + score = 0 + + #TO FINISH SCORING WE REQUIRE DICT KEYS AND FUNCTIONS gen_params AND task TO BE FINISHED + #POINTS FOR EACH TASK MAY BE ADJUSTED IN THE FUTURE + + #TASK1: all computers up if results['NM_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_NM'])) > -1: score += 3 + #TASK2: SimpleArbeiter IP_GW if results['static_nslookup'].find('Server:\t\t{0}\r'.format(params['DNS_static'])) > -1: score += 3 + #TASK3: SimpleArbeiter IP_DHCP if re.search(r'eth0 +802-.*connected', results['NM_nmcli']): score += 2 - if not re.search(r'eth0 +802-.*connected', results['static_nmcli']): + #TASK4: SimpleArbaiter IP_B + if re.search(r'eth0 +802-.*connected', results['static_nmcli']): score += 2 - score = 0 + if results['NoNameATM'].find('NoFormatATM'.format(params['NoNameAtm]))> -1: + score +=2 + #Same pattern for other tasks return score def prepare_disks(templates, params): |