Rename IPtrunk side iptrunk_side_ae_geant_a_sid to ga_id

gso/workflows/iptrunk/create_imported_iptrunk.py

@@ -39,12 +39,12 @@ def initial_input_form_generator() -> FormGenerator:
 
         side_a_node_id: active_router_selector()  # type: ignore[valid-type]
         side_a_ae_iface: str
-        side_a_ae_geant_a_sid: str | None = None
+        side_a_ga_id: str | None = None
         side_a_ae_members: Annotated[list[LAGMember], AfterValidator(validate_unique_list)]
 
         side_b_node_id: active_router_selector()  # type: ignore[valid-type]
         side_b_ae_iface: str
-        side_b_ae_geant_a_sid: str | None = None
+        side_b_ga_id: str | None = None
         side_b_ae_members: Annotated[list[LAGMember], AfterValidator(validate_unique_list)]
 
         iptrunk_ipv4_network: ipaddress.IPv4Network
@@ -79,11 +79,11 @@ def initialize_subscription(
     iptrunk_isis_metric: int,
     side_a_node_id: str,
     side_a_ae_iface: str,
-    side_a_ae_geant_a_sid: str | None,
+    side_a_ga_id: str | None,
     side_a_ae_members: LAGMemberList,
     side_b_node_id: str,
     side_b_ae_iface: str,
-    side_b_ae_geant_a_sid: str | None,
+    side_b_ga_id: str | None,
     side_b_ae_members: LAGMemberList,
 ) -> State:
     """Take all input from the user, and store it in the database."""
@@ -96,7 +96,7 @@ def initialize_subscription(
 
     subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node = Router.from_subscription(side_a_node_id).router
     subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_iface = side_a_ae_iface
-    subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid = side_a_ae_geant_a_sid
+    subscription.iptrunk.iptrunk_sides[0].ga_id = side_a_ga_id
     for member in side_a_ae_members:
         subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members.append(
             IptrunkInterfaceBlockInactive.new(subscription_id=uuid4(), **member),
@@ -104,7 +104,7 @@ def initialize_subscription(
 
     subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node = Router.from_subscription(side_b_node_id).router
     subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_iface = side_b_ae_iface
-    subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid = side_b_ae_geant_a_sid
+    subscription.iptrunk.iptrunk_sides[1].ga_id = side_b_ga_id
     for member in side_b_ae_members:
         subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members.append(
             IptrunkInterfaceBlockInactive.new(subscription_id=uuid4(), **member),

gso/workflows/iptrunk/create_iptrunk.py

@@ -144,7 +144,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
         model_config = ConfigDict(title=f"Provide subscription details for side A of the trunk. ({router_a_fqdn})")
 
         side_a_ae_iface: available_lags_choices(router_a) or str  # type: ignore[valid-type]
-        side_a_ae_geant_a_sid: str | None
+        side_a_ga_id: str | None
         side_a_ae_members: ae_members_side_a_type
 
     user_input_side_a = yield CreateIptrunkSideAForm
@@ -182,7 +182,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
         model_config = ConfigDict(title=f"Provide subscription details for side B of the trunk. ({router_b_fqdn})")
 
         side_b_ae_iface: available_lags_choices(router_b) or str  # type: ignore[valid-type]
-        side_b_ae_geant_a_sid: str | None
+        side_b_ga_id: str | None
         side_b_ae_members: ae_members_side_b
 
     user_input_side_b = yield CreateIptrunkSideBForm
@@ -204,11 +204,11 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
         "side_a_node",
         "side_a_ae_iface",
         "side_a_ae_members",
-        "side_a_ae_geant_a_sid",
+        "side_a_ga_id",
         "side_b_node",
         "side_b_ae_iface",
         "side_b_ae_members",
-        "side_b_ae_geant_a_sid",
+        "side_b_ga_id",
     ]
     yield from create_summary_form(summary_form_data, product_name, summary_fields)
 
@@ -329,11 +329,11 @@ def initialize_subscription(
     iptrunk_minimum_links: int,
     side_a_node_id: str,
     side_a_ae_iface: str,
-    side_a_ae_geant_a_sid: str | None,
+    side_a_ga_id: str | None,
     side_a_ae_members: list[dict],
     side_b_node_id: str,
     side_b_ae_iface: str,
-    side_b_ae_geant_a_sid: str | None,
+    side_b_ga_id: str | None,
     side_b_ae_members: list[dict],
 ) -> State:
     """Take all input from the user, and store it in the database."""
@@ -349,7 +349,7 @@ def initialize_subscription(
 
     subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node = side_a
     subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_iface = side_a_ae_iface
-    subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid = side_a_ae_geant_a_sid
+    subscription.iptrunk.iptrunk_sides[0].ga_id = side_a_ga_id
     for member in side_a_ae_members:
         subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members.append(
             IptrunkInterfaceBlockInactive.new(subscription_id=uuid4(), **member),
@@ -357,7 +357,7 @@ def initialize_subscription(
 
     subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node = side_b
     subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_iface = side_b_ae_iface
-    subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid = side_b_ae_geant_a_sid
+    subscription.iptrunk.iptrunk_sides[1].ga_id = side_b_ga_id
     for member in side_b_ae_members:
         subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members.append(
             IptrunkInterfaceBlockInactive.new(subscription_id=uuid4(), **member),

gso/workflows/iptrunk/modify_trunk_interface.py

@@ -125,7 +125,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
             subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_fqdn, default_type=str
         )
         side_a_ae_iface: ReadOnlyField(subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_iface, default_type=str)  # type: ignore[valid-type]
-        side_a_ae_geant_a_sid: str | None = subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid
+        side_a_ga_id: str | None = subscription.iptrunk.iptrunk_sides[0].ga_id
         side_a_ae_members: ae_members_side_a = (  # type: ignore[valid-type]
             subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members
             if initial_user_input.iptrunk_speed == subscription.iptrunk.iptrunk_speed
@@ -142,7 +142,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
             subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn, default_type=str
         )
         side_b_ae_iface: ReadOnlyField(subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_iface, default_type=str)  # type: ignore[valid-type]
-        side_b_ae_geant_a_sid: str | None = subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid
+        side_b_ga_id: str | None = subscription.iptrunk.iptrunk_sides[1].ga_id
         side_b_ae_members: ae_members_side_b = (  # type: ignore[valid-type]
             subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members
             if initial_user_input.iptrunk_speed == subscription.iptrunk.iptrunk_speed
@@ -259,9 +259,9 @@ def modify_iptrunk_subscription(
     iptrunk_description: str | None,
     iptrunk_speed: PhysicalPortCapacity,
     iptrunk_minimum_links: int,
-    side_a_ae_geant_a_sid: str | None,
+    side_a_ga_id: str | None,
     side_a_ae_members: list[dict],
-    side_b_ae_geant_a_sid: str | None,
+    side_b_ga_id: str | None,
     side_b_ae_members: list[dict],
 ) -> State:
     """Modify the subscription in the service database, reflecting the changes to the newly selected interfaces."""
@@ -293,9 +293,9 @@ def modify_iptrunk_subscription(
     subscription.iptrunk.iptrunk_speed = iptrunk_speed
     subscription.iptrunk.iptrunk_minimum_links = iptrunk_minimum_links
 
-    subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid = side_a_ae_geant_a_sid
+    subscription.iptrunk.iptrunk_sides[0].ga_id = side_a_ga_id
     update_side_members(subscription, 0, side_a_ae_members)
-    subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid = side_b_ae_geant_a_sid
+    subscription.iptrunk.iptrunk_sides[1].ga_id = side_b_ga_id
     update_side_members(subscription, 1, side_b_ae_members)
 
     side_names = sorted([

test/fixtures/iptrunk_fixtures.py

@@ -21,7 +21,7 @@ def iptrunk_side_subscription_factory(router_subscription_factory, faker):
     def subscription_create(
         iptrunk_side_node=None,
         iptrunk_side_ae_iface=None,
-        iptrunk_side_ae_geant_a_sid=None,
+        ga_id=None,
         iptrunk_side_ae_members=None,
         iptrunk_side_ae_members_description=None,
     ) -> IptrunkSideBlock:
@@ -31,7 +31,7 @@ def iptrunk_side_subscription_factory(router_subscription_factory, faker):
                 iptrunk_side_node or router_subscription_factory(vendor=Vendor.NOKIA)
             ).router,
             iptrunk_side_ae_iface=iptrunk_side_ae_iface or faker.pystr(),
-            iptrunk_side_ae_geant_a_sid=iptrunk_side_ae_geant_a_sid or faker.geant_sid(),
+            ga_id=ga_id or faker.geant_gid(),
             iptrunk_side_ae_members=iptrunk_side_ae_members
             or [
                 IptrunkInterfaceBlock.new(

test/workflows/iptrunk/test_modify_trunk_interface.py

@@ -58,9 +58,9 @@ def input_form_iptrunk_data(
     new_speed = PhysicalPortCapacity.FOUR_HUNDRED_GIGABIT_PER_SECOND
     new_link_count = 2
 
-    new_side_a_sid = faker.geant_sid()
+    new_side_a_gid = faker.geant_gid()
 
-    new_side_b_sid = faker.geant_sid()
+    new_side_b_gid = faker.geant_gid()
 
     return [
         {"subscription_id": product_id},
@@ -74,11 +74,11 @@ def input_form_iptrunk_data(
         },
         {},
         {
-            "side_a_ae_geant_a_sid": new_side_a_sid,
+            "side_a_ae_geant_a_sid": new_side_a_gid,
             "side_a_ae_members": new_side_a_ae_members,
         },
         {
-            "side_b_ae_geant_a_sid": new_side_b_sid,
+            "side_b_ae_geant_a_sid": new_side_b_gid,
             "side_b_ae_members": new_side_b_ae_members,
         },
     ]
@@ -136,9 +136,9 @@ def test_iptrunk_modify_trunk_interface_success(
     assert mock_provision_ip_trunk.call_count == lso_interaction_count
     # Assert all Netbox calls have been made
     new_sid = input_form_iptrunk_data[1]["gs_id"]
-    new_side_a_sid = input_form_iptrunk_data[3]["side_a_ae_geant_a_sid"]
+    new_side_a_gid = input_form_iptrunk_data[3]["side_a_ae_geant_a_sid"]
     new_side_a_ae_members = input_form_iptrunk_data[3]["side_a_ae_members"]
-    new_side_b_sid = input_form_iptrunk_data[4]["side_b_ae_geant_a_sid"]
+    new_side_b_gid = input_form_iptrunk_data[4]["side_b_ae_geant_a_sid"]
     new_side_b_ae_members = input_form_iptrunk_data[4]["side_b_ae_members"]
 
     # Only Nokia interfaces are checked
@@ -170,7 +170,7 @@ def test_iptrunk_modify_trunk_interface_success(
     assert subscription.iptrunk.iptrunk_type == input_form_iptrunk_data[1]["iptrunk_type"]
     assert subscription.iptrunk.iptrunk_speed == input_form_iptrunk_data[1]["iptrunk_speed"]
     assert subscription.iptrunk.iptrunk_minimum_links == input_form_iptrunk_data[1]["iptrunk_number_of_members"] - 1
-    assert subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_geant_a_sid == new_side_a_sid
+    assert subscription.iptrunk.iptrunk_sides[0].ga_id == new_side_a_gid
 
     def _find_interface_by_name(interfaces: LAGMemberList, name: str):
         for interface in interfaces:
@@ -185,7 +185,7 @@ def test_iptrunk_modify_trunk_interface_success(
             == _find_interface_by_name(new_side_a_ae_members, member.interface_name).interface_description
         )
 
-    assert subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_geant_a_sid == new_side_b_sid
+    assert subscription.iptrunk.iptrunk_sides[1].ga_id == new_side_b_gid
 
     for member in subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members:
         assert (