Rename kpov_random_helpers to kpov_util

1 files changed, 13 insertions, 13 deletions

diff --git a/kpov_judge/tasks/radius_mysql_pam/task.py b/kpov_judge/tasks/radius_mysql_pam/task.py
index a3f86f7..1a11ef8 100644
--- a/kpov_judge/tasks/radius_mysql_pam/task.py
+++ b/kpov_judge/tasks/radius_mysql_pam/task.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# kpov_random_helpers should be imported by add_assignment.py
+# kpov_util should be imported by add_assignment.py
 
 instructions = {
     'si':"""
@@ -105,9 +105,9 @@ def task(IP_RS, RADIUS_SECRET, RADIUS_USERNAME, RADIUS_PASSWORD, MYSQL_DB_NAME,
     peer_user = 'student'
     peer_passwd = 'vaje'
     r = random.Random(MYSQL_SEED)
-    MYSQL_TEST_USER = kpov_random_helpers.username_gen(r)
-    MYSQL_TEST_PASSWORD = kpov_random_helpers.alnum_gen(r, 7)
-    RADIUS_NEW_PASSWORD = kpov_random_helpers.alnum_gen(r, 7)
+    MYSQL_TEST_USER = kpov_util.username_gen(r)
+    MYSQL_TEST_PASSWORD = kpov_util.alnum_gen(r, 7)
+    RADIUS_NEW_PASSWORD = kpov_util.alnum_gen(r, 7)
     # Testiranje radius strtežnika
     results['Test_RadiusServer'] = pexpect.run('radtest {0} {1} {2} 1812 {3}'.format(
         RADIUS_USERNAME, RADIUS_PASSWORD, IP_RS, RADIUS_SECRET))
@@ -144,12 +144,12 @@ def task(IP_RS, RADIUS_SECRET, RADIUS_USERNAME, RADIUS_PASSWORD, MYSQL_DB_NAME,
 def gen_params(user_id, params_meta):
     params = dict()
     r = random.Random(user_id)
-    params['RADIUS_SECRET'] = kpov_random_helpers.alnum_gen(r, 8)
-    params['RADIUS_PASSWORD'] = kpov_random_helpers.alnum_gen(r, 8)
-    params['RADIUS_USERNAME'] = kpov_random_helpers.username_gen(r)
-    params['MYSQL_ADMIN_USER'] = kpov_random_helpers.alnum_gen(r, 6)
-    params['MYSQL_ADMIN_PASSWORD'] = kpov_random_helpers.alnum_gen(r, 6)
-    params['MYSQL_DB_NAME'] = kpov_random_helpers.alnum_gen(r, 4)
+    params['RADIUS_SECRET'] = kpov_util.alnum_gen(r, 8)
+    params['RADIUS_PASSWORD'] = kpov_util.alnum_gen(r, 8)
+    params['RADIUS_USERNAME'] = kpov_util.username_gen(r)
+    params['MYSQL_ADMIN_USER'] = kpov_util.alnum_gen(r, 6)
+    params['MYSQL_ADMIN_PASSWORD'] = kpov_util.alnum_gen(r, 6)
+    params['MYSQL_DB_NAME'] = kpov_util.alnum_gen(r, 4)
     params['MYSQL_SEED'] = str(r.random())
     return params
 
@@ -159,9 +159,9 @@ def task_check(results, params):
     score = 0
     hints = []
     r = random.Random(params['MYSQL_SEED'])
-    MYSQL_TEST_USER = kpov_random_helpers.username_gen(r)
-    MYSQL_TEST_PASSWORD = kpov_random_helpers.alnum_gen(r, 7)
-    RADIUS_NEW_PASSWORD = kpov_random_helpers.alnum_gen(r, 7)
+    MYSQL_TEST_USER = kpov_util.username_gen(r)
+    MYSQL_TEST_PASSWORD = kpov_util.alnum_gen(r, 7)
+    RADIUS_NEW_PASSWORD = kpov_util.alnum_gen(r, 7)
     s = r"Sent Access-Request Id [0-9]+ from ([0-9]|\.)+:[0-9]+ to {IP_RS}:1812 length [0-9]+\r\n\tUser-Name = \"{RADIUS_USERNAME}\"\r\n\tUser-Password = \"{RADIUS_PASSWORD}\".*Access-Accept Id [0-9]+ from {IP_RS}".format(**params)
     #with open('test.pickle', 'w') as f:
     #    pickle.dump({'pattern': s, 'res': results['Test_RadiusServer']}, f)