From ae68be3ba891ad37f686eb6c2abdd3a0a9a9dd25 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Tue, 2 Jan 2024 17:44:30 +0100
Subject: [PATCH] update method name to prevent confusion
---
gso/workflows/iptrunk/terminate_iptrunk.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/gso/workflows/iptrunk/terminate_iptrunk.py b/gso/workflows/iptrunk/terminate_iptrunk.py
index c0c47a8f..cd2614c7 100644
--- a/gso/workflows/iptrunk/terminate_iptrunk.py
+++ b/gso/workflows/iptrunk/terminate_iptrunk.py
@@ -90,7 +90,7 @@ def deprovision_ip_trunk_real(subscription: Iptrunk, process_id: UUIDstr, callba
return {"subscription": subscription}
-def _remove_interface_from_netbox(side_block: IptrunkSideBlock) -> None:
+def _free_up_interfaces_from_netbox(side_block: IptrunkSideBlock) -> None:
nbclient = NetboxClient()
for member in side_block.iptrunk_side_ae_members:
@@ -101,17 +101,17 @@ def _remove_interface_from_netbox(side_block: IptrunkSideBlock) -> None:
@step("Netbox: Remove interfaces on side A")
-def netbox_remove_side_a_interfaces(subscription: Iptrunk) -> State:
+def netbox_clean_up_side_a(subscription: Iptrunk) -> State:
"""Mark used interfaces on side A as free in Netbox."""
- _remove_interface_from_netbox(subscription.iptrunk.iptrunk_sides[0])
+ _free_up_interfaces_from_netbox(subscription.iptrunk.iptrunk_sides[0])
return {"subscription": subscription}
@step("Netbox: Remove interfaces on side B")
-def netbox_remove_side_b_interfaces(subscription: Iptrunk) -> State:
+def netbox_clean_up_side_b(subscription: Iptrunk) -> State:
"""Mark used interfaces on side B as free in Netbox."""
- _remove_interface_from_netbox(subscription.iptrunk.iptrunk_sides[1])
+ _free_up_interfaces_from_netbox(subscription.iptrunk.iptrunk_sides[1])
return {"subscription": subscription}
@@ -177,8 +177,8 @@ def terminate_iptrunk() -> StepList:
>> store_process_subscription(Target.TERMINATE)
>> unsync
>> run_config_steps(config_steps)
- >> side_a_is_nokia(netbox_remove_side_a_interfaces)
- >> side_b_is_nokia(netbox_remove_side_b_interfaces)
+ >> side_a_is_nokia(netbox_clean_up_side_a)
+ >> side_b_is_nokia(netbox_clean_up_side_b)
>> run_ipam_steps(ipam_steps)
>> set_status(SubscriptionLifecycle.TERMINATED)
>> resync
--
GitLab