diff --git a/Changelog.md b/Changelog.md index 19b63b7d1e636579620c0f0611ba1a4ef970a372..7b6914b5a5164d528a80a7d7d8d8692b3a0ebe8a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,8 @@ # Changelog +## [2.38] - 2025-02-14 +- fix validate base config if there is a vprn + ## [2.37] - 2025-02-14 - fix redeploy base config if there is a vprn diff --git a/gso/workflows/router/validate_router.py b/gso/workflows/router/validate_router.py index 89a05004d48742ebdecff943b95f2914a651edba..a469237e5a4bdf365934203edaf90a7cfad17d16 100644 --- a/gso/workflows/router/validate_router.py +++ b/gso/workflows/router/validate_router.py @@ -16,6 +16,7 @@ from gso.services.kentik_client import KentikClient from gso.services.librenms_client import LibreNMSClient from gso.services.lso_client import LSOState, anonymous_lso_interaction from gso.services.netbox_client import NetboxClient +from gso.services.subscriptions import get_active_vrfs_linked_to_router from gso.utils.helpers import generate_inventory_for_routers from gso.utils.shared_enums import Vendor @@ -154,11 +155,13 @@ def check_kentik_entry_exists(subscription: Router) -> None: @step("Check base config for drift") def verify_base_config(subscription: dict[str, Any]) -> LSOState: """Workflow step for running a playbook that checks whether base config has drifted.""" + vrf_list = get_active_vrfs_linked_to_router(str(subscription["subscription_id"])) return { "playbook_name": "gap_ansible/playbooks/base_config.yaml", "inventory": {"all": {"hosts": {subscription["router"]["router_fqdn"]: None}}}, "extra_vars": { "wfo_router_json": subscription, + "vrf_list": vrf_list, "verb": "deploy", "dry_run": "true", "is_verification_workflow": "true", diff --git a/setup.py b/setup.py index 34e18cd6f9e462edfac6d9c7c580536662a9c247..bb5d35a7a8a130ee8caebf15f4380b2003c3fce0 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from setuptools import find_packages, setup setup( name="geant-service-orchestrator", - version="2.37", + version="2.38", author="GÉANT Orchestration and Automation Team", author_email="goat@geant.org", description="GÉANT Service Orchestrator",