Skip to content
Snippets Groups Projects
Commit 712f96a5 authored by Hakan Calim's avatar Hakan Calim Committed by Neda Moeini
Browse files

NAT-329 fied some whitespace issues from ruff

parent 90f99deb
No related branches found
Tags 2.12
1 merge request!122Feature/nat 329 interface names should validated 3
...@@ -24,31 +24,31 @@ def input_form_iptrunk_data( ...@@ -24,31 +24,31 @@ def input_form_iptrunk_data(
nokia_router_subscription_factory, nokia_router_subscription_factory,
iptrunk_side_subscription_factory, iptrunk_side_subscription_factory,
): ):
use_juniper= getattr(request, "param", UseJuniperSide.NONE) use_juniper = getattr(request, "param", UseJuniperSide.NONE)
if use_juniper == UseJuniperSide.SIDE_A: if use_juniper == UseJuniperSide.SIDE_A:
side_node = juniper_router_subscription_factory() side_node = juniper_router_subscription_factory()
side_a_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node) side_a_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node)
side_b_node = iptrunk_side_subscription_factory() side_b_node = iptrunk_side_subscription_factory()
new_side_a_ae_members = faker.generate_junniper_members_list() new_side_a_ae_members = faker.generate_junniper_members_list()
new_side_b_ae_members = faker.generate_nokia_members_list() new_side_b_ae_members = faker.generate_nokia_members_list()
elif use_juniper == UseJuniperSide.SIDE_B: elif use_juniper == UseJuniperSide.SIDE_B:
side_node = juniper_router_subscription_factory() side_node = juniper_router_subscription_factory()
side_a_node = iptrunk_side_subscription_factory() side_a_node = iptrunk_side_subscription_factory()
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 = faker.generate_nokia_members_list() new_side_a_ae_members = faker.generate_nokia_members_list()
new_side_b_ae_members = faker.generate_junniper_members_list() new_side_b_ae_members = faker.generate_junniper_members_list()
elif use_juniper == UseJuniperSide.SIDE_BOTH: elif use_juniper == UseJuniperSide.SIDE_BOTH:
side_node_1 = juniper_router_subscription_factory() side_node_1 = juniper_router_subscription_factory()
side_node_2 = juniper_router_subscription_factory() side_node_2 = juniper_router_subscription_factory()
side_a_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node_1) side_a_node = iptrunk_side_subscription_factory(iptrunk_side_node=side_node_1)
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 = faker.generate_junniper_members_list() new_side_a_ae_members = faker.generate_junniper_members_list()
new_side_b_ae_members = faker.generate_junniper_members_list() new_side_b_ae_members = faker.generate_junniper_members_list()
else: else:
side_a_node = iptrunk_side_subscription_factory() side_a_node = iptrunk_side_subscription_factory()
side_b_node = iptrunk_side_subscription_factory() side_b_node = iptrunk_side_subscription_factory()
new_side_a_ae_members = faker.generate_nokia_members_list() new_side_a_ae_members = faker.generate_nokia_members_list()
new_side_b_ae_members = faker.generate_nokia_members_list() new_side_b_ae_members = faker.generate_nokia_members_list()
product_id = iptrunk_subscription_factory(iptrunk_sides=[side_a_node, side_b_node]) product_id = iptrunk_subscription_factory(iptrunk_sides=[side_a_node, side_b_node])
...@@ -150,10 +150,10 @@ def test_iptrunk_modify_trunk_interface_success( ...@@ -150,10 +150,10 @@ def test_iptrunk_modify_trunk_interface_success(
# lag interface for nokia sides # lag interface for nokia sides
num_lag_ifaces = int(vendor_side_a == RouterVendor.NOKIA) + int(vendor_side_b == RouterVendor.NOKIA) num_lag_ifaces = int(vendor_side_a == RouterVendor.NOKIA) + int(vendor_side_b == RouterVendor.NOKIA)
assert mocked_reserve_interface.call_count == num_ifaces # Only nokia interfaces per side num is randomly generated assert mocked_reserve_interface.call_count == num_ifaces # Only nokia interfaces per side num is randomly generated
assert mocked_attach_interface_to_lag.call_count == num_ifaces assert mocked_attach_interface_to_lag.call_count == num_ifaces
assert mocked_free_interface.call_count == num_free_ifaces # 2 interfaces per nokia side(The old ones) assert mocked_free_interface.call_count == num_free_ifaces # 2 interfaces per nokia side(The old ones)
assert mocked_detach_interfaces_from_lag.call_count == num_lag_ifaces # 1 time per nokia side assert mocked_detach_interfaces_from_lag.call_count == num_lag_ifaces # 1 time per nokia side
# Assert all subscription properties have been updated correctly # Assert all subscription properties have been updated correctly
assert subscription.description == f"IP trunk, geant_s_sid:{new_sid}" assert subscription.description == f"IP trunk, geant_s_sid:{new_sid}"
...@@ -182,5 +182,5 @@ def test_iptrunk_modify_trunk_interface_success( ...@@ -182,5 +182,5 @@ def test_iptrunk_modify_trunk_interface_success(
for member in subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members: for member in subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members:
assert ( assert (
member.interface_description member.interface_description
== _find_interface_by_name(new_side_b_ae_members , member.interface_name).interface_description == _find_interface_by_name(new_side_b_ae_members, member.interface_name).interface_description
) )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment