From 7c8cccff360c42d1c5429448bfe0d2c2376467ce Mon Sep 17 00:00:00 2001
From: Hakan Calim <hakan.calim@fau.de>
Date: Thu, 30 Nov 2023 12:33:53 +0100
Subject: [PATCH] NAT-329: fixed issue with calculating sum of only nokia
interfaces
---
.../iptrunk/test_modify_trunk_interface.py | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/test/workflows/iptrunk/test_modify_trunk_interface.py b/test/workflows/iptrunk/test_modify_trunk_interface.py
index 3424a5cc..e7c5d971 100644
--- a/test/workflows/iptrunk/test_modify_trunk_interface.py
+++ b/test/workflows/iptrunk/test_modify_trunk_interface.py
@@ -4,6 +4,7 @@ import pytest
from gso.products import Iptrunk
from gso.products.product_blocks.iptrunk import IptrunkType, PhyPortCapacity
+from gso.products.product_blocks.router import RouterVendor
from test.conftest import UseJuniperSide
from test.workflows import (
assert_complete,
@@ -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_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"]
- 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_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_detach_interfaces_from_lag.call_count == 2 # 1 time per side
@@ -160,7 +168,7 @@ def test_iptrunk_modify_trunk_interface_success(
for member in subscription.iptrunk.iptrunk_sides[0].iptrunk_side_ae_members:
assert (
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
@@ -168,5 +176,5 @@ def test_iptrunk_modify_trunk_interface_success(
for member in subscription.iptrunk.iptrunk_sides[1].iptrunk_side_ae_members:
assert (
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
)
--
GitLab