Revert "Fix import issue of tests/snappi_tests in python3 (sonic-net#…

…9232)" This reverts commit a3c0642.
SuvarnaMeenakshi · Aug 3, 2023 · a12ac1e · a12ac1e
1 parent 6ceebe4
commit a12ac1e
Show file tree

Hide file tree

Showing 25 changed files with 25 additions and 26 deletions.
diff --git a/.azure-pipelines/pytest-collect-only.yml b/.azure-pipelines/pytest-collect-only.yml
@@ -35,7 +35,7 @@ steps:
     set -x
 
     sudo docker exec -t -w /var/src/sonic-mgmt/tests sonic-mgmt-collect \
-      python3 -m pytest --inventory ../ansible/veos_vtb --host-pattern all \
+      pytest --inventory ../ansible/veos_vtb --host-pattern all \
       --testbed_file vtestbed.yaml --testbed vms-kvm-t0 \
       --ignore saitests --ignore ptftests --ignore acstests \
       --ignore scripts --ignore k8s --ignore sai_qualify --ignore common \

diff --git a/tests/snappi_tests/bgp/test_bgp_convergence_performance.py b/tests/snappi_tests/bgp/test_bgp_convergence_performance.py
@@ -1,6 +1,6 @@
 from tests.common.snappi_tests.snappi_fixtures import (                           # noqa F401
     cvg_api, snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.bgp.files.bgp_test_gap_helper import run_bgp_convergence_performance
+from .files.bgp_test_gap_helper import run_bgp_convergence_performance
 from tests.common.fixtures.conn_graph_facts import (                        # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/bgp/test_bgp_local_link_failover.py b/tests/snappi_tests/bgp/test_bgp_local_link_failover.py
@@ -1,6 +1,6 @@
 from tests.common.snappi_tests.snappi_fixtures import (                           # noqa F401
     cvg_api, snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.bgp.files.bgp_convergence_helper import run_bgp_local_link_failover_test
+from .files.bgp_convergence_helper import run_bgp_local_link_failover_test
 from tests.common.fixtures.conn_graph_facts import (                        # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/bgp/test_bgp_remote_link_failover.py b/tests/snappi_tests/bgp/test_bgp_remote_link_failover.py
@@ -1,6 +1,6 @@
 from tests.common.snappi_tests.snappi_fixtures import (                           # noqa F401
     cvg_api, snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.bgp.files.bgp_convergence_helper import run_bgp_remote_link_failover_test
+from .files.bgp_convergence_helper import run_bgp_remote_link_failover_test
 from tests.common.fixtures.conn_graph_facts import (                        # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/bgp/test_bgp_rib_in_capacity.py b/tests/snappi_tests/bgp/test_bgp_rib_in_capacity.py
@@ -1,6 +1,6 @@
 from tests.common.snappi_tests.snappi_fixtures import (                           # noqa F401
     cvg_api, snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.bgp.files.bgp_convergence_helper import run_RIB_IN_capacity_test
+from .files.bgp_convergence_helper import run_RIB_IN_capacity_test
 from tests.common.fixtures.conn_graph_facts import (                        # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/bgp/test_bgp_rib_in_convergence.py b/tests/snappi_tests/bgp/test_bgp_rib_in_convergence.py
@@ -1,6 +1,6 @@
 from tests.common.snappi_tests.snappi_fixtures import (                           # noqa F401
     cvg_api, snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.bgp.files.bgp_convergence_helper import run_rib_in_convergence_test
+from .files.bgp_convergence_helper import run_rib_in_convergence_test
 from tests.common.fixtures.conn_graph_facts import (                        # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/bgp/test_bgp_scalability.py b/tests/snappi_tests/bgp/test_bgp_scalability.py
@@ -1,7 +1,6 @@
 from tests.common.snappi_tests.snappi_fixtures import (                           # noqa F401
     cvg_api, snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.bgp.files.bgp_test_gap_helper import duthost_bgp_scalability_config, \
-    run_bgp_scalability_v4_v6, cleanup_config
+from .files.bgp_test_gap_helper import duthost_bgp_scalability_config, run_bgp_scalability_v4_v6, cleanup_config
 from tests.common.fixtures.conn_graph_facts import (                        # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/ecn/conftest.py b/tests/snappi_tests/ecn/conftest.py
@@ -1,4 +1,4 @@
-from tests.snappi_tests.ecn.ecn_args.ecn_args import add_ecn_args
+from ecn_args.ecn_args import add_ecn_args
 
 
 def pytest_addoption(parser):

diff --git a/tests/snappi_tests/ecn/test_dequeue_ecn_with_snappi.py b/tests/snappi_tests/ecn/test_dequeue_ecn_with_snappi.py
@@ -7,7 +7,7 @@
     snappi_api, snappi_testbed_config           # noqa F401
 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, lossless_prio_list      # noqa F401
 
-from tests.snappi_tests.ecn.files.helper import run_ecn_test, is_ecn_marked
+from files.helper import run_ecn_test, is_ecn_marked
 
 pytestmark = [pytest.mark.topology('tgen')]
 

diff --git a/tests/snappi_tests/ecn/test_red_accuracy_with_snappi.py b/tests/snappi_tests/ecn/test_red_accuracy_with_snappi.py
@@ -8,7 +8,7 @@
     snappi_api, snappi_testbed_config           # noqa F401
 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, lossless_prio_list      # noqa F401
 
-from tests.snappi_tests.ecn.files.helper import run_ecn_test, is_ecn_marked
+from files.helper import run_ecn_test, is_ecn_marked
 
 pytestmark = [pytest.mark.topology('tgen')]
 

diff --git a/tests/snappi_tests/lacp/test_add_remove_link_from_dut.py b/tests/snappi_tests/lacp/test_add_remove_link_from_dut.py
@@ -1,7 +1,7 @@
 from tests.common.snappi_tests.snappi_fixtures import cvg_api, snappi_api     # noqa F401
 from tests.common.snappi_tests.snappi_fixtures import (                       # noqa F401
     snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.lacp.files.lacp_dut_helper import run_lacp_add_remove_link_from_dut
+from .files.lacp_dut_helper import run_lacp_add_remove_link_from_dut
 from tests.common.fixtures.conn_graph_facts import (                    # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/lacp/test_add_remove_link_physically.py b/tests/snappi_tests/lacp/test_add_remove_link_physically.py
@@ -1,7 +1,7 @@
 from tests.common.snappi_tests.snappi_fixtures import cvg_api             # noqa F401
 from tests.common.snappi_tests.snappi_fixtures import (                   # noqa F401
     snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.lacp.files.lacp_physical_helper import run_lacp_add_remove_link_physically
+from .files.lacp_physical_helper import run_lacp_add_remove_link_physically
 from tests.common.fixtures.conn_graph_facts import (                # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/lacp/test_lacp_timers_effect.py b/tests/snappi_tests/lacp/test_lacp_timers_effect.py
@@ -1,7 +1,7 @@
 from tests.common.snappi_tests.snappi_fixtures import cvg_api         # noqa F401
 from tests.common.snappi_tests.snappi_fixtures import (               # noqa F401
     snappi_api_serv_ip, snappi_api_serv_port, tgen_ports)
-from tests.snappi_tests.lacp.files.lacp_physical_helper import run_lacp_timers_effect
+from .files.lacp_physical_helper import run_lacp_timers_effect
 from tests.common.fixtures.conn_graph_facts import (            # noqa F401
     conn_graph_facts, fanout_graph_facts)
 import pytest

diff --git a/tests/snappi_tests/pfc/test_global_pause_with_snappi.py b/tests/snappi_tests/pfc/test_global_pause_with_snappi.py
@@ -8,7 +8,7 @@
 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list, lossless_prio_list,\
     lossy_prio_list                         # noqa F401
 
-from tests.snappi_tests.pfc.files.helper import run_pfc_test
+from .files.helper import run_pfc_test
 
 pytestmark = [pytest.mark.topology('tgen')]
 

diff --git a/tests/snappi_tests/pfc/test_pfc_pause_lossless_with_snappi.py b/tests/snappi_tests/pfc/test_pfc_pause_lossless_with_snappi.py
@@ -1,7 +1,7 @@
 import logging
 import pytest
 
-from tests.snappi_tests.pfc.files.helper import run_pfc_test
+from .files.helper import run_pfc_test
 from tests.common.helpers.assertions import pytest_assert, pytest_require
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
     fanout_graph_facts                      # noqa F401

diff --git a/tests/snappi_tests/pfc/test_pfc_pause_lossy_with_snappi.py b/tests/snappi_tests/pfc/test_pfc_pause_lossy_with_snappi.py
@@ -1,7 +1,7 @@
 import logging
 import pytest
 
-from tests.snappi_tests.pfc.files.helper import run_pfc_test
+from .files.helper import run_pfc_test
 from tests.common.helpers.assertions import pytest_assert, pytest_require
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
     fanout_graph_facts                      # noqa F401

diff --git a/tests/snappi_tests/pfc/test_pfc_pause_response_with_snappi.py b/tests/snappi_tests/pfc/test_pfc_pause_response_with_snappi.py
@@ -1,7 +1,7 @@
 import logging
 import pytest
 
-from tests.snappi_tests.pfc.files.helper import run_pfc_test
+from .files.helper import run_pfc_test
 from tests.common.helpers.assertions import pytest_require
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
     fanout_graph_facts                      # noqa F401

diff --git a/tests/snappi_tests/pfc/test_pfc_pause_unset_bit_enable_vector.py b/tests/snappi_tests/pfc/test_pfc_pause_unset_bit_enable_vector.py
@@ -1,7 +1,7 @@
 import logging
 import pytest
 
-from tests.snappi_tests.pfc.files.helper import run_pfc_test
+from files.helper import run_pfc_test
 from tests.common.helpers.assertions import pytest_require
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
     fanout_graph_facts # noqa F401

diff --git a/tests/snappi_tests/pfc/test_pfc_pause_zero_mac.py b/tests/snappi_tests/pfc/test_pfc_pause_zero_mac.py
@@ -1,7 +1,7 @@
 import logging
 import pytest
 
-from tests.snappi_tests.pfc.files.helper import run_pfc_test
+from files.helper import run_pfc_test
 from tests.common.helpers.assertions import pytest_require
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
     fanout_graph_facts # noqa F401

diff --git a/tests/snappi_tests/pfcwd/test_pfcwd_a2a_with_snappi.py b/tests/snappi_tests/pfcwd/test_pfcwd_a2a_with_snappi.py
@@ -8,7 +8,7 @@
 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list,\
     lossless_prio_list, lossy_prio_list     # noqa F401
 
-from tests.snappi_tests.pfcwd.files.pfcwd_multi_node_helper import run_pfcwd_multi_node_test
+from .files.pfcwd_multi_node_helper import run_pfcwd_multi_node_test
 
 
 pytestmark = [pytest.mark.topology('tgen')]

diff --git a/tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py b/tests/snappi_tests/pfcwd/test_pfcwd_basic_with_snappi.py
@@ -10,7 +10,7 @@
 from tests.common.config_reload import config_reload
 from tests.common.reboot import reboot
 from tests.common.utilities import wait_until
-from tests.snappi_tests.pfcwd.files.pfcwd_basic_helper import run_pfcwd_basic_test
+from .files.pfcwd_basic_helper import run_pfcwd_basic_test
 from tests.snappi_tests.files.helper import skip_warm_reboot
 
 logger = logging.getLogger(__name__)

diff --git a/tests/snappi_tests/pfcwd/test_pfcwd_burst_storm_with_snappi.py b/tests/snappi_tests/pfcwd/test_pfcwd_burst_storm_with_snappi.py
@@ -7,7 +7,7 @@
 from tests.common.snappi_tests.snappi_fixtures import snappi_api_serv_ip, snappi_api_serv_port,\
     snappi_api, snappi_testbed_config       # noqa F401
 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map      # noqa F401
-from tests.snappi_tests.pfcwd.files.pfcwd_burst_storm_helper import run_pfcwd_burst_storm_test
+from .files.pfcwd_burst_storm_helper import run_pfcwd_burst_storm_test
 
 logger = logging.getLogger(__name__)
 

diff --git a/tests/snappi_tests/pfcwd/test_pfcwd_m2o_with_snappi.py b/tests/snappi_tests/pfcwd/test_pfcwd_m2o_with_snappi.py
@@ -8,7 +8,7 @@
 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list,\
     lossless_prio_list, lossy_prio_list     # noqa F401
 
-from tests.snappi_tests.pfcwd.files.pfcwd_multi_node_helper import run_pfcwd_multi_node_test
+from .files.pfcwd_multi_node_helper import run_pfcwd_multi_node_test
 
 pytestmark = [pytest.mark.topology('tgen')]
 

diff --git a/tests/snappi_tests/pfcwd/test_pfcwd_runtime_traffic_with_snappi.py b/tests/snappi_tests/pfcwd/test_pfcwd_runtime_traffic_with_snappi.py
@@ -7,7 +7,7 @@
     snappi_api, snappi_testbed_config       # noqa F401
 from tests.common.snappi_tests.qos_fixtures import prio_dscp_map, all_prio_list   # noqa F401
 
-from tests.snappi_tests.pfcwd.files.pfcwd_runtime_traffic_helper import run_pfcwd_runtime_traffic_test
+from .files.pfcwd_runtime_traffic_helper import run_pfcwd_runtime_traffic_test
 
 pytestmark = [pytest.mark.topology('tgen')]
 

diff --git a/tests/snappi_tests/qos/test_ipip_packet_reorder_with_snappi.py b/tests/snappi_tests/qos/test_ipip_packet_reorder_with_snappi.py
@@ -1,7 +1,7 @@
 import logging
 import pytest
 
-from tests.snappi_tests.qos.files.packet_reorder_helper import run_ipip_packet_reorder_test
+from files.packet_reorder_helper import run_ipip_packet_reorder_test
 from tests.common.helpers.assertions import pytest_require
 from tests.common.fixtures.conn_graph_facts import conn_graph_facts,\
     fanout_graph_facts # noqa F401