From 6a7a47c61d9eb5dd8e87a4bef123973acd8822ed Mon Sep 17 00:00:00 2001
From: Neda Moeini <neda.moeini@geant.org>
Date: Thu, 5 Dec 2024 09:45:22 +0100
Subject: [PATCH] Replace geant_sid with gs_id
---
gso/cli/imports.py | 12 ++++++------
.../l2_circuit/create_imported_layer_2_circuit.py | 6 +++---
gso/workflows/l2_circuit/create_layer_2_circuit.py | 6 +++---
.../create_imported_l3_core_service.py | 2 +-
.../l3_core_service/create_l3_core_service.py | 2 +-
.../l3_core_service/modify_l3_core_service.py | 6 +++---
test/cli/test_imports.py | 14 +++++++-------
test/fixtures/l3_core_service_fixtures.py | 4 ++--
test/fixtures/layer_2_circuit_fixtures.py | 4 ++--
test/workflows/iptrunk/test_create_iptrunk.py | 4 ++--
.../test_create_imported_layer_2_circuit.py | 4 ++--
.../l2_circuit/test_create_layer_2_circuit.py | 6 +++---
.../test_create_imported_l3_core_service.py | 2 +-
.../l3_core_service/test_create_l3_core_service.py | 2 +-
.../l3_core_service/test_modify_l3_core_service.py | 6 +++---
15 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/gso/cli/imports.py b/gso/cli/imports.py
index 72fe0d38..ba33565e 100644
--- a/gso/cli/imports.py
+++ b/gso/cli/imports.py
@@ -124,11 +124,11 @@ class IptrunkImportModel(BaseModel):
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[LAGMember]
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[LAGMember]
iptrunk_ipv4_network: ipaddress.IPv4Network
@@ -269,7 +269,7 @@ class L3CoreServiceImportModel(BaseModel):
edge_port: str
ap_type: str
- geant_sid: str
+ gs_id: str
sbp_type: SBPType = SBPType.L3
is_tagged: bool = False
vlan_id: VLAN_ID
@@ -349,7 +349,7 @@ class Layer2CircuitServiceImportModel(BaseModel):
service_type: Layer2CircuitServiceType
partner: str
- geant_sid: str
+ gs_id: str
vc_id: VC_ID
layer_2_circuit_side_a: ServiceBindingPortInput
layer_2_circuit_side_b: ServiceBindingPortInput
@@ -600,11 +600,11 @@ def import_iptrunks(filepath: str = common_filepath_option) -> None:
iptrunk_isis_metric=trunk["config"]["common"]["isis_metric"],
side_a_node_id=_get_router_subscription_id(trunk["config"]["nodeA"]["name"]) or "",
side_a_ae_iface=trunk["config"]["nodeA"]["ae_name"],
- side_a_ae_geant_a_sid=trunk["config"]["nodeA"]["port_sid"],
+ side_a_ga_id=trunk["config"]["nodeA"]["port_ga_id"],
side_a_ae_members=trunk["config"]["nodeA"]["members"],
side_b_node_id=_get_router_subscription_id(trunk["config"]["nodeB"]["name"]) or "",
side_b_ae_iface=trunk["config"]["nodeB"]["ae_name"],
- side_b_ae_geant_a_sid=trunk["config"]["nodeB"]["port_sid"],
+ side_b_ga_id=trunk["config"]["nodeB"]["port_ga_id"],
side_b_ae_members=trunk["config"]["nodeB"]["members"],
iptrunk_ipv4_network=iptrunk_ipv4_network,
iptrunk_ipv6_network=iptrunk_ipv6_network,
diff --git a/gso/workflows/l2_circuit/create_imported_layer_2_circuit.py b/gso/workflows/l2_circuit/create_imported_layer_2_circuit.py
index a0fc39cb..6102d86d 100644
--- a/gso/workflows/l2_circuit/create_imported_layer_2_circuit.py
+++ b/gso/workflows/l2_circuit/create_imported_layer_2_circuit.py
@@ -39,7 +39,7 @@ def initial_input_form_generator() -> FormGenerator:
service_type: Layer2CircuitServiceType
partner: str
- geant_sid: str
+ gs_id: str
vc_id: VC_ID
layer_2_circuit_side_a: ServiceBindingPortInput
layer_2_circuit_side_b: ServiceBindingPortInput
@@ -91,7 +91,7 @@ def create_subscription(partner: str, service_type: Layer2CircuitServiceType) ->
@step("Initialize subscription")
def initialize_subscription(
subscription: ImportedLayer2CircuitInactive,
- geant_sid: str,
+ gs_id: str,
layer_2_circuit_side_a: dict[str, Any],
layer_2_circuit_side_b: dict[str, Any],
layer_2_circuit_type: Layer2CircuitType,
@@ -110,7 +110,7 @@ def initialize_subscription(
edge_port=EdgePort.from_subscription(subscription_id=circuit_side_data["edge_port"]).edge_port,
sbp_type=SBPType.L2,
vlan_id=circuit_side_data["vlan_id"],
- geant_sid=geant_sid,
+ gs_id=gs_id,
is_tagged=layer_2_circuit_type == Layer2CircuitType.TAGGED,
custom_firewall_filters=False,
)
diff --git a/gso/workflows/l2_circuit/create_layer_2_circuit.py b/gso/workflows/l2_circuit/create_layer_2_circuit.py
index 0a15fceb..7959a30b 100644
--- a/gso/workflows/l2_circuit/create_layer_2_circuit.py
+++ b/gso/workflows/l2_circuit/create_layer_2_circuit.py
@@ -69,7 +69,7 @@ def initial_input_generator(product_name: str) -> FormGenerator:
vlan_divider: Divider = Field(None, exclude=True)
policer_bandwidth: _policer_field(policer_enabled=initial_user_input.policer_enabled) # type: ignore[valid-type]
policer_burst_rate: _policer_field(policer_enabled=initial_user_input.policer_enabled) # type: ignore[valid-type]
- geant_sid: str
+ gs_id: str
layer_2_circuit_side_a: Layer2CircuitSideSelection
side_divider: Divider = Field(None, exclude=True)
layer_2_circuit_side_b: Layer2CircuitSideSelection
@@ -105,7 +105,7 @@ def initialize_subscription(
policer_enabled: bool, # noqa: FBT001
policer_bandwidth: BandwidthString | None,
policer_burst_rate: BandwidthString | None,
- geant_sid: str,
+ gs_id: str,
) -> State:
"""Build a subscription object from all user input."""
layer_2_circuit_sides = []
@@ -115,7 +115,7 @@ def initialize_subscription(
edge_port=EdgePort.from_subscription(subscription_id=circuit_side_data["edge_port"]).edge_port,
sbp_type=SBPType.L2,
vlan_id=circuit_side_data["vlan_id"],
- geant_sid=geant_sid,
+ gs_id=gs_id,
is_tagged=layer_2_circuit_type == Layer2CircuitType.TAGGED,
custom_firewall_filters=False,
)
diff --git a/gso/workflows/l3_core_service/create_imported_l3_core_service.py b/gso/workflows/l3_core_service/create_imported_l3_core_service.py
index dd77021b..7862a47f 100644
--- a/gso/workflows/l3_core_service/create_imported_l3_core_service.py
+++ b/gso/workflows/l3_core_service/create_imported_l3_core_service.py
@@ -50,7 +50,7 @@ def initial_input_form_generator() -> FormGenerator:
class ServiceBindingPort(BaseModel):
edge_port: UUIDstr
ap_type: str
- geant_sid: str
+ gs_id: str
sbp_type: SBPType = SBPType.L3
is_tagged: bool = False
vlan_id: VLAN_ID
diff --git a/gso/workflows/l3_core_service/create_l3_core_service.py b/gso/workflows/l3_core_service/create_l3_core_service.py
index d4b085c1..04edd53f 100644
--- a/gso/workflows/l3_core_service/create_l3_core_service.py
+++ b/gso/workflows/l3_core_service/create_l3_core_service.py
@@ -113,7 +113,7 @@ def initial_input_form_generator(product_name: str) -> FormGenerator:
exclude=True,
)
- geant_sid: str
+ gs_id: str
is_tagged: bool = False
vlan_id: VLAN_ID
custom_firewall_filters: bool = False
diff --git a/gso/workflows/l3_core_service/modify_l3_core_service.py b/gso/workflows/l3_core_service/modify_l3_core_service.py
index 7dbeb486..24b408ab 100644
--- a/gso/workflows/l3_core_service/modify_l3_core_service.py
+++ b/gso/workflows/l3_core_service/modify_l3_core_service.py
@@ -152,7 +152,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
exclude=True,
)
- geant_sid: str = current_sbp.geant_sid
+ gs_id: str = current_sbp.gs_id
is_tagged: bool = current_sbp.is_tagged
# The SBP model does not require these five fields, but in the case of GÉANT IP or IAS this will never
# occur since it's a layer 3 service. The ignore statements are there to put our type checker at ease.
@@ -212,7 +212,7 @@ def initial_input_form_generator(subscription_id: UUIDstr) -> FormGenerator:
exclude=True,
)
- geant_sid: str
+ gs_id: str
is_tagged: bool = False
vlan_id: VLAN_ID
ipv4_address: IPv4AddressType
@@ -279,7 +279,7 @@ def modify_existing_sbp_blocks(subscription: L3CoreService, modified_sbp_list: l
current_sbp.bgp_session_list = [v4_peer, v6_peer]
current_sbp.vlan_id = modified_sbp_data["vlan_id"]
- current_sbp.geant_sid = modified_sbp_data["geant_sid"]
+ current_sbp.gs_id = modified_sbp_data["gs_id"]
current_sbp.is_tagged = modified_sbp_data["is_tagged"]
current_sbp.ipv4_address = modified_sbp_data["ipv4_address"]
current_sbp.ipv6_address = modified_sbp_data["ipv6_address"]
diff --git a/test/cli/test_imports.py b/test/cli/test_imports.py
index 60c8acee..475492a4 100644
--- a/test/cli/test_imports.py
+++ b/test/cli/test_imports.py
@@ -73,7 +73,7 @@ def iptrunk_data(temp_file, router_subscription_factory, faker) -> (Path, dict):
"nodeA": {
"name": side_a_node or Router.from_subscription(router_side_a).router.router_fqdn,
"ae_name": side_a_ae_name or faker.network_interface(),
- "port_sid": faker.geant_sid(),
+ "port_ga_id": faker.geant_gid(),
"members": side_a_members
or [
{
@@ -88,7 +88,7 @@ def iptrunk_data(temp_file, router_subscription_factory, faker) -> (Path, dict):
"nodeB": {
"name": side_b_node or Router.from_subscription(router_side_b).router.router_fqdn,
"ae_name": side_b_ae_name or faker.network_interface(),
- "port_sid": faker.geant_sid(),
+ "port_ga_id": faker.geant_gid(),
"members": side_b_members
or [
{
@@ -305,7 +305,7 @@ def l3_core_service_data(temp_file, faker, partner_factory, edge_port_subscripti
{
"edge_port": edge_port_subscription_factory(),
"ap_type": "PRIMARY",
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"vlan_id": faker.vlan_id(),
"ipv4_address": faker.ipv4(),
"ipv4_mask": faker.ipv4_netmask(),
@@ -353,7 +353,7 @@ def l3_core_service_data(temp_file, faker, partner_factory, edge_port_subscripti
{
"edge_port": edge_port_subscription_factory(),
"ap_type": "BACKUP",
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"vlan_id": faker.vlan_id(),
"ipv4_address": faker.ipv4(),
"ipv4_mask": faker.ipv4_netmask(),
@@ -414,7 +414,7 @@ def layer_2_circuit_data(temp_file, faker, partner_factory, edge_port_subscripti
layer_2_circuit_input_data = {
"partner": partner_factory()["name"],
"service_type": Layer2CircuitServiceType.GEANT_PLUS,
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"vc_id": generate_unique_vc_id(),
"layer_2_circuit_side_a": {
"edge_port": edge_port_subscription_factory(),
@@ -697,7 +697,7 @@ def test_import_l3_core_service_with_invalid_edge_port(
{
"edge_port": fake_uuid,
"ap_type": "PRIMARY",
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"vlan_id": faker.vlan_id(),
"ipv4_address": faker.ipv4(),
"ipv4_mask": faker.ipv4_netmask(),
@@ -737,7 +737,7 @@ def test_import_l3_core_service_with_invalid_edge_port(
{
"edge_port": edge_port_subscription_factory(),
"ap_type": "BACKUP",
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"vlan_id": faker.vlan_id(),
"ipv4_address": faker.ipv4(),
"ipv4_mask": faker.ipv4_netmask(),
diff --git a/test/fixtures/l3_core_service_fixtures.py b/test/fixtures/l3_core_service_fixtures.py
index da94298e..493ddc1c 100644
--- a/test/fixtures/l3_core_service_fixtures.py
+++ b/test/fixtures/l3_core_service_fixtures.py
@@ -84,7 +84,7 @@ def service_binding_port_factory(
):
def create_service_binding_port(
bgp_session_list: list[BGPSession] | None = None,
- geant_sid: str | None = None,
+ gs_id: str | None = None,
sbp_type: SBPType = SBPType.L3,
ipv4_address: str | None = None,
ipv4_mask: int | None = None,
@@ -108,7 +108,7 @@ def service_binding_port_factory(
ipv6_address=ipv6_address or faker.ipv6(),
ipv6_mask=ipv6_mask or faker.ipv6_netmask(),
custom_firewall_filters=custom_firewall_filters,
- geant_sid=geant_sid or faker.geant_sid(),
+ gs_id=gs_id or faker.geant_sid(),
bgp_session_list=bgp_session_list
or [
bgp_session_subscription_factory(families=[IPFamily.V4UNICAST]),
diff --git a/test/fixtures/layer_2_circuit_fixtures.py b/test/fixtures/layer_2_circuit_fixtures.py
index 28fd88ae..e7c8c468 100644
--- a/test/fixtures/layer_2_circuit_fixtures.py
+++ b/test/fixtures/layer_2_circuit_fixtures.py
@@ -38,7 +38,7 @@ def layer_2_circuit_subscription_factory(faker, geant_partner, edge_port_subscri
vlan_id_side_a: VLAN_ID | None = None,
layer_2_circuit_side_b_edgeport: UUIDstr | None = None,
vlan_id_side_b: VLAN_ID | None = None,
- geant_sid: str | None = None,
+ gs_id: str | None = None,
*,
policer_enabled: bool = False,
) -> UUIDstr:
@@ -82,7 +82,7 @@ def layer_2_circuit_subscription_factory(faker, geant_partner, edge_port_subscri
edge_port=EdgePort.from_subscription(edge_port).edge_port,
sbp_type=SBPType.L2,
vlan_id=vlan_id,
- geant_sid=geant_sid or faker.geant_sid(),
+ gs_id=gs_id or faker.geant_sid(),
is_tagged=layer_2_circuit_type == Layer2CircuitType.TAGGED,
custom_firewall_filters=False,
)
diff --git a/test/workflows/iptrunk/test_create_iptrunk.py b/test/workflows/iptrunk/test_create_iptrunk.py
index 6345237f..17c37388 100644
--- a/test/workflows/iptrunk/test_create_iptrunk.py
+++ b/test/workflows/iptrunk/test_create_iptrunk.py
@@ -75,7 +75,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker):
create_ip_trunk_side_a_router_name = {"side_a_node_id": router_side_a}
create_ip_trunk_side_a_step = {
"side_a_ae_iface": "lag-1",
- "side_a_ae_geant_a_sid": None,
+ "side_a_ga_id": None,
"side_a_ae_members": [
{
"interface_name": f"Interface{interface}",
@@ -87,7 +87,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker):
create_ip_trunk_side_b_router_name = {"side_b_node_id": router_side_b}
create_ip_trunk_side_b_step = {
"side_b_ae_iface": "lag-4",
- "side_b_ae_geant_a_sid": faker.geant_sid(),
+ "side_b_ga_id": faker.geant_sid(),
"side_b_ae_members": side_b_members,
}
summary_view_step = {}
diff --git a/test/workflows/l2_circuit/test_create_imported_layer_2_circuit.py b/test/workflows/l2_circuit/test_create_imported_layer_2_circuit.py
index 0e4e857e..1bc9884a 100644
--- a/test/workflows/l2_circuit/test_create_imported_layer_2_circuit.py
+++ b/test/workflows/l2_circuit/test_create_imported_layer_2_circuit.py
@@ -28,7 +28,7 @@ def test_create_imported_layer_2_circuit_success(
"vc_id": generate_unique_vc_id(),
"policer_bandwidth": faker.bandwidth() if policer_enabled else None,
"policer_burst_rate": faker.bandwidth() if policer_enabled else None,
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"layer_2_circuit_side_a": {"edge_port": edge_port_a, "vlan_id": faker.vlan_id()},
"layer_2_circuit_side_b": {"edge_port": edge_port_b, "vlan_id": faker.vlan_id()},
}
@@ -44,7 +44,7 @@ def test_create_imported_layer_2_circuit_success(
assert len(subscription.layer_2_circuit.layer_2_circuit_sides) == 2
assert subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.is_tagged is True
assert (
- subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.geant_sid == creation_form_input_data[0]["geant_sid"]
+ subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.gs_id == creation_form_input_data[0]["gs_id"]
)
assert (
str(subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.edge_port.owner_subscription_id)
diff --git a/test/workflows/l2_circuit/test_create_layer_2_circuit.py b/test/workflows/l2_circuit/test_create_layer_2_circuit.py
index c0d1b2df..edfab4dd 100644
--- a/test/workflows/l2_circuit/test_create_layer_2_circuit.py
+++ b/test/workflows/l2_circuit/test_create_layer_2_circuit.py
@@ -28,7 +28,7 @@ def layer_2_circuit_input(faker, partner_factory, edge_port_subscription_factory
"vlan_range_upper_bound": faker.vlan_id(),
"policer_bandwidth": faker.bandwidth() if policer_enabled else None,
"policer_burst_rate": faker.bandwidth() if policer_enabled else None,
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"layer_2_circuit_side_a": {"edge_port": edge_port_a, "vlan_id": faker.vlan_id()},
"layer_2_circuit_side_b": {"edge_port": edge_port_b, "vlan_id": faker.vlan_id()},
},
@@ -56,13 +56,13 @@ def test_create_layer_2_circuit_success(
== layer_2_circuit_input[2]["layer_2_circuit_side_a"]["edge_port"]
)
assert subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.is_tagged is True
- assert subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.geant_sid == layer_2_circuit_input[2]["geant_sid"]
+ assert subscription.layer_2_circuit.layer_2_circuit_sides[0].sbp.gs_id == layer_2_circuit_input[2]["gs_id"]
assert (
str(subscription.layer_2_circuit.layer_2_circuit_sides[1].sbp.edge_port.owner_subscription_id)
== layer_2_circuit_input[2]["layer_2_circuit_side_b"]["edge_port"]
)
assert subscription.layer_2_circuit.layer_2_circuit_sides[1].sbp.is_tagged is True
- assert subscription.layer_2_circuit.layer_2_circuit_sides[1].sbp.geant_sid == layer_2_circuit_input[2]["geant_sid"]
+ assert subscription.layer_2_circuit.layer_2_circuit_sides[1].sbp.gs_id == layer_2_circuit_input[2]["gs_id"]
assert subscription.layer_2_circuit.layer_2_circuit_type == Layer2CircuitType.TAGGED
assert subscription.layer_2_circuit.vlan_range_lower_bound == layer_2_circuit_input[2]["vlan_range_lower_bound"]
assert subscription.layer_2_circuit.vlan_range_upper_bound == layer_2_circuit_input[2]["vlan_range_upper_bound"]
diff --git a/test/workflows/l3_core_service/test_create_imported_l3_core_service.py b/test/workflows/l3_core_service/test_create_imported_l3_core_service.py
index 626c6237..0580bb5c 100644
--- a/test/workflows/l3_core_service/test_create_imported_l3_core_service.py
+++ b/test/workflows/l3_core_service/test_create_imported_l3_core_service.py
@@ -27,7 +27,7 @@ def test_create_imported_l3_core_service_success(
{
"edge_port": edge_port_subscription_factory(),
"ap_type": "PRIMARY",
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"sbp_type": SBPType.L3,
"is_tagged": faker.boolean(),
"vlan_id": faker.vlan_id(),
diff --git a/test/workflows/l3_core_service/test_create_l3_core_service.py b/test/workflows/l3_core_service/test_create_l3_core_service.py
index 149fdf20..2295e362 100644
--- a/test/workflows/l3_core_service/test_create_l3_core_service.py
+++ b/test/workflows/l3_core_service/test_create_l3_core_service.py
@@ -49,7 +49,7 @@ def test_create_l3_core_service_success(
{"tt_number": faker.tt_number(), "partner": partner["partner_id"]},
{"edge_port": {"edge_port": edge_port_a, "ap_type": APType.PRIMARY}},
{
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"is_tagged": faker.boolean(),
"vlan_id": faker.vlan_id(),
"ipv4_address": faker.ipv4(),
diff --git a/test/workflows/l3_core_service/test_modify_l3_core_service.py b/test/workflows/l3_core_service/test_modify_l3_core_service.py
index 67ff8880..333fc670 100644
--- a/test/workflows/l3_core_service/test_modify_l3_core_service.py
+++ b/test/workflows/l3_core_service/test_modify_l3_core_service.py
@@ -84,7 +84,7 @@ def test_modify_l3_core_service_add_new_edge_port_success(
{}, # The existing SBPs are unchanged
{},
{ # Adding configuration for the new SBP
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"vlan_id": faker.vlan_id(),
"ipv4_address": faker.ipv4(),
"ipv6_address": faker.ipv6(),
@@ -115,7 +115,7 @@ def test_modify_l3_core_service_add_new_edge_port_success(
def sbp_input_form_data(faker):
def _generate_form_data():
return {
- "geant_sid": faker.geant_sid(),
+ "gs_id": faker.geant_sid(),
"is_tagged": True,
"vlan_id": faker.vlan_id(),
"ipv4_address": faker.ipv4(),
@@ -198,7 +198,7 @@ def test_modify_l3_core_service_modify_edge_port_success(
assert len(subscription.l3_core_service.ap_list) == 2
for i in range(2):
- assert subscription.l3_core_service.ap_list[i].sbp.geant_sid == new_sbp_data[i]["geant_sid"]
+ assert subscription.l3_core_service.ap_list[i].sbp.gs_id == new_sbp_data[i]["gs_id"]
assert subscription.l3_core_service.ap_list[i].sbp.is_tagged == new_sbp_data[i]["is_tagged"]
assert subscription.l3_core_service.ap_list[i].sbp.vlan_id == new_sbp_data[i]["vlan_id"]
assert str(subscription.l3_core_service.ap_list[i].sbp.ipv4_address) == new_sbp_data[i]["ipv4_address"]
--
GitLab