From 2786b6b14b451a0ce4702c865a1c6aa73c2d3c57 Mon Sep 17 00:00:00 2001
From: Aleksandr Kurbatov <aleksandr.kurbatov@GL1342-AKURBATOV.local>
Date: Fri, 12 Jul 2024 14:02:19 +0100
Subject: [PATCH] Corrected `validate_iptrunk`
---
gso/workflows/iptrunk/validate_iptrunk.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gso/workflows/iptrunk/validate_iptrunk.py b/gso/workflows/iptrunk/validate_iptrunk.py
index af499cd2..8a9e964b 100644
--- a/gso/workflows/iptrunk/validate_iptrunk.py
+++ b/gso/workflows/iptrunk/validate_iptrunk.py
@@ -137,9 +137,10 @@ def verify_iptrunk_config(subscription: Iptrunk, callback_route: str) -> None:
inventory=f"{subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_fqdn}\n"
f"{subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn}\n",
extra_vars={
- "wfo_trunk_json": subscription,
+ "wfo_trunk_json": json.loads(json_dumps(subscription)),
"verb": "deploy",
"dry_run": "true",
+ "config_object": "trunk_interface",
"is_verification_workflow": "true",
},
)
@@ -149,14 +150,15 @@ def verify_iptrunk_config(subscription: Iptrunk, callback_route: str) -> None:
def check_ip_trunk_isis(subscription: Iptrunk, callback_route: str) -> None:
"""Run an Ansible playbook to check for any :term:`ISIS` configuration drift."""
execute_playbook(
- playbook_name="iptrunks_ibgp.yaml",
+ playbook_name="iptrunks.yaml",
callback_route=callback_route,
inventory=f"{subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_fqdn}\n"
f"{subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn}\n",
extra_vars={
- "wfo_trunk_json": subscription,
+ "wfo_trunk_json": json.loads(json_dumps(subscription)),
"verb": "deploy",
"dry_run": "true",
+ "config_object": "isis_interface",
"is_verification_workflow": "true",
},
)
@@ -171,7 +173,7 @@ def verify_twamp_config(subscription: Iptrunk, callback_route: str) -> None:
inventory=f"{subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_fqdn}\n"
f"{subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn}\n",
extra_vars={
- "wfo_trunk_json": subscription,
+ "subscription": json.loads(json_dumps(subscription)),
"verb": "deploy",
"dry_run": "true",
"is_verification_workflow": "true",
--
GitLab