From 5af474cae9d73189cf6eafd9636781fbef1b02d6 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <ak@geant.org>
Date: Wed, 8 Jan 2025 18:18:01 +0000
Subject: [PATCH] Exclude provisioning routers from the inventory calculations
in P-to-PE
---
gso/utils/workflow_steps.py | 4 ++--
gso/workflows/router/promote_p_to_pe.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gso/utils/workflow_steps.py b/gso/utils/workflow_steps.py
index 0250eb8ce..5e9abc576 100644
--- a/gso/utils/workflow_steps.py
+++ b/gso/utils/workflow_steps.py
@@ -52,7 +52,7 @@ def _update_sdp_mesh(
dry_run: bool,
) -> LSOState:
inventory = generate_inventory_for_routers(
- router_role=RouterRole.PE, router_vendor=Vendor.NOKIA, exclude_routers=[subscription["router"]["router_fqdn"]]
+ router_role=RouterRole.PE, router_vendor=Vendor.NOKIA, exclude_routers=[subscription["router"]["router_fqdn"]], include_provisioning_routers=False
)
extra_vars = {
@@ -149,7 +149,7 @@ def _add_pe_to_pe_mesh(
dry_run: bool,
) -> LSOState:
inventory = generate_inventory_for_routers(
- router_role=RouterRole.PE, exclude_routers=[subscription["router"]["router_fqdn"]]
+ router_role=RouterRole.PE, exclude_routers=[subscription["router"]["router_fqdn"]], include_provisioning_routers=False
)
extra_vars = {
"dry_run": dry_run,
diff --git a/gso/workflows/router/promote_p_to_pe.py b/gso/workflows/router/promote_p_to_pe.py
index 8fdc746f4..914c49b39 100644
--- a/gso/workflows/router/promote_p_to_pe.py
+++ b/gso/workflows/router/promote_p_to_pe.py
@@ -135,7 +135,7 @@ def remove_p_from_pe_dry(subscription: dict[str, Any], tt_number: str, process_i
return {
"playbook_name": "gap_ansible/playbooks/update_ibgp_mesh.yaml",
- "inventory": generate_inventory_for_routers(RouterRole.PE),
+ "inventory": generate_inventory_for_routers(RouterRole.PE, include_provisioning_routers=False),
"extra_vars": extra_vars,
}
@@ -153,7 +153,7 @@ def remove_p_from_pe_real(subscription: dict[str, Any], tt_number: str, process_
return {
"playbook_name": "gap_ansible/playbooks/update_ibgp_mesh.yaml",
- "inventory": generate_inventory_for_routers(RouterRole.PE),
+ "inventory": generate_inventory_for_routers(RouterRole.PE, include_provisioning_routers=False),
"extra_vars": extra_vars,
}
--
GitLab