Skip to content
Snippets Groups Projects
Commit c74cd632 authored by Karel van Klink's avatar Karel van Klink :smiley_cat:
Browse files

Resolve issue with flaky CI pipeline when generated interface names would collide

parent eb2e6c9c
Branches
Tags
1 merge request!441Allow for a subscription validation to be skipped with a special note
Showing
with 79 additions and 65 deletions
...@@ -73,12 +73,12 @@ def iptrunk_data(temp_file, router_subscription_factory, faker) -> (Path, dict): ...@@ -73,12 +73,12 @@ def iptrunk_data(temp_file, router_subscription_factory, faker) -> (Path, dict):
}, },
"nodeA": { "nodeA": {
"name": side_a_node or router_side_a.router.router_fqdn, "name": side_a_node or router_side_a.router.router_fqdn,
"ae_name": side_a_ae_name or faker.nokia_lag_interface_name(), "ae_name": side_a_ae_name or faker.unique.nokia_lag_interface_name(),
"port_ga_id": faker.imported_ga_id(), "port_ga_id": faker.imported_ga_id(),
"members": side_a_members "members": side_a_members
or [ or [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(5) for _ in range(5)
...@@ -88,12 +88,12 @@ def iptrunk_data(temp_file, router_subscription_factory, faker) -> (Path, dict): ...@@ -88,12 +88,12 @@ def iptrunk_data(temp_file, router_subscription_factory, faker) -> (Path, dict):
}, },
"nodeB": { "nodeB": {
"name": side_b_node or router_side_b.router.router_fqdn, "name": side_b_node or router_side_b.router.router_fqdn,
"ae_name": side_b_ae_name or faker.nokia_lag_interface_name(), "ae_name": side_b_ae_name or faker.unique.nokia_lag_interface_name(),
"port_ga_id": faker.imported_ga_id(), "port_ga_id": faker.imported_ga_id(),
"members": side_b_members "members": side_b_members
or [ or [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(5) for _ in range(5)
...@@ -234,18 +234,21 @@ def lan_switch_interconnect_data(temp_file, faker, switch_subscription_factory, ...@@ -234,18 +234,21 @@ def lan_switch_interconnect_data(temp_file, faker, switch_subscription_factory,
"minimum_links": 1, "minimum_links": 1,
"router_side": { "router_side": {
"node": str(router_subscription_factory().subscription_id), "node": str(router_subscription_factory().subscription_id),
"ae_iface": faker.nokia_lag_interface_name(), "ae_iface": faker.unique.nokia_lag_interface_name(),
"ae_members": [ "ae_members": [
{"interface_name": faker.nokia_physical_interface_name(), "interface_description": faker.sentence()} {
"interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(),
}
for _ in range(2) for _ in range(2)
], ],
}, },
"switch_side": { "switch_side": {
"switch": str(switch_subscription_factory().subscription_id), "switch": str(switch_subscription_factory().subscription_id),
"ae_iface": faker.juniper_ae_interface_name(), "ae_iface": faker.unique.juniper_ae_interface_name(),
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -277,7 +280,7 @@ def edge_port_data(temp_file, faker, router_subscription_factory, partner_factor ...@@ -277,7 +280,7 @@ def edge_port_data(temp_file, faker, router_subscription_factory, partner_factor
"ignore_if_down": False, "ignore_if_down": False,
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -584,7 +587,7 @@ def test_import_iptrunk_invalid_router_id_side_a_and_b(mock_start_process, mock_ ...@@ -584,7 +587,7 @@ def test_import_iptrunk_invalid_router_id_side_a_and_b(mock_start_process, mock_
@patch("gso.cli.imports.start_process") @patch("gso.cli.imports.start_process")
def test_import_iptrunk_non_unique_members_side_a_and_b(mock_start_process, mock_sleep, iptrunk_data, faker, capfd): def test_import_iptrunk_non_unique_members_side_a_and_b(mock_start_process, mock_sleep, iptrunk_data, faker, capfd):
duplicate_interface = { duplicate_interface = {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
side_a_members = [duplicate_interface for _ in range(5)] side_a_members = [duplicate_interface for _ in range(5)]
...@@ -611,11 +614,11 @@ def test_import_iptrunk_non_unique_members_side_a_and_b(mock_start_process, mock ...@@ -611,11 +614,11 @@ def test_import_iptrunk_non_unique_members_side_a_and_b(mock_start_process, mock
@patch("gso.cli.imports.start_process") @patch("gso.cli.imports.start_process")
def test_import_iptrunk_side_a_member_count_mismatch(mock_start_process, mock_sleep, iptrunk_data, faker, capfd): def test_import_iptrunk_side_a_member_count_mismatch(mock_start_process, mock_sleep, iptrunk_data, faker, capfd):
side_a_members = [ side_a_members = [
{"interface_name": faker.nokia_physical_interface_name(), "interface_description": faker.sentence()} {"interface_name": faker.unique.nokia_physical_interface_name(), "interface_description": faker.sentence()}
for _ in range(5) for _ in range(5)
] ]
side_b_members = [ side_b_members = [
{"interface_name": faker.nokia_physical_interface_name(), "interface_description": faker.sentence()} {"interface_name": faker.unique.nokia_physical_interface_name(), "interface_description": faker.sentence()}
for _ in range(6) for _ in range(6)
] ]
broken_data = iptrunk_data(side_a_members=side_a_members, side_b_members=side_b_members) broken_data = iptrunk_data(side_a_members=side_a_members, side_b_members=side_b_members)
......
...@@ -160,6 +160,15 @@ def faker() -> Faker: ...@@ -160,6 +160,15 @@ def faker() -> Faker:
return fake return fake
@pytest.fixture(autouse=True)
def _clear_faker_uniqueness(faker):
"""Reset the already seen values generated by faker.
The generators in Faker that require uniqueness, only do so on a per-test basis. Therefore, we can reset this after
every test to avoid ``UniquenessException``s."""
faker.unique.clear()
@pytest.fixture(scope="session") @pytest.fixture(scope="session")
def db_uri(): def db_uri():
"""Provide a unique database URI for each pytest-xdist worker, or a default URI if running without xdist.""" """Provide a unique database URI for each pytest-xdist worker, or a default URI if running without xdist."""
......
...@@ -56,7 +56,7 @@ def edge_port_subscription_factory(faker, geant_partner, router_subscription_fac ...@@ -56,7 +56,7 @@ def edge_port_subscription_factory(faker, geant_partner, router_subscription_fac
edge_port_subscription.edge_port.edge_port_description = description or faker.text(max_nb_chars=30) edge_port_subscription.edge_port.edge_port_description = description or faker.text(max_nb_chars=30)
edge_port_subscription.edge_port.ga_id = ga_id or faker.ga_id() edge_port_subscription.edge_port.ga_id = ga_id or faker.ga_id()
edge_port_subscription.edge_port.node = node edge_port_subscription.edge_port.node = node
edge_port_subscription.edge_port.edge_port_name = name or faker.nokia_lag_interface_name() edge_port_subscription.edge_port.edge_port_name = name or faker.unique.nokia_lag_interface_name()
edge_port_subscription.edge_port.edge_port_description = edge_port_description or faker.sentence() edge_port_subscription.edge_port.edge_port_description = edge_port_description or faker.sentence()
edge_port_subscription.edge_port.enable_lacp = enable_lacp edge_port_subscription.edge_port.enable_lacp = enable_lacp
edge_port_subscription.edge_port.encapsulation = encapsulation edge_port_subscription.edge_port.encapsulation = encapsulation
...@@ -69,16 +69,16 @@ def edge_port_subscription_factory(faker, geant_partner, router_subscription_fac ...@@ -69,16 +69,16 @@ def edge_port_subscription_factory(faker, geant_partner, router_subscription_fac
edge_port_subscription.edge_port.edge_port_ae_members = edge_port_ae_members or [ edge_port_subscription.edge_port.edge_port_ae_members = edge_port_ae_members or [
EdgePortAEMemberBlock.new( EdgePortAEMemberBlock.new(
faker.uuid(), faker.uuid(),
interface_name=faker.nokia_physical_interface_name() interface_name=faker.unique.nokia_physical_interface_name()
if node.vendor == Vendor.NOKIA if node.vendor == Vendor.NOKIA
else faker.juniper_physical_interface_name(), else faker.unique.juniper_physical_interface_name(),
interface_description=faker.sentence(), interface_description=faker.sentence(),
), ),
EdgePortAEMemberBlock.new( EdgePortAEMemberBlock.new(
faker.uuid(), faker.uuid(),
interface_name=faker.nokia_physical_interface_name() interface_name=faker.unique.nokia_physical_interface_name()
if node.vendor == Vendor.NOKIA if node.vendor == Vendor.NOKIA
else faker.juniper_physical_interface_name(), else faker.unique.juniper_physical_interface_name(),
interface_description=faker.sentence(), interface_description=faker.sentence(),
), ),
] ]
......
...@@ -31,18 +31,18 @@ def iptrunk_side_subscription_factory(router_subscription_factory, faker): ...@@ -31,18 +31,18 @@ def iptrunk_side_subscription_factory(router_subscription_factory, faker):
iptrunk_side_node=iptrunk_side_node.router iptrunk_side_node=iptrunk_side_node.router
if iptrunk_side_node if iptrunk_side_node
else router_subscription_factory(vendor=Vendor.NOKIA, router_access_via_ts=side_node_access_via_ts).router, else router_subscription_factory(vendor=Vendor.NOKIA, router_access_via_ts=side_node_access_via_ts).router,
iptrunk_side_ae_iface=iptrunk_side_ae_iface or faker.nokia_lag_interface_name(), iptrunk_side_ae_iface=iptrunk_side_ae_iface or faker.unique.nokia_lag_interface_name(),
ga_id=ga_id or faker.ga_id(), ga_id=ga_id or faker.ga_id(),
iptrunk_side_ae_members=iptrunk_side_ae_members iptrunk_side_ae_members=iptrunk_side_ae_members
or [ or [
IptrunkInterfaceBlock.new( IptrunkInterfaceBlock.new(
faker.uuid(), faker.uuid(),
interface_name=faker.nokia_physical_interface_name(), interface_name=faker.unique.nokia_physical_interface_name(),
interface_description=faker.sentence(), interface_description=faker.sentence(),
), ),
IptrunkInterfaceBlock.new( IptrunkInterfaceBlock.new(
faker.uuid(), faker.uuid(),
interface_name=faker.nokia_physical_interface_name(), interface_name=faker.unique.nokia_physical_interface_name(),
interface_description=faker.sentence(), interface_description=faker.sentence(),
), ),
], ],
......
...@@ -60,9 +60,9 @@ def lan_switch_interconnect_subscription_factory( ...@@ -60,9 +60,9 @@ def lan_switch_interconnect_subscription_factory(
LanSwitchInterconnectInterfaceBlockInactive.new( LanSwitchInterconnectInterfaceBlockInactive.new(
uuid4(), uuid4(),
interface_name=( interface_name=(
faker.nokia_physical_interface_name() faker.unique.nokia_physical_interface_name()
if router_side_node.vendor == Vendor.NOKIA if router_side_node.vendor == Vendor.NOKIA
else faker.juniper_physical_interface_name() else faker.unique.juniper_physical_interface_name()
), ),
interface_description=faker.sentence(), interface_description=faker.sentence(),
) )
...@@ -70,7 +70,9 @@ def lan_switch_interconnect_subscription_factory( ...@@ -70,7 +70,9 @@ def lan_switch_interconnect_subscription_factory(
] ]
switch_side_ae_members = switch_side_ae_members or [ switch_side_ae_members = switch_side_ae_members or [
LanSwitchInterconnectInterfaceBlockInactive.new( LanSwitchInterconnectInterfaceBlockInactive.new(
uuid4(), interface_name=faker.juniper_physical_interface_name(), interface_description=faker.sentence() uuid4(),
interface_name=faker.unique.juniper_physical_interface_name(),
interface_description=faker.sentence(),
) )
for _ in range(2) for _ in range(2)
] ]
...@@ -84,16 +86,16 @@ def lan_switch_interconnect_subscription_factory( ...@@ -84,16 +86,16 @@ def lan_switch_interconnect_subscription_factory(
node=router_side_node, node=router_side_node,
ae_iface=router_side_ae_iface ae_iface=router_side_ae_iface
or ( or (
faker.nokia_lag_interface_name() faker.unique.nokia_lag_interface_name()
if router_side_node.vendor == Vendor.NOKIA if router_side_node.vendor == Vendor.NOKIA
else faker.juniper_ae_interface_name() else faker.unique.juniper_ae_interface_name()
), ),
ae_members=router_side_ae_members, ae_members=router_side_ae_members,
) )
subscription.lan_switch_interconnect.switch_side = LanSwitchInterconnectSwitchSideBlockInactive.new( subscription.lan_switch_interconnect.switch_side = LanSwitchInterconnectSwitchSideBlockInactive.new(
uuid4(), uuid4(),
switch=switch_side_switch.site if switch_side_switch else switch_subscription_factory().switch, switch=switch_side_switch.site if switch_side_switch else switch_subscription_factory().switch,
ae_iface=switch_side_ae_iface or faker.juniper_ae_interface_name(), ae_iface=switch_side_ae_iface or faker.unique.juniper_ae_interface_name(),
ae_members=switch_side_ae_members, ae_members=switch_side_ae_members,
) )
subscription.lan_switch_interconnect.dcn_management_vlan_id = ( subscription.lan_switch_interconnect.dcn_management_vlan_id = (
......
...@@ -64,13 +64,13 @@ def input_form_wizard_data(request, router_subscription_factory, partner_factory ...@@ -64,13 +64,13 @@ def input_form_wizard_data(request, router_subscription_factory, partner_factory
"ga_id": "GA-12345", "ga_id": "GA-12345",
} }
create_edge_port_interface_step = { create_edge_port_interface_step = {
"name": faker.nokia_lag_interface_name(), "name": faker.unique.nokia_lag_interface_name(),
"description": faker.sentence(), "description": faker.sentence(),
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.juniper_physical_interface_name() "interface_name": faker.unique.juniper_physical_interface_name()
if vendor == Vendor.JUNIPER if vendor == Vendor.JUNIPER
else faker.nokia_physical_interface_name(), else faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
......
...@@ -15,7 +15,7 @@ def imported_edge_port_creation_input_form_data(router_subscription_factory, par ...@@ -15,7 +15,7 @@ def imported_edge_port_creation_input_form_data(router_subscription_factory, par
"service_type": EdgePortType.CUSTOMER, "service_type": EdgePortType.CUSTOMER,
"speed": PhysicalPortCapacity.TEN_GIGABIT_PER_SECOND, "speed": PhysicalPortCapacity.TEN_GIGABIT_PER_SECOND,
"encapsulation": EncapsulationType.DOT1Q, "encapsulation": EncapsulationType.DOT1Q,
"name": faker.nokia_lag_interface_name(), "name": faker.unique.nokia_lag_interface_name(),
"minimum_links": 2, "minimum_links": 2,
"ga_id": faker.imported_ga_id(), "ga_id": faker.imported_ga_id(),
"mac_address": faker.mac_address(), "mac_address": faker.mac_address(),
...@@ -24,11 +24,11 @@ def imported_edge_port_creation_input_form_data(router_subscription_factory, par ...@@ -24,11 +24,11 @@ def imported_edge_port_creation_input_form_data(router_subscription_factory, par
"ignore_if_down": False, "ignore_if_down": False,
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
}, },
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
}, },
], ],
......
...@@ -54,11 +54,11 @@ def input_form_wizard_data(request, router_subscription_factory, partner, faker) ...@@ -54,11 +54,11 @@ def input_form_wizard_data(request, router_subscription_factory, partner, faker)
"node": str(router_subscription_factory(vendor=Vendor.NOKIA).subscription_id), "node": str(router_subscription_factory(vendor=Vendor.NOKIA).subscription_id),
} }
create_edge_port_interface_step = { create_edge_port_interface_step = {
"name": faker.nokia_lag_interface_name(), "name": faker.unique.nokia_lag_interface_name(),
"description": faker.sentence(), "description": faker.sentence(),
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
......
...@@ -36,9 +36,9 @@ def input_form_wizard_data( ...@@ -36,9 +36,9 @@ def input_form_wizard_data(
"description": faker.sentence(), "description": faker.sentence(),
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.nokia_physical_interface_name() "interface_name": faker.unique.nokia_physical_interface_name()
if vendor == Vendor.NOKIA if vendor == Vendor.NOKIA
else faker.juniper_physical_interface_name(), else faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
], ],
......
...@@ -24,17 +24,17 @@ def workflow_input_data(faker, router_subscription_factory): ...@@ -24,17 +24,17 @@ def workflow_input_data(faker, router_subscription_factory):
"iptrunk_isis_metric": 10000, "iptrunk_isis_metric": 10000,
"iptrunk_description_suffix": faker.word(), "iptrunk_description_suffix": faker.word(),
"side_a_node_id": str(router_subscription_factory().subscription_id), "side_a_node_id": str(router_subscription_factory().subscription_id),
"side_a_ae_iface": faker.nokia_lag_interface_name(), "side_a_ae_iface": faker.unique.nokia_lag_interface_name(),
"side_a_ga_id": faker.imported_ga_id(), "side_a_ga_id": faker.imported_ga_id(),
"side_a_ae_members": [ "side_a_ae_members": [
{"interface_name": faker.nokia_physical_interface_name(), "interface_description": faker.sentence()} {"interface_name": faker.unique.nokia_physical_interface_name(), "interface_description": faker.sentence()}
for _ in range(3) for _ in range(3)
], ],
"side_b_node_id": str(router_subscription_factory().subscription_id), "side_b_node_id": str(router_subscription_factory().subscription_id),
"side_b_ae_iface": faker.nokia_lag_interface_name(), "side_b_ae_iface": faker.unique.nokia_lag_interface_name(),
"side_b_ga_id": faker.imported_ga_id(), "side_b_ga_id": faker.imported_ga_id(),
"side_b_ae_members": [ "side_b_ae_members": [
{"interface_name": faker.nokia_physical_interface_name(), "interface_description": faker.sentence()} {"interface_name": faker.unique.nokia_physical_interface_name(), "interface_description": faker.sentence()}
for _ in range(3) for _ in range(3)
], ],
"iptrunk_ipv4_network": faker.ipv4_network(max_subnet=31), "iptrunk_ipv4_network": faker.ipv4_network(max_subnet=31),
......
...@@ -55,7 +55,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker): ...@@ -55,7 +55,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker):
router_side_b = str(router_subscription_factory(vendor=Vendor.JUNIPER).subscription_id) router_side_b = str(router_subscription_factory(vendor=Vendor.JUNIPER).subscription_id)
side_b_members = [ side_b_members = [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -63,7 +63,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker): ...@@ -63,7 +63,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker):
else: else:
router_side_b = str(router_subscription_factory().subscription_id) router_side_b = str(router_subscription_factory().subscription_id)
side_b_members = [ side_b_members = [
{"interface_name": faker.nokia_physical_interface_name(), "interface_description": faker.sentence()} {"interface_name": faker.unique.nokia_physical_interface_name(), "interface_description": faker.sentence()}
for _ in range(2) for _ in range(2)
] ]
...@@ -79,10 +79,10 @@ def input_form_wizard_data(request, router_subscription_factory, faker): ...@@ -79,10 +79,10 @@ def input_form_wizard_data(request, router_subscription_factory, faker):
create_ip_trunk_confirm_step = {"iptrunk_minimum_links": 1} create_ip_trunk_confirm_step = {"iptrunk_minimum_links": 1}
create_ip_trunk_side_a_router_name = {"side_a_node_id": router_side_a} create_ip_trunk_side_a_router_name = {"side_a_node_id": router_side_a}
create_ip_trunk_side_a_step = { create_ip_trunk_side_a_step = {
"side_a_ae_iface": faker.nokia_lag_interface_name(), "side_a_ae_iface": faker.unique.nokia_lag_interface_name(),
"side_a_ae_members": [ "side_a_ae_members": [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -90,7 +90,7 @@ def input_form_wizard_data(request, router_subscription_factory, faker): ...@@ -90,7 +90,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_router_name = {"side_b_node_id": router_side_b}
create_ip_trunk_side_b_step = { create_ip_trunk_side_b_step = {
"side_b_ae_iface": faker.nokia_lag_interface_name(), "side_b_ae_iface": faker.unique.nokia_lag_interface_name(),
"side_b_ae_members": side_b_members, "side_b_ae_members": side_b_members,
} }
summary_view_step = {} summary_view_step = {}
......
...@@ -31,14 +31,14 @@ def migrate_form_input( ...@@ -31,14 +31,14 @@ def migrate_form_input(
use_juniper = getattr(request, "param", UseJuniperSide.NONE) use_juniper = getattr(request, "param", UseJuniperSide.NONE)
new_side_ae_members_nokia = [ new_side_ae_members_nokia = [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
] ]
new_side_ae_members_juniper = [ new_side_ae_members_juniper = [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -50,7 +50,7 @@ def migrate_form_input( ...@@ -50,7 +50,7 @@ def migrate_form_input(
new_router = str(router_subscription_factory(vendor=Vendor.JUNIPER, router_access_via_ts=False).subscription_id) new_router = str(router_subscription_factory(vendor=Vendor.JUNIPER, router_access_via_ts=False).subscription_id)
replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.owner_subscription_id) replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.owner_subscription_id)
new_side_ae_members = new_side_ae_members_juniper new_side_ae_members = new_side_ae_members_juniper
lag_name = faker.juniper_ae_interface_name() lag_name = faker.unique.juniper_ae_interface_name()
elif use_juniper == UseJuniperSide.SIDE_B: elif use_juniper == UseJuniperSide.SIDE_B:
# Juniper -> Nokia # Juniper -> Nokia
old_side_a_node = router_subscription_factory(vendor=Vendor.JUNIPER) old_side_a_node = router_subscription_factory(vendor=Vendor.JUNIPER)
...@@ -81,7 +81,7 @@ def migrate_form_input( ...@@ -81,7 +81,7 @@ def migrate_form_input(
new_router = str(router_subscription_factory().subscription_id) new_router = str(router_subscription_factory().subscription_id)
replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id) replace_side = str(old_subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.subscription.subscription_id)
new_side_ae_members = new_side_ae_members_nokia new_side_ae_members = new_side_ae_members_nokia
lag_name = faker.nokia_lag_interface_name() lag_name = faker.unique.nokia_lag_interface_name()
return [ return [
{"subscription_id": str(old_subscription.subscription_id)}, {"subscription_id": str(old_subscription.subscription_id)},
......
...@@ -32,14 +32,14 @@ def input_form_iptrunk_data( ...@@ -32,14 +32,14 @@ def input_form_iptrunk_data(
side_b_node = iptrunk_side_subscription_factory() side_b_node = iptrunk_side_subscription_factory()
new_side_a_ae_members = [ new_side_a_ae_members = [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
] ]
new_side_b_ae_members = [ new_side_b_ae_members = [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -50,14 +50,14 @@ def input_form_iptrunk_data( ...@@ -50,14 +50,14 @@ def input_form_iptrunk_data(
side_b_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node) side_b_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node)
new_side_a_ae_members = [ new_side_a_ae_members = [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
] ]
new_side_b_ae_members = [ new_side_b_ae_members = [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -69,14 +69,14 @@ def input_form_iptrunk_data( ...@@ -69,14 +69,14 @@ def input_form_iptrunk_data(
side_b_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node_2) side_b_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node_2)
new_side_a_ae_members = [ new_side_a_ae_members = [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
] ]
new_side_b_ae_members = [ new_side_b_ae_members = [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
...@@ -86,14 +86,14 @@ def input_form_iptrunk_data( ...@@ -86,14 +86,14 @@ def input_form_iptrunk_data(
side_b_node = iptrunk_side_subscription_factory() side_b_node = iptrunk_side_subscription_factory()
new_side_a_ae_members = [ new_side_a_ae_members = [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
] ]
new_side_b_ae_members = [ new_side_b_ae_members = [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
......
...@@ -18,20 +18,20 @@ def workflow_input_data(faker, router_subscription_factory, switch_subscription_ ...@@ -18,20 +18,20 @@ def workflow_input_data(faker, router_subscription_factory, switch_subscription_
"minimum_links": 1, "minimum_links": 1,
"router_side": { "router_side": {
"node": str(router_subscription_factory().subscription_id), "node": str(router_subscription_factory().subscription_id),
"ae_iface": faker.nokia_lag_interface_name(), "ae_iface": faker.unique.nokia_lag_interface_name(),
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
], ],
}, },
"switch_side": { "switch_side": {
"switch": str(switch_subscription_factory().subscription_id), "switch": str(switch_subscription_factory().subscription_id),
"ae_iface": faker.juniper_ae_interface_name(), "ae_iface": faker.unique.juniper_ae_interface_name(),
"ae_members": [ "ae_members": [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
], ],
......
...@@ -47,20 +47,20 @@ def input_form_data(faker, router_subscription_factory, switch_subscription_fact ...@@ -47,20 +47,20 @@ def input_form_data(faker, router_subscription_factory, switch_subscription_fact
"minimum_link_count": 2, "minimum_link_count": 2,
}, },
{ {
"router_side_iface": faker.nokia_lag_interface_name(), "router_side_iface": faker.unique.nokia_lag_interface_name(),
"router_side_ae_members": [ "router_side_ae_members": [
{ {
"interface_name": faker.nokia_physical_interface_name(), "interface_name": faker.unique.nokia_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
], ],
}, },
{ {
"switch_side_iface": faker.juniper_ae_interface_name(), "switch_side_iface": faker.unique.juniper_ae_interface_name(),
"switch_side_ae_members": [ "switch_side_ae_members": [
{ {
"interface_name": faker.juniper_physical_interface_name(), "interface_name": faker.unique.juniper_physical_interface_name(),
"interface_description": faker.sentence(), "interface_description": faker.sentence(),
} }
for _ in range(2) for _ in range(2)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment