diff --git a/lib/random_user.py b/lib/random_user.py index fa2b1d2b16deb195fe454b56f48c7af9cf780d73..097049bd2c8c1e7d08b90512c376996e5a86808f 100644 --- a/lib/random_user.py +++ b/lib/random_user.py @@ -61,8 +61,8 @@ class RandomUser: person["roomNumber"] = str(random.randint(1, 50))+"."+str(random.randint(1, 50))+random.choice(string.ascii_uppercase) person["email"] = "rossner@univention.de" person['is_admin'] = False - callback(person) + callback(person, random = True) if create_admins: person['username'] = person['username']+'-admin' person['is_admin'] = True - callback(person) + callback(person, random = True) diff --git a/user_import_udm_rest_api.py b/user_import_udm_rest_api.py index 0c9ebd0769bd9fd1c7a92d7e8dd325a5121d56ab..d1b9f85d9a766657173211eb8eb1939430af00e0 100755 --- a/user_import_udm_rest_api.py +++ b/user_import_udm_rest_api.py @@ -15,14 +15,17 @@ from lib.import_user import ImportUser admin_user = 'default.admin' logging.basicConfig(format='%(asctime)s %(message)s', level=logging.ERROR) -def import_callback(person): +def import_callback(person, random = False): global new_user_password if len(new_user_password) < 1: person['password'] = ''.join(random.choice(string.ascii_lowercase) for _ in range(16)) else: person['password'] = new_user_password ucs.set_user(person) - logging.error(f"# {ucs.get_counter()}") + if random: + logging.error(f"# {ucs.get_counter()}: {person['username']} / {person['password']}") + else: + logging.error(f"# {ucs.get_counter()}") if os.getenv('IMPORT_DOMAIN'): base_url = os.getenv('IMPORT_DOMAIN')