Merge branch 'main' into crc-idle_fix

pitt-crc · Sep 9, 2024 · 7dafc5d · 7dafc5d
2 parents 8b5648e + 143ee47
commit 7dafc5d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apps/crc_proposal_end.py b/apps/crc_proposal_end.py
@@ -42,7 +42,7 @@ def app_logic(self, args: Namespace) -> None:
         if not alloc_requests:
             print(f"\033[91m\033[1mNo active allocation information found in accounting system for '{args.account}'!\n")
             print("Showing end date for most recently expired Resource Allocation Request:\033[0m")
-            alloc_requests = get_most_recent_expired_request(keystone_session, group_id)
+            alloc_requests = [get_most_recent_expired_request(keystone_session, group_id)]
 
         for request in alloc_requests:
             print(f"'{request['title']}' ends on {request['expire']} ")
diff --git a/apps/crc_sus.py b/apps/crc_sus.py
@@ -66,8 +66,8 @@ def app_logic(self, args: Namespace) -> None:
 
         if not alloc_requests:
             print(f"\033[91m\033[1mNo active allocation information found in accounting system for '{args.account}'!\n")
-            print("Showing end date for most recently expired Resource Allocation Request:\033[0m")
-            alloc_requests = get_most_recent_expired_request(keystone_session, group_id)
+            print("Showing remaining service unit amounts for most recently expired Resource Allocation Request:\033[0m")
+            alloc_requests = [get_most_recent_expired_request(keystone_session, group_id)]
 
         per_cluster_totals = get_per_cluster_totals(keystone_session, alloc_requests,
                                                     get_enabled_cluster_ids(keystone_session))

diff --git a/apps/crc_usage.py b/apps/crc_usage.py
@@ -107,7 +107,7 @@ def app_logic(self, args: Namespace) -> None:
         if not alloc_requests:
             print(f"\033[91m\033[1mNo active allocation information found in accounting system for '{args.account}'!\n")
             print("Showing usage information for most recently expired Resource Allocation Request: \033[0m")
-            alloc_requests = get_most_recent_expired_request(keystone_session, group_id)
+            alloc_requests = [get_most_recent_expired_request(keystone_session, group_id)]
 
         clusters = get_enabled_cluster_ids(keystone_session)