Merge pull request #130 from eesaanatluri/feat-change-blocked-to-hold

Use hold in place of blocked for state.

account_manager.py

@@ -14,7 +14,7 @@ parser = argparse.ArgumentParser(description = "Account management driver script
 parser.add_argument(
     "username", help="Username that should be locked/unlocked")
 parser.add_argument(
-    "state", choices=['ok', 'blocked', 'certification'], help="Choose from states (ok,blocked,certification)")
+    "state", choices=['ok', 'hold', 'certification'], help="Choose from states (ok,hold,certification)")
 parser.add_argument(
     "-s", "--service", nargs='+', default='all', choices=['ssh', 'newjobs', 'expiration', 'all'], help="List one or more services to be blocked (default: %(default)s)")
 parser.add_argument(

prod_rmq_agents/acct_mgmt_workflow.py

@@ -31,7 +31,7 @@ def manage_acct(ch, method, properties, body):
         current =  tracking[username] = {}
 
     if op == 'request':
-        if state == 'blocked' or state == 'certification':
+        if state == 'hold' or state == 'certification':
             msg["action"] = "lock"
         elif state == 'ok':
             msg["action"] = "unlock"