Skip to content

Commit e478d46

Browse files
committed
update skip condition for cisco T2
Signed-off-by: Zhixin Zhu <zhixzhu@cisco.com>
1 parent 3c74663 commit e478d46

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

tests/qos/qos_sai_base.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,3 +2243,12 @@ def populate_arp_entries(
22432243
self.runPtfTest(
22442244
ptfhost, testCase=saiQosTest, testParams=testParams
22452245
)
2246+
2247+
@pytest.fixture(scope="function", autouse=False)
2248+
def skip_vanguard(self, get_src_dst_asic_and_duts):
2249+
src_asic = get_src_dst_asic_and_duts['src_asic']
2250+
if src_asic.sonichost.facts['platform'] in ["x86_64-88_lc0_36fh_mo-r0", "x86_64-88_lc0_36fh_m-r0"]:
2251+
pytest.skip(
2252+
"This test is skipped since this asic is cisco-8000 Q200 longlink.")
2253+
yield
2254+
return

tests/qos/test_qos_sai.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ def testQosSaiPfcXonLimit(
684684
"lossless_voq_3", "lossless_voq_4"])
685685
def testQosSaiLosslessVoq(
686686
self, LosslessVoqProfile, ptfhost, dutTestParams, dutConfig,
687-
dutQosConfig, get_src_dst_asic_and_duts
687+
dutQosConfig, get_src_dst_asic_and_duts, skip_vanguard
688688
):
689689
"""
690690
Test QoS SAI XOFF limits for various voq mode configurations
@@ -895,6 +895,14 @@ def testQosSaiSharedReservationSize(
895895
Raises:
896896
RunAnsibleModuleFail if ptf test fails
897897
"""
898+
if ('modular_chassis' in get_src_dst_asic_and_duts['src_dut'].facts and
899+
get_src_dst_asic_and_duts['src_dut'].facts["modular_chassis"] == "True"):
900+
if dutConfig['dstDutAsic'] != "pac":
901+
pytest.skip("This test is skipped since not enough ports on cisco-8000 "
902+
"T2 Q200.")
903+
if "shared_res_size_2" in sharedResSizeKey:
904+
pytest.skip("This test is skipped since on cisco-8000 Q100, "
905+
"SQG thresholds have no impact on XOFF thresholds.")
898906

899907
qosConfig = dutQosConfig["param"]
900908
src_dut_index = get_src_dst_asic_and_duts['src_dut_index']

0 commit comments

Comments
 (0)