From 0fd4df51da709042023152afbc5b8e37c5864006 Mon Sep 17 00:00:00 2001
From: atlurie <atlurie@uab.edu>
Date: Thu, 19 May 2022 14:36:48 -0500
Subject: [PATCH] Use hold in place of blocked for state.
---
account_manager.py | 2 +-
prod_rmq_agents/acct_mgmt_workflow.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/account_manager.py b/account_manager.py
index 52b7475..a4b7017 100755
--- a/account_manager.py
+++ b/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(
diff --git a/prod_rmq_agents/acct_mgmt_workflow.py b/prod_rmq_agents/acct_mgmt_workflow.py
index 922d802..0907fa0 100755
--- a/prod_rmq_agents/acct_mgmt_workflow.py
+++ b/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"
--
GitLab