From 9fd85a57cf4c2225da77c9207ef899b0cc11ebea Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Wed, 16 Aug 2023 16:39:26 +0200
Subject: [PATCH] update keys from device to router in ip_trunk endpoint

---
 lso/routes/ip_trunk.py       | 20 +++++++--------
 test/routes/test_ip_trunk.py | 48 ++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/lso/routes/ip_trunk.py b/lso/routes/ip_trunk.py
index a39a241..2fa8298 100644
--- a/lso/routes/ip_trunk.py
+++ b/lso/routes/ip_trunk.py
@@ -74,18 +74,16 @@ def provision_ip_trunk(params: IPTrunkProvisioningParams) -> PlaybookLaunchRespo
         "dry_run": str(params.dry_run),
         "verb": "deploy",
         "config_object": params.object,
-        "commit_comment": f"IPtrunk "
-        f"{params.subscription['iptrunk']['geant_s_sid']} "
-        f"({params.subscription['subscription_id']}) - "
-        f"deployment of {params.object}",
+        "commit_comment": f"IPtrunk {params.subscription['iptrunk']['geant_s_sid']} "
+        f"({params.subscription['subscription_id']}) - deployment of {params.object}",
     }
 
     return run_playbook(
         playbook_path=path.join(config_params.ansible_playbooks_root_dir, "iptrunks.yaml"),
         inventory=str(
-            params.subscription["iptrunk"]["iptrunk_sideA_node"]["device_fqdn"]
+            params.subscription["iptrunk"]["iptrunk_sideA_node"]["router_fqdn"]
             + "\n"
-            + params.subscription["iptrunk"]["iptrunk_sideB_node"]["device_fqdn"]
+            + params.subscription["iptrunk"]["iptrunk_sideB_node"]["router_fqdn"]
             + "\n"
         ),
         extra_vars=extra_vars,
@@ -115,9 +113,9 @@ def modify_ip_trunk(params: IPTrunkModifyParams) -> PlaybookLaunchResponse:
     return run_playbook(
         playbook_path=path.join(config_params.ansible_playbooks_root_dir, "iptrunks.yaml"),
         inventory=str(
-            params.subscription["iptrunk"]["iptrunk_sideA_node"]["device_fqdn"]
+            params.subscription["iptrunk"]["iptrunk_sideA_node"]["router_fqdn"]
             + "\n"
-            + params.subscription["iptrunk"]["iptrunk_sideB_node"]["device_fqdn"]
+            + params.subscription["iptrunk"]["iptrunk_sideB_node"]["router_fqdn"]
             + "\n"
         ),
         extra_vars=extra_vars,
@@ -149,9 +147,9 @@ def delete_ip_trunk(params: IPTrunkDeleteParams) -> PlaybookLaunchResponse:
     return run_playbook(
         playbook_path=path.join(config_params.ansible_playbooks_root_dir, "iptrunks.yaml"),
         inventory=str(
-            params.subscription["iptrunk"]["iptrunk_sideA_node"]["device_fqdn"]
+            params.subscription["iptrunk"]["iptrunk_sideA_node"]["router_fqdn"]
             + "\n"
-            + params.subscription["iptrunk"]["iptrunk_sideB_node"]["device_fqdn"]
+            + params.subscription["iptrunk"]["iptrunk_sideB_node"]["router_fqdn"]
             + "\n"
         ),
         extra_vars=extra_vars,
@@ -175,7 +173,7 @@ def check_ip_trunk(params: IPTrunkCheckParams) -> PlaybookLaunchResponse:
 
     return run_playbook(
         playbook_path=path.join(config_params.ansible_playbooks_root_dir, "iptrunks_checks.yaml"),
-        inventory=params.subscription["iptrunk"]["iptrunk_sideA_node"]["device_fqdn"],
+        inventory=params.subscription["iptrunk"]["iptrunk_sideA_node"]["router_fqdn"],
         extra_vars=extra_vars,
         callback=params.callback,
     )
diff --git a/test/routes/test_ip_trunk.py b/test/routes/test_ip_trunk.py
index af00375..1ca8e32 100644
--- a/test/routes/test_ip_trunk.py
+++ b/test/routes/test_ip_trunk.py
@@ -21,15 +21,15 @@ _SUBSCRIPTION_OBJECT = {
         "iptrunk_sideA_ae_members": ["ge-0/0/0"],
         "iptrunk_sideA_ae_members_description": ["this is the first interface on side A"],
         "iptrunk_sideA_node": {
-            "device_fqdn": "rtx.city.country.geant.net",
-            "device_ias_lt_ipv4_network": "1.0.0.0/31",
-            "device_ias_lt_ipv6_network": "dead:beef::3/126",
-            "device_lo_ipv4_address": "1.0.0.0",
-            "device_lo_ipv6_address": "dead:beef::",
-            "device_lo_iso_address": "00.0000.0000.0000.0000.0000.00",
-            "device_role": "p",
-            "device_si_ipv4_network": "0.0.1.0/31",
-            "device_site": {
+            "router_fqdn": "rtx.city.country.geant.net",
+            "router_ias_lt_ipv4_network": "1.0.0.0/31",
+            "router_ias_lt_ipv6_network": "dead:beef::3/126",
+            "router_lo_ipv4_address": "1.0.0.0",
+            "router_lo_ipv6_address": "dead:beef::",
+            "router_lo_iso_address": "00.0000.0000.0000.0000.0000.00",
+            "router_role": "p",
+            "router_si_ipv4_network": "0.0.1.0/31",
+            "router_site": {
                 "name": "SiteBlock",
                 "label": None,
                 "site_city": "City",
@@ -43,10 +43,10 @@ _SUBSCRIPTION_OBJECT = {
                 "owner_subscription_id": "0",
                 "site_bgp_community_id": 0,
                 "subscription_instance_id": "0",
+                "site_ts_address": "127.0.0.2",
             },
-            "device_ts_address": "127.0.0.1",
-            "device_ts_port": 22,
-            "device_vendor": "vendor",
+            "router_ts_port": 22,
+            "router_vendor": "vendor",
             "owner_subscription_id": "0",
             "subscription_instance_id": "0",
         },
@@ -55,15 +55,15 @@ _SUBSCRIPTION_OBJECT = {
         "iptrunk_sideB_ae_members": ["ge-0/0/0"],
         "iptrunk_sideB_ae_members_description": ["this is the first interface side B"],
         "iptrunk_sideB_node": {
-            "device_fqdn": "rtx.town.country.geant.net",
-            "device_ias_lt_ipv4_network": "0.0.0.0/31",
-            "device_ias_lt_ipv6_network": "deaf:beef::1/126",
-            "device_lo_ipv4_address": "0.0.0.0",
-            "device_lo_ipv6_address": "dead:beef::2",
-            "device_lo_iso_address": "00.0000.0000.0000.0000.0000.00",
-            "device_role": "p",
-            "device_si_ipv4_network": "0.1.0.0/31",
-            "device_site": {
+            "router_fqdn": "rtx.town.country.geant.net",
+            "router_ias_lt_ipv4_network": "0.0.0.0/31",
+            "router_ias_lt_ipv6_network": "deaf:beef::1/126",
+            "router_lo_ipv4_address": "0.0.0.0",
+            "router_lo_ipv6_address": "dead:beef::2",
+            "router_lo_iso_address": "00.0000.0000.0000.0000.0000.00",
+            "router_role": "p",
+            "router_si_ipv4_network": "0.1.0.0/31",
+            "router_site": {
                 "name": "SiteBlock",
                 "label": None,
                 "site_city": "Town",
@@ -77,10 +77,10 @@ _SUBSCRIPTION_OBJECT = {
                 "owner_subscription_id": "0",
                 "site_bgp_community_id": 2,
                 "subscription_instance_id": "0",
+                "site_ts_address": "127.0.0.2",
             },
-            "device_ts_address": "127.0.0.2",
-            "device_ts_port": 22,
-            "device_vendor": "vendor",
+            "router_ts_port": 22,
+            "router_vendor": "vendor",
             "owner_subscription_id": "0",
             "subscription_instance_id": "0",
         },
-- 
GitLab