Skip to content

[acstests] Migrate lag test to Python 3 #14001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangxin merged 2 commits into from
Aug 7, 2024
+5 −14
Merged

[acstests] Migrate lag test to Python 3 #14001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
678feb6
Migrate test_lag_2 to Python 3
opcoder0 Aug 6, 2024
5bd84a7
Copy both ptftests and acstests to the PTF host
opcoder0 Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ble/roles/test/files/acstests/lag_test.py → ...roles/test/files/acstests/py3/lag_test.py
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ansible/roles/test/files/acstests/py3/router_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../router_utils.py
18 changes: 4 additions & 14 deletions tests/pc/test_lag_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import time
import logging

from tests.common.fixtures.ptfhost_utils import copy_acstests_directory # noqa F401
from tests.common.fixtures.ptfhost_utils import copy_ptftests_directory # noqa F401
from tests.ptf_runner import ptf_runner
from tests.common.fixtures.conn_graph_facts import conn_graph_facts # noqa F401
Expand All @@ -21,9 +22,6 @@
pytest.mark.topology('any'),
]

# The dir will be deleted from host, so be sure not to use system dir
TEST_DIR = "/tmp/acstests/"


@pytest.fixture(autouse=True)
def ignore_expected_loganalyzer_exceptions(duthosts, loganalyzer):
Expand All @@ -40,20 +38,12 @@ def ignore_expected_loganalyzer_exceptions(duthosts, loganalyzer):


@pytest.fixture(scope="module")
def common_setup_teardown(ptfhost, duthosts):
logger.info("########### Setup for lag testing ###########")
def common_setup_teardown(copy_acstests_directory, copy_ptftests_directory, ptfhost, duthosts): # noqa F811

ptfhost.shell("mkdir -p {}".format(TEST_DIR))
# Copy PTF test into PTF-docker for test LACP DU
test_files = ['lag_test.py', 'acs_base_test.py', 'router_utils.py']
for test_file in test_files:
src = "../ansible/roles/test/files/acstests/%s" % test_file
dst = TEST_DIR + test_file
ptfhost.copy(src=src, dest=dst)
logger.info("########### Setup for lag testing ###########")

yield ptfhost

ptfhost.file(path=TEST_DIR, state="absent")
# NOTE: As test_lag always causes the route_check to fail and route_check
# takes more than 3 cycles(15mins) to alert, the testcase in the nightly after
# the test_lag will suffer from the monit alert, so let's config reload the
Expand Down Expand Up @@ -126,7 +116,7 @@ def __verify_lag_lacp_timing(self, lacp_timer, exp_iface):
'ether_type': 0x8809,
'interval_count': 3
}
ptf_runner(self.ptfhost, TEST_DIR, "lag_test.LacpTimingTest", '/root/ptftests', params=params)
ptf_runner(self.ptfhost, 'acstests', "lag_test.LacpTimingTest", '/root/ptftests', params=params)

def __verify_lag_minlink(self, host, lag_name, lag_facts,
neighbor_intf, deselect_time, wait_timeout=30):
Expand Down