diff --git a/gso/api/v1/network.py b/gso/api/v1/network.py
index e4a19de9e90475f70261e4bf408498de68a95af9..81a209b7e4365f8a4d3e90573a1160ea02ea1131 100644
--- a/gso/api/v1/network.py
+++ b/gso/api/v1/network.py
@@ -64,7 +64,7 @@ class IptrunkBlock(OrchestratorBaseModel):
iptrunk_capacity: str
iptrunk_isis_metric: int
iptrunk_sides: list[IptrunkSideBlock]
- geant_s_sid: str
+ gs_id: str
class IptrunkSchema(OrchestratorBaseModel):
@@ -109,7 +109,7 @@ def network_topology() -> NetworkTopologyDomainModelSchema:
"iptrunk_capacity": _calculate_iptrunk_capacity(
extended_model["iptrunk"]["iptrunk_sides"], extended_model["iptrunk"]["iptrunk_speed"]
),
- "geant_s_sid": extended_model["iptrunk"]["geant_s_sid"],
+ "gs_id": extended_model["iptrunk"]["gs_id"],
"iptrunk_sides": [
{
"subscription_instance_id": side["subscription_instance_id"],
diff --git a/gso/cli/imports.py b/gso/cli/imports.py
index 14a45ad05810386d27abc66cc68129f668e0930c..9903d186ad89a7a2711dea2911c4cc13150c660c 100644
--- a/gso/cli/imports.py
+++ b/gso/cli/imports.py
@@ -116,7 +116,7 @@ class IptrunkImportModel(BaseModel):
"""Required fields for importing an existing ``gso.products.product_types.iptrunk``."""
partner: str
- geant_s_sid: str | None
+ gs_id: str | None
iptrunk_type: IptrunkType
iptrunk_description: str | None = None
iptrunk_speed: PhysicalPortCapacity
@@ -592,7 +592,7 @@ def import_iptrunks(filepath: str = common_filepath_option) -> None:
try:
initial_data = IptrunkImportModel(
partner="GEANT",
- geant_s_sid=trunk["id"],
+ gs_id=trunk["id"],
iptrunk_type=trunk["config"]["common"]["type"],
iptrunk_description=trunk["config"]["common"].get("description", ""),
iptrunk_speed=trunk["config"]["common"]["link_speed"],
diff --git a/gso/utils/workflow_steps.py b/gso/utils/workflow_steps.py
index 721e18452e7f1aaded81a863bdfca514d8a11acd..0250eb8ce83649c8afe8a5d3cf287775eddce705 100644
--- a/gso/utils/workflow_steps.py
+++ b/gso/utils/workflow_steps.py
@@ -318,7 +318,7 @@ def set_isis_to_max(subscription: Iptrunk, process_id: UUIDstr, tt_number: str)
"verb": "deploy",
"config_object": "isis_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
diff --git a/gso/workflows/iptrunk/create_imported_iptrunk.py b/gso/workflows/iptrunk/create_imported_iptrunk.py
index 5cf9c5f8bfad0b2ff9062e3ec3e058c24b6d9671..77774049f32307fbed002631ad21acac97a1256a 100644
--- a/gso/workflows/iptrunk/create_imported_iptrunk.py
+++ b/gso/workflows/iptrunk/create_imported_iptrunk.py
@@ -30,7 +30,7 @@ def initial_input_form_generator() -> FormGenerator:
model_config = ConfigDict(title="Import Iptrunk")
partner: str
- geant_s_sid: str | None = None
+ gs_id: str | None = None
iptrunk_description: str | None = None
iptrunk_type: IptrunkType
iptrunk_speed: PhysicalPortCapacity
@@ -71,7 +71,7 @@ def create_subscription(partner: str) -> State:
@step("Initialize subscription")
def initialize_subscription(
subscription: ImportedIptrunkInactive,
- geant_s_sid: str | None,
+ gs_id: str | None,
iptrunk_type: IptrunkType,
iptrunk_description: str,
iptrunk_speed: PhysicalPortCapacity,
@@ -87,7 +87,7 @@ def initialize_subscription(
side_b_ae_members: LAGMemberList,
) -> State:
"""Take all input from the user, and store it in the database."""
- subscription.iptrunk.geant_s_sid = geant_s_sid
+ subscription.iptrunk.gs_id = gs_id
subscription.iptrunk.iptrunk_description = iptrunk_description
subscription.iptrunk.iptrunk_type = iptrunk_type
subscription.iptrunk.iptrunk_speed = iptrunk_speed
@@ -113,7 +113,7 @@ def initialize_subscription(
subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_site.site_name,
subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_site.site_name,
])
- subscription.description = f"IP trunk {side_names[0]} {side_names[1]}, geant_s_sid:{geant_s_sid}"
+ subscription.description = f"IP trunk {side_names[0]} {side_names[1]}, gs_id:{gs_id}"
return {"subscription": subscription}
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index f8b54c61f43cd303335c1f3eb9fa2057cfee4cc9..c786f847854c9ba0aa78e6a56d2a4349dc22f590 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -86,7 +86,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
tt_number: TTNumber
partner: ReadOnlyField("GEANT", default_type=str) # type: ignore[valid-type]
- geant_s_sid: str | None = None
+ gs_id: str | None = None
iptrunk_description: str | None = None
iptrunk_type: IptrunkType
iptrunk_speed: PhysicalPortCapacity
@@ -196,7 +196,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
)
summary_form_data = input_forms_data | {"side_a_node": router_a_fqdn, "side_b_node": router_b_fqdn}
summary_fields = [
- "geant_s_sid",
+ "gs_id",
"iptrunk_type",
"iptrunk_speed",
"iptrunk_description",
@@ -322,7 +322,7 @@ def ping_all_hosts_v6(new_ipv6_network: str) -> State:
@step("Initialize subscription")
def initialize_subscription(
subscription: IptrunkInactive,
- geant_s_sid: str | None,
+ gs_id: str | None,
iptrunk_type: IptrunkType,
iptrunk_description: str | None,
iptrunk_speed: PhysicalPortCapacity,
@@ -340,7 +340,7 @@ def initialize_subscription(
oss_params = load_oss_params()
side_a = Router.from_subscription(side_a_node_id).router
side_b = Router.from_subscription(side_b_node_id).router
- subscription.iptrunk.geant_s_sid = geant_s_sid
+ subscription.iptrunk.gs_id = gs_id
subscription.iptrunk.iptrunk_description = iptrunk_description
subscription.iptrunk.iptrunk_type = iptrunk_type
subscription.iptrunk.iptrunk_speed = iptrunk_speed
@@ -363,7 +363,7 @@ def initialize_subscription(
IptrunkInterfaceBlockInactive.new(subscription_id=uuid4(), **member),
)
side_names = sorted([side_a.router_site.site_name, side_b.router_site.site_name])
- subscription.description = f"IP trunk {side_names[0]} {side_names[1]}, geant_s_sid:{geant_s_sid}"
+ subscription.description = f"IP trunk {side_names[0]} {side_names[1]}, gs_id:{gs_id}"
return {"subscription": subscription}
@@ -377,7 +377,7 @@ def provision_ip_trunk_iface_dry(subscription: IptrunkInactive, process_id: UUID
"verb": "deploy",
"config_object": "trunk_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
@@ -403,7 +403,7 @@ def provision_ip_trunk_iface_real(subscription: IptrunkInactive, process_id: UUI
"verb": "deploy",
"config_object": "trunk_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
@@ -441,7 +441,7 @@ def provision_ip_trunk_isis_iface_dry(subscription: IptrunkInactive, process_id:
"verb": "deploy",
"config_object": "isis_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
@@ -467,7 +467,7 @@ def provision_ip_trunk_isis_iface_real(subscription: IptrunkInactive, process_id
"verb": "deploy",
"config_object": "isis_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
@@ -574,7 +574,7 @@ def create_new_sharepoint_checklist(subscription: IptrunkProvisioning, tt_number
new_list_item_url = SharePointClient().add_list_item(
list_name="ip_trunk",
fields={
- "Title": f"{subscription.description} - {subscription.iptrunk.geant_s_sid}",
+ "Title": f"{subscription.description} - {subscription.iptrunk.gs_id}",
"TT_NUMBER": tt_number,
"GAP_PROCESS_URL": f"{load_oss_params().GENERAL.public_hostname}/workflows/{process_id}",
"ACTIVITY_TYPE": "Creation",
diff --git a/gso/workflows/iptrunk/migrate_iptrunk.py b/gso/workflows/iptrunk/migrate_iptrunk.py
index 5684dd2d10dc042032e1523e54e4b5657ba247c2..e0a42d19b7b0c0f90ea95756e9549876629d3d09 100644
--- a/gso/workflows/iptrunk/migrate_iptrunk.py
+++ b/gso/workflows/iptrunk/migrate_iptrunk.py
@@ -50,7 +50,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
"""Gather input from the operator on the new router that the IP trunk should connect to."""
subscription = Iptrunk.from_subscription(subscription_id)
form_title = (
- f"Subscription {subscription.iptrunk.geant_s_sid} "
+ f"Subscription {subscription.iptrunk.gs_id} "
f" from {subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_fqdn}"
f" to {subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_fqdn}"
)
@@ -298,7 +298,7 @@ def disable_old_config_dry(
"config_object": "deactivate",
"dry_run": True,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Deploy config for {subscription.iptrunk.geant_s_sid}",
+ f"- Deploy config for {subscription.iptrunk.gs_id}",
}
return {
@@ -337,7 +337,7 @@ def disable_old_config_real(
"config_object": "deactivate",
"dry_run": False,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Deploy config for {subscription.iptrunk.geant_s_sid}",
+ f"- Deploy config for {subscription.iptrunk.gs_id}",
}
return {
@@ -376,7 +376,7 @@ def deploy_new_config_dry(
"config_object": "trunk_interface",
"dry_run": True,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Deploy config for {subscription.iptrunk.geant_s_sid}",
+ f"- Deploy config for {subscription.iptrunk.gs_id}",
}
return {
@@ -415,7 +415,7 @@ def deploy_new_config_real(
"config_object": "trunk_interface",
"dry_run": False,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Deploy config for {subscription.iptrunk.geant_s_sid}",
+ f"- Deploy config for {subscription.iptrunk.gs_id}",
}
return {
@@ -564,7 +564,7 @@ def deploy_new_isis(
"config_object": "isis_interface",
"dry_run": False,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Deploy config for {subscription.iptrunk.geant_s_sid}",
+ f"- Deploy config for {subscription.iptrunk.gs_id}",
}
return {
@@ -629,7 +629,7 @@ def restore_isis_metric(
"verb": "deploy",
"config_object": "isis_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
@@ -668,7 +668,7 @@ def delete_old_config_dry(
"config_object": "delete",
"dry_run": True,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Deploy config for {subscription.iptrunk.geant_s_sid}",
+ f"- Deploy config for {subscription.iptrunk.gs_id}",
}
return {
@@ -707,7 +707,7 @@ def delete_old_config_real(
"config_object": "delete",
"dry_run": False,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Deploy config for {subscription.iptrunk.geant_s_sid}",
+ f"- Deploy config for {subscription.iptrunk.gs_id}",
}
return {
@@ -770,7 +770,7 @@ def update_subscription_model(
subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_site.site_name,
])
subscription.description = (
- f"IP trunk {side_names[0]} {side_names[1]}, geant_s_sid:{subscription.iptrunk.geant_s_sid}"
+ f"IP trunk {side_names[0]} {side_names[1]}, gs_id:{subscription.iptrunk.gs_id}"
)
return {"subscription": subscription}
@@ -816,7 +816,7 @@ def create_new_sharepoint_checklist(subscription: Iptrunk, tt_number: str, proce
new_list_item_url = SharePointClient().add_list_item(
list_name="ip_trunk",
fields={
- "Title": f"{subscription.description} - {subscription.iptrunk.geant_s_sid}",
+ "Title": f"{subscription.description} - {subscription.iptrunk.gs_id}",
"TT_NUMBER": tt_number,
"GAP_PROCESS_URL": f"{load_oss_params().GENERAL.public_hostname}/workflows/{process_id}",
"ACTIVITY_TYPE": "Migration",
diff --git a/gso/workflows/iptrunk/modify_isis_metric.py b/gso/workflows/iptrunk/modify_isis_metric.py
index 61d2f0908bc80fb12981c276cf2d3d45c7b12944..80d97531e6cc61f53e94d19e2980fd795aa628cf 100644
--- a/gso/workflows/iptrunk/modify_isis_metric.py
+++ b/gso/workflows/iptrunk/modify_isis_metric.py
@@ -53,7 +53,7 @@ def provision_ip_trunk_isis_iface_dry(subscription: Iptrunk, process_id: UUIDstr
"verb": "deploy",
"config_object": "isis_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
@@ -79,7 +79,7 @@ def provision_ip_trunk_isis_iface_real(subscription: Iptrunk, process_id: UUIDst
"verb": "deploy",
"config_object": "isis_interface",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
diff --git a/gso/workflows/iptrunk/modify_trunk_interface.py b/gso/workflows/iptrunk/modify_trunk_interface.py
index 9c1be5cd451dadb4a039c869c3f9f67cf32836de..723a324683a83ffeaf48ad817670436e6fe0234a 100644
--- a/gso/workflows/iptrunk/modify_trunk_interface.py
+++ b/gso/workflows/iptrunk/modify_trunk_interface.py
@@ -86,7 +86,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
class ModifyIptrunkForm(FormPage):
tt_number: TTNumber
- geant_s_sid: str | None = subscription.iptrunk.geant_s_sid
+ gs_id: str | None = subscription.iptrunk.gs_id
iptrunk_description: str | None = subscription.iptrunk.iptrunk_description
iptrunk_type: IptrunkType = subscription.iptrunk.iptrunk_type
warning_label: Label = (
@@ -254,7 +254,7 @@ def update_side_members(subscription: Iptrunk, side_index: int, new_members: lis
@step("Update subscription")
def modify_iptrunk_subscription(
subscription: Iptrunk,
- geant_s_sid: str | None,
+ gs_id: str | None,
iptrunk_type: IptrunkType,
iptrunk_description: str | None,
iptrunk_speed: PhysicalPortCapacity,
@@ -287,7 +287,7 @@ def modify_iptrunk_subscription(
if ae_member["interface_name"] not in [m["interface_name"] for m in current_members]
])
# Update the subscription
- subscription.iptrunk.geant_s_sid = geant_s_sid
+ subscription.iptrunk.gs_id = gs_id
subscription.iptrunk.iptrunk_description = iptrunk_description
subscription.iptrunk.iptrunk_type = iptrunk_type
subscription.iptrunk.iptrunk_speed = iptrunk_speed
@@ -302,7 +302,7 @@ def modify_iptrunk_subscription(
subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_site.site_name,
subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_site.site_name,
])
- subscription.description = f"IP trunk {side_names[0]} {side_names[1]}, geant_s_sid:{geant_s_sid}"
+ subscription.description = f"IP trunk {side_names[0]} {side_names[1]}, gs_id:{gs_id}"
return {
"subscription": subscription,
@@ -323,7 +323,7 @@ def provision_ip_trunk_iface_dry(
"config_object": "trunk_interface",
"removed_ae_members": removed_ae_members,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
@@ -352,7 +352,7 @@ def provision_ip_trunk_iface_real(
"config_object": "trunk_interface",
"removed_ae_members": removed_ae_members,
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} - Deploy config for "
- f"{subscription.iptrunk.geant_s_sid}",
+ f"{subscription.iptrunk.gs_id}",
}
return {
diff --git a/gso/workflows/iptrunk/terminate_iptrunk.py b/gso/workflows/iptrunk/terminate_iptrunk.py
index d008ad88bfcfdbf3484f5056d522deddf565554d..24cb42719a09b5483bdff3d9fb73e819b88e7eef 100644
--- a/gso/workflows/iptrunk/terminate_iptrunk.py
+++ b/gso/workflows/iptrunk/terminate_iptrunk.py
@@ -70,7 +70,7 @@ def deprovision_ip_trunk_dry(subscription: Iptrunk, process_id: UUIDstr, tt_numb
"verb": "terminate",
"config_object": "trunk_deprovision",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Remove config for {subscription.iptrunk.geant_s_sid}",
+ f"- Remove config for {subscription.iptrunk.gs_id}",
}
return {
@@ -96,7 +96,7 @@ def deprovision_ip_trunk_real(subscription: Iptrunk, process_id: UUIDstr, tt_num
"verb": "terminate",
"config_object": "trunk_deprovision",
"commit_comment": f"GSO_PROCESS_ID: {process_id} - TT_NUMBER: {tt_number} "
- f"- Remove config for {subscription.iptrunk.geant_s_sid}",
+ f"- Remove config for {subscription.iptrunk.gs_id}",
}
return {
diff --git a/test/fixtures/iptrunk_fixtures.py b/test/fixtures/iptrunk_fixtures.py
index 5044a2e5904c92023e264e9c5f40cac8a82cb773..b297d07e65c822958b61e9ef973e14fe2cd5c8d4 100644
--- a/test/fixtures/iptrunk_fixtures.py
+++ b/test/fixtures/iptrunk_fixtures.py
@@ -56,7 +56,7 @@ def iptrunk_subscription_factory(iptrunk_side_subscription_factory, faker, geant
def subscription_create(
description=None,
start_date="2023-05-24T00:00:00+00:00",
- geant_s_sid=None,
+ gs_id=None,
iptrunk_description=None,
iptrunk_type=IptrunkType.LEASED,
iptrunk_speed=PhysicalPortCapacity.ONE_GIGABIT_PER_SECOND,
@@ -84,7 +84,7 @@ def iptrunk_subscription_factory(iptrunk_side_subscription_factory, faker, geant
)
description = description or faker.sentence()
- geant_s_sid = geant_s_sid or faker.geant_sid()
+ gs_id = gs_id or faker.geant_sid()
iptrunk_description = iptrunk_description or faker.sentence()
iptrunk_isis_metric = iptrunk_isis_metric or faker.pyint()
iptrunk_ipv4_network = iptrunk_ipv4_network or faker.ipv4_network(max_subnet=31)
@@ -94,7 +94,7 @@ def iptrunk_subscription_factory(iptrunk_side_subscription_factory, faker, geant
iptrunk_side_b = iptrunk_side_subscription_factory()
iptrunk_sides = iptrunk_sides or [iptrunk_side_a, iptrunk_side_b]
- iptrunk_subscription.iptrunk.geant_s_sid = geant_s_sid
+ iptrunk_subscription.iptrunk.gs_id = gs_id
iptrunk_subscription.iptrunk.iptrunk_description = iptrunk_description
iptrunk_subscription.iptrunk.iptrunk_type = iptrunk_type
iptrunk_subscription.iptrunk.iptrunk_speed = iptrunk_speed
diff --git a/test/workflows/iptrunk/test_create_imported_iptrunk.py b/test/workflows/iptrunk/test_create_imported_iptrunk.py
index 25d68d8f9f67906b5251b1312927d2c3203ddbad..2e18e4bb3e6443365c4fcccc65348def86cd43a4 100644
--- a/test/workflows/iptrunk/test_create_imported_iptrunk.py
+++ b/test/workflows/iptrunk/test_create_imported_iptrunk.py
@@ -16,7 +16,7 @@ from test.workflows import (
def workflow_input_data(faker, router_subscription_factory):
return {
"partner": "GEANT",
- "geant_s_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"iptrunk_description": faker.sentence(),
"iptrunk_type": IptrunkType.DARK_FIBER,
"iptrunk_speed": PhysicalPortCapacity.FOUR_HUNDRED_GIGABIT_PER_SECOND,
diff --git a/test/workflows/iptrunk/test_create_iptrunk.py b/test/workflows/iptrunk/test_create_iptrunk.py
index cac63729ec0507232f904074c48bb7c8b5f203a1..6345237f640e270f2bd29dd99925ecbd61eed5f1 100644
--- a/test/workflows/iptrunk/test_create_iptrunk.py
+++ b/test/workflows/iptrunk/test_create_iptrunk.py
@@ -65,7 +65,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker):
create_ip_trunk_step = {
"tt_number": faker.tt_number(),
- "geant_s_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"iptrunk_type": IptrunkType.DARK_FIBER,
"iptrunk_description": faker.sentence(),
"iptrunk_speed": PhysicalPortCapacity.HUNDRED_GIGABIT_PER_SECOND,
@@ -154,7 +154,7 @@ def test_successful_iptrunk_creation_with_standard_lso_result(
])
assert subscription.status == "provisioning"
assert subscription.description == (
- f"IP trunk {sorted_sides[0]} {sorted_sides[1]}, geant_s_sid:{input_form_wizard_data[0]["geant_s_sid"]}"
+ f"IP trunk {sorted_sides[0]} {sorted_sides[1]}, gs_id:{input_form_wizard_data[0]["gs_id"]}"
)
assert mock_execute_playbook.call_count == 6
diff --git a/test/workflows/iptrunk/test_modify_trunk_interface.py b/test/workflows/iptrunk/test_modify_trunk_interface.py
index 2dcb23e2b00a9b063144e827f434129f5d9411e7..ef3325fa48b4f204364f590faeb2662b16e96b8b 100644
--- a/test/workflows/iptrunk/test_modify_trunk_interface.py
+++ b/test/workflows/iptrunk/test_modify_trunk_interface.py
@@ -66,7 +66,7 @@ def input_form_iptrunk_data(
{"subscription_id": product_id},
{
"tt_number": faker.tt_number(),
- "geant_s_sid": new_sid,
+ "gs_id": new_sid,
"iptrunk_description": new_description,
"iptrunk_type": new_type,
"iptrunk_speed": new_speed,
@@ -135,7 +135,7 @@ def test_iptrunk_modify_trunk_interface_success(
assert subscription.status == "active"
assert mock_provision_ip_trunk.call_count == lso_interaction_count
# Assert all Netbox calls have been made
- new_sid = input_form_iptrunk_data[1]["geant_s_sid"]
+ 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_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"]
@@ -164,8 +164,8 @@ def test_iptrunk_modify_trunk_interface_success(
subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.router_site.site_name,
subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.router_site.site_name,
])
- assert subscription.description == f"IP trunk {side_names[0]} {side_names[1]}, geant_s_sid:{new_sid}"
- assert subscription.iptrunk.geant_s_sid == input_form_iptrunk_data[1]["geant_s_sid"]
+ assert subscription.description == f"IP trunk {side_names[0]} {side_names[1]}, gs_id:{new_sid}"
+ assert subscription.iptrunk.gs_id == input_form_iptrunk_data[1]["gs_id"]
assert subscription.iptrunk.iptrunk_description == input_form_iptrunk_data[1]["iptrunk_description"]
assert subscription.iptrunk.iptrunk_type == input_form_iptrunk_data[1]["iptrunk_type"]
assert subscription.iptrunk.iptrunk_speed == input_form_iptrunk_data[1]["iptrunk_speed"]