reverting to v6_prefix import from common and removing hostname check

sonic-net · Jan 6, 2025 · bf71095 · bf71095
1 parent 9359465
commit bf71095
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/tests/snappi_tests/multidut/bgp/files/bgp_outbound_helper.py b/tests/snappi_tests/multidut/bgp/files/bgp_outbound_helper.py
@@ -21,7 +21,8 @@
      snappi_portchannel_ipv4_list, snappi_portchannel_ipv6_list, AS_PATHS, \
      BGP_TYPE, t1_side_interconnected_port, t2_side_interconnected_port, router_ids, \
      snappi_community_for_t1, snappi_community_for_t1_drop, snappi_community_for_t2, num_regionalhubs,  \
-     SNAPPI_TRIGGER, DUT_TRIGGER, fanout_presence, t2_uplink_fanout_info, v6_prefix_length  # noqa: F401
+     SNAPPI_TRIGGER, DUT_TRIGGER, fanout_presence, t2_uplink_fanout_info  # noqa: F401
+from tests.common.snappi_tests.variables import v6_prefix_length
 
 logger = logging.getLogger(__name__)
 total_routes = 0

diff --git a/tests/snappi_tests/multidut/bgp/test_bgp_outbound_ungraceful_restart.py b/tests/snappi_tests/multidut/bgp/test_bgp_outbound_ungraceful_restart.py
@@ -108,8 +108,6 @@ def test_bgp_outbound_uplink_ungraceful_restart(snappi_api,
     logger.info("HW Platform: {}".format(hw_platform))
 
     snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][1]
-    if (len(t1_t2_device_hostnames[hw_platform]) < 3) or (len(duthosts) < 3):
-        pytest_assert(False, "Need minimum of 3 devices : One T1 and Two T2 line cards")
 
     for device_hostname in t1_t2_device_hostnames[hw_platform]:
         if device_hostname not in ansible_dut_hostnames:
@@ -171,8 +169,6 @@ def test_bgp_outbound_downlink_ungraceful_restart(snappi_api,
     logger.info("HW Platform: {}".format(hw_platform))
 
     snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][2]
-    if (len(t1_t2_device_hostnames[hw_platform]) < 3) or (len(duthosts) < 3):
-        pytest_assert(False, "Need minimum of 3 devices : One T1 and Two T2 line cards")
 
     for device_hostname in t1_t2_device_hostnames[hw_platform]:
         if device_hostname not in ansible_dut_hostnames:
@@ -239,8 +235,6 @@ def test_bgp_outbound_supervisor_ungraceful_restart(snappi_api,
                         format(device_hostname, ansible_dut_hostnames))
             pytest_assert(False, "Mismatch between the dut hostnames in ansible and in variables.py files")
     snappi_extra_params.device_name = t1_t2_device_hostnames[hw_platform][3]
-    if (len(t1_t2_device_hostnames[hw_platform]) < 3) or (len(duthosts) < 3):
-        pytest_assert(False, "Need minimum of 3 devices : One T1 and Two T2 line cards")
 
     for duthost in duthosts:
         if t1_t2_device_hostnames[hw_platform][0] in duthost.hostname: