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

NAT-329: fixed issue with calculating sum of only nokia interfaces

parent 879e13fa
No related branches found
No related tags found
1 merge request!122Feature/nat 329 interface names should validated 3
...@@ -4,6 +4,7 @@ import pytest ...@@ -4,6 +4,7 @@ import pytest
from gso.products import Iptrunk from gso.products import Iptrunk
from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
from gso.products.product_blocks.router import RouterVendor
from test.conftest import UseJuniperSide from test.conftest import UseJuniperSide
from test.workflows import ( from test.workflows import (
assert_complete, assert_complete,
...@@ -135,9 +136,16 @@ def test_iptrunk_modify_trunk_interface_success( ...@@ -135,9 +136,16 @@ def test_iptrunk_modify_trunk_interface_success(
new_side_a_ae_members = input_form_iptrunk_data[2]["side_a_ae_members"] new_side_a_ae_members = input_form_iptrunk_data[2]["side_a_ae_members"]
new_side_b_sid = input_form_iptrunk_data[3]["side_b_ae_geant_a_sid"] new_side_b_sid = input_form_iptrunk_data[3]["side_b_ae_geant_a_sid"]
new_side_b_ae_members = input_form_iptrunk_data[3]["side_b_ae_members"] new_side_b_ae_members = input_form_iptrunk_data[3]["side_b_ae_members"]
num_ifaces = len(new_side_a_sid ) + len(new_side_b_sid ) # The length are randomly generated
# Only Nokia interfaces will checked
vendor_side_a = subscription.iptrunk.iptrunk_sides[0].iptrunk_side_node.vendor
vendor_side_b = subscription.iptrunk.iptrunk_sides[1].iptrunk_side_node.vendor
num_ifaces = (
len(new_side_a_ae_members) if vendor_side_a == RouterVendor.NOKIA else 0) + (
len(new_side_b_ae_members) if vendor_side_b == RouterVendor.NOKIA else 0)
assert mocked_reserve_interface.call_count == num_ifaces assert mocked_reserve_interface.call_count == num_ifaces
assert mocked_attach_interface_to_lag.call_count == 10 # 5 interfaces per side assert mocked_attach_interface_to_lag.call_count == num_ifaces
assert mocked_free_interface.call_count == 4 # 2 interfaces per side(The old ones) assert mocked_free_interface.call_count == 4 # 2 interfaces per side(The old ones)
assert mocked_detach_interfaces_from_lag.call_count == 2 # 1 time per side assert mocked_detach_interfaces_from_lag.call_count == 2 # 1 time per side
...@@ -160,7 +168,7 @@ def test_iptrunk_modify_trunk_interface_success( ...@@ -160,7 +168,7 @@ def test_iptrunk_modify_trunk_interface_success(
for member in subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members: for member in subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members:
assert ( assert (
member.interface_description member.interface_description
== _find_interface_by_name(new_side_a_ae_members, member.interface_name)["interface_description"] == _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].iptrunk_side_ae_geant_a_sid == new_side_b_sid
...@@ -168,5 +176,5 @@ def test_iptrunk_modify_trunk_interface_success( ...@@ -168,5 +176,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