From 09f509ebc4acb62f53b9ca498958bedee5e22ca4 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Tue, 3 Dec 2024 09:46:34 +0000
Subject: [PATCH] Clean up unused state keys
---
gso/workflows/router/promote_p_to_pe.py | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/gso/workflows/router/promote_p_to_pe.py b/gso/workflows/router/promote_p_to_pe.py
index 8db471f7..8fdc746f 100644
--- a/gso/workflows/router/promote_p_to_pe.py
+++ b/gso/workflows/router/promote_p_to_pe.py
@@ -61,19 +61,12 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
@step("Run pre-deployment checks")
-def run_pre_checks(subscription: dict[str, Any], tt_number: str, process_id: UUIDstr) -> LSOState:
+def run_pre_checks(subscription: dict[str, Any]) -> LSOState:
"""Run pre-deployment checks."""
- extra_vars = {
- "dry_run": False,
- "subscription": subscription,
- "commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - pre-deployment checks",
- "verb": "pre_checks",
- }
-
return {
"playbook_name": "gap_ansible/playbooks/promote_p_to_pe.yaml",
"inventory": {"all": {"hosts": {subscription["router"]["router_fqdn"]: None}}},
- "extra_vars": extra_vars,
+ "extra_vars": {"subscription": subscription, "verb": "pre_checks"},
}
@@ -200,19 +193,12 @@ def deploy_routing_instances_real(subscription: dict[str, Any], tt_number: str,
@step("Run post-deployment checks")
-def run_post_checks(subscription: dict[str, Any], tt_number: str, process_id: UUIDstr) -> LSOState:
+def run_post_checks(subscription: dict[str, Any]) -> LSOState:
"""Run post-deployment checks."""
- extra_vars = {
- "dry_run": False,
- "subscription": subscription,
- "commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Run post-deployment checks",
- "verb": "post_checks",
- }
-
return {
"playbook_name": "gap_ansible/playbooks/promote_p_to_pe.yaml",
"inventory": {"all": {"hosts": {subscription["router"]["router_fqdn"]: None}}},
- "extra_vars": extra_vars,
+ "extra_vars": {"subscription": subscription, "verb": "post_checks"},
}
--
GitLab