diff --git a/gso/workflows/router/update_ibgp_mesh.py b/gso/workflows/router/update_ibgp_mesh.py index ccecb823368492ceb27c9428e793a7d165a04e4b..ac493144730646f3dea96d20db79d64660a276b3 100644 --- a/gso/workflows/router/update_ibgp_mesh.py +++ b/gso/workflows/router/update_ibgp_mesh.py @@ -13,12 +13,11 @@ from orchestrator.workflows.utils import wrap_modify_initial_input_form from pydantic import ConfigDict, model_validator from gso.products.product_types.router import Router -from gso.services import librenms_client, lso_client +from gso.services import librenms_client, lso_client, subscriptions from gso.services.lso_client import lso_interaction from gso.services.subscriptions import get_trunks_that_terminate_on_router from gso.utils.helpers import SNMPVersion from gso.utils.workflow_steps import add_all_pe_to_p_dry, add_all_pe_to_p_real -from gso.utils.workflow_steps import calculate_pe_router_list, generate_inventory def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator: @@ -85,63 +84,6 @@ def add_p_to_mesh_real(subscription: dict[str, Any], callback_route: str, tt_num extra_vars=extra_vars, ) - -@step("[DRY RUN] Add all PE routers to P router iBGP table") -def add_all_pe_to_p_dry( - subscription: dict[str, Any], pe_router_list: list[Router], callback_route: str, tt_number: str, process_id: UUIDstr -) -> None: - """Perform a dry run of adding the list of all PE routers to the new P router.""" - extra_vars = { - "dry_run": True, - "subscription": subscription, - "pe_router_list": { - router.router.router_fqdn: { - "lo4": str(router.router.router_lo_ipv4_address), - "lo6": str(router.router.router_lo_ipv6_address), - "vendor": router.router.vendor, - } - for router in pe_router_list - }, - "commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Update iBGP mesh", - "verb": "add_pe_to_p", - } - - lso_client.execute_playbook( - playbook_name="update_ibgp_mesh.yaml", - callback_route=callback_route, - inventory=subscription["router"]["router_fqdn"], - extra_vars=extra_vars, - ) - - -@step("[FOR REAL] Add all PE routers to P router iBGP table") -def add_all_pe_to_p_real( - subscription: dict[str, Any], pe_router_list: list[Router], callback_route: str, tt_number: str, process_id: UUIDstr -) -> None: - """Add the list of all PE routers to the new P router.""" - extra_vars = { - "dry_run": False, - "subscription": subscription, - "pe_router_list": { - router.router.router_fqdn: { - "lo4": str(router.router.router_lo_ipv4_address), - "lo6": str(router.router.router_lo_ipv6_address), - "vendor": router.router.vendor, - } - for router in pe_router_list - }, - "commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Update iBGP mesh", - "verb": "add_pe_to_p", - } - - lso_client.execute_playbook( - playbook_name="update_ibgp_mesh.yaml", - callback_route=callback_route, - inventory=subscription["router"]["router_fqdn"], - extra_vars=extra_vars, - ) - - @step("Verify iBGP session health") def check_ibgp_session(subscription: Router, callback_route: str) -> None: """Run a playbook using the provisioning proxy, to check the health of the new iBGP session."""