Merge branch 'develop' into feat-subscribe-mail-lists

create_account.py

@@ -3,14 +3,22 @@ import sys
 import rc_util
 
 if len(sys.argv) < 2:
-    print("Usage: {} USERNAME [FULL_NAME] [REASON]".format(sys.argv[0]), file=sys.stderr)
+    print("Usage: {} USERNAME [EMAIL] [FULL_NAME] [REASON]".format(sys.argv[0]), file=sys.stderr)
     exit(1)
 
+domain = 'uab.edu'
 user_name = sys.argv[1]
-full_name = sys.argv[2] if len(sys.argv) >= 3 else ''
-reason    = sys.argv[3] if len(sys.argv) >= 4 else ''
+email = sys.argv[2] if len(sys.argv) >= 3 else ''
+full_name = sys.argv[3] if len(sys.argv) >= 4 else ''
+reason    = sys.argv[4] if len(sys.argv) >= 5 else ''
 
-rc_util.add_account(user_name, full=full_name, reason=reason)
+if email == '':
+    if '@' in user_name:
+        email = user_name
+    else:
+        email = user_name + '@' + domain
+
+rc_util.add_account(user_name, email=email, full=full_name, reason=reason)
 print("Account requested for user: {}".format(user_name))
 
 print("Waiting for confirmation...")

rc_util.py

+import logging
+import argparse
 from rc_rmq import RCRMQ
 import json
 
 rc_rmq = RCRMQ({'exchange': 'RegUsr', 'exchange_type': 'topic'})
 tasks = {'ohpc_account': None, 'ood_account': None, 'slurm_account': None}
+logger_fmt = '%(asctime)s [%(module)s] - %(message)s'
 
-def add_account(username, full='', reason=''):
+def add_account(username, email, full='', reason=''):
   rc_rmq.publish_msg({
     'routing_key': 'request.' + username,
     'msg': {
       "username": username,
+      "email": email,
       "fullname": full,
       "reason": reason
     }
@@ -43,3 +47,26 @@ def consume(username, callback=worker, debug=False):
         rc_rmq.disconnect()
 
     return { 'success' : True }
+
+def get_args():
+    # Parse arguments
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-v', '--verbose', action='store_true', help='verbose output')
+    parser.add_argument('-n', '--dry-run', action='store_true', help='enable dry run mode')
+    return parser.parse_args()
+
+def get_logger(args=None):
+    if args is None:
+        args = get_args()
+
+    logger_lvl = logging.WARNING
+
+    if args.verbose:
+        logger_lvl = logging.DEBUG
+
+    if args.dry_run:
+        logger_lvl = logging.INFO
+
+    logging.basicConfig(format=logger_fmt, level=logger_lvl)
+    return logging.getLogger(__name__)
+