diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml index 8aad3907c2b..54ee3fbc517 100644 --- a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml +++ b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml @@ -1830,7 +1830,7 @@ qos/test_qos_sai.py::TestQosSai: conditions_logical_operator: or conditions: - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testIPIPQosSaiDscpToPgMapping: skip: @@ -1840,7 +1840,7 @@ qos/test_qos_sai.py::TestQosSai::testIPIPQosSaiDscpToPgMapping: - "asic_type in ['mellanox']" - https://github.com/sonic-net/sonic-mgmt/issues/12906 - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testPfcStormWithSharedHeadroomOccupancy: skip: @@ -1849,7 +1849,7 @@ qos/test_qos_sai.py::TestQosSai::testPfcStormWithSharedHeadroomOccupancy: conditions: - "asic_type in ['cisco-8000']" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark: skip: @@ -1858,7 +1858,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiBufferPoolWatermark: conditions: - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0', 'x86_64-arista_7800r3_48cq2_lc', 'x86_64-arista_7800r3_48cqm2_lc', 'x86_64-arista_7800r3a_36d2_lc', 'x86_64-arista_7800r3a_36dm2_lc','x86_64-arista_7800r3ak_36dm2_lc']" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiDot1pPgMapping: skip: @@ -1867,7 +1867,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDot1pPgMapping: conditions: - "'backend' not in topo_name" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiDot1pQueueMapping: skip: @@ -1876,7 +1876,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDot1pQueueMapping: conditions: - "'backend' not in topo_name" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping: skip: @@ -1885,7 +1885,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDscpQueueMapping: conditions: - "'backend' in topo_name" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiDscpToPgMapping: skip: @@ -1894,7 +1894,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDscpToPgMapping: conditions: - "'backend' in topo_name" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange: skip: @@ -1903,7 +1903,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange: conditions: - "asic_type in ['mellanox']" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiFullMeshTrafficSanity: skip: @@ -1912,7 +1912,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiFullMeshTrafficSanity: conditions: - "asic_type not in ['cisco-8000'] or topo_name not in ['ptf64']" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize: skip: @@ -1923,7 +1923,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolSize: and topo_type in ['t1-64-lag'] and hwsku not in ['Arista-7060CX-32S-C32', 'Celestica-DX010-C32', 'Arista-7260CX3-D108C8', 'Arista-7260CX3-D108C10', 'Force10-S6100', 'Arista-7260CX3-Q64', 'Arista-7050CX3-32S-C32', 'Arista-7050CX3-32S-D48C8', 'Arista-7060CX-32S-D48C8'] and asic_type not in ['mellanox'] and asic_type in ['cisco-8000']" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" - "'t2' in topo_name and asic_subtype in ['broadcom-dnx']" - "asic_type in ['vs']" @@ -1936,7 +1936,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiHeadroomPoolWatermark: and asic_type in ['cisco-8000'] and https://github.com/sonic-net/sonic-mgmt/issues/12292 and hwsku in ['Force10-S6100'] and topo_type in ['t1-64-lag']" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" xfail: reason: "Headroom pool size not supported." conditions: @@ -1949,7 +1949,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiLosslessVoq: conditions: - "asic_type not in ['cisco-8000'] or platform.startswith('x86_64-8122_')" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoq: skip: @@ -1958,7 +1958,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoq: conditions: - "asic_type not in ['cisco-8000'] or platform.startswith('x86_64-8122_')" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoqMultiSrc: skip: @@ -1967,7 +1967,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiLossyQueueVoqMultiSrc: conditions: - "asic_type not in ['cisco-8000'] or platform.startswith('x86_64-8122_')" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiPGDrop: skip: @@ -1976,7 +1976,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiPGDrop: conditions: - "asic_type not in ['cisco-8000'] or platform.startswith('x86_64-8122_')" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark: skip: @@ -1985,7 +1985,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiPgHeadroomWatermark: conditions: - "asic_type in ['cisco-8000'] and not platform.startswith('x86_64-8122_')" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiPgSharedWatermark[None-wm_pg_shared_lossy]: xfail: @@ -2000,7 +2000,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiQWatermarkAllPorts: conditions: - "asic_type not in ['cisco-8000']" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiSharedReservationSize: skip: @@ -2009,7 +2009,7 @@ qos/test_qos_sai.py::TestQosSai::testQosSaiSharedReservationSize: conditions: - "asic_type not in ['cisco-8000'] or platform.startswith('x86_64-8122_')" - "topo_type in ['m0', 'mx', 'm1', 'm2', 'm3']" - - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" + - "topo_name not in ['t0', 't0-64', 't0-116', 't0-118', 't0-35', 't0-56', 't0-standalone-32', 't0-standalone-64', 't0-standalone-128', 't0-standalone-256', 'dualtor-56', 'dualtor-120', 'dualtor', 'dualtor-aa', 't0-80', 't0-backend', 't1-lag', 't1-28-lag', 't1-64-lag', 't1-56-lag', 't1-backend', 't2', 't2_2lc_36p-masic', 't2_2lc_min_ports-masic'] and asic_type not in ['mellanox']" qos/test_qos_sai.py::TestQosSai::testQosSaiXonHysteresis: skip: diff --git a/tests/qos/qos_sai_base.py b/tests/qos/qos_sai_base.py index 9859c4af625..3c032ae4c01 100644 --- a/tests/qos/qos_sai_base.py +++ b/tests/qos/qos_sai_base.py @@ -17,6 +17,7 @@ from tests.common.helpers.multi_thread_utils import SafeThreadPoolExecutor from tests.common.mellanox_data import is_mellanox_device as isMellanoxDevice from tests.common.cisco_data import is_cisco_device +from tests.common.dualtor.dual_tor_common import active_standby_ports # noqa F401 from tests.common.dualtor.dual_tor_utils import upper_tor_host, lower_tor_host, dualtor_ports, is_tunnel_qos_remap_enabled # noqa F401 from tests.common.dualtor.mux_simulator_control \ import toggle_all_simulator_ports, check_mux_status, validate_check_result # noqa F401 @@ -43,7 +44,7 @@ class QosBase: """ SUPPORTED_T0_TOPOS = [ "t0", "t0-56", "t0-56-po2vlan", "t0-64", "t0-116", "t0-118", "t0-35", "dualtor-56", "dualtor-64", - "dualtor-120", "dualtor", "dualtor-64-breakout", "t0-120", "t0-80", "t0-backend", + "dualtor-120", "dualtor", "dualtor-64-breakout", "dualtor-aa", "t0-120", "t0-80", "t0-backend", "t0-56-o8v48", "t0-8-lag", "t0-standalone-32", "t0-standalone-64", "t0-standalone-128", "t0-standalone-256", "t0-28", "t0-isolated-d16u16s1", "t0-isolated-d16u16s2" ] @@ -1375,7 +1376,7 @@ def updateIptables(self, duthosts, get_src_dst_asic_and_duts, swapSyncd_on_selec def stopServices( self, duthosts, get_src_dst_asic_and_duts, dut_disable_ipv6, swapSyncd_on_selected_duts, enable_container_autorestart, disable_container_autorestart, get_mux_status, # noqa F811 - tbinfo, upper_tor_host, lower_tor_host, toggle_all_simulator_ports): # noqa F811 + tbinfo, upper_tor_host, lower_tor_host, toggle_all_simulator_ports, active_standby_ports): # noqa F811 """ Stop services (lldp-syncs, lldpd, bgpd) on DUT host prior to test start @@ -1414,20 +1415,24 @@ def updateDockerService(host, docker="", action="", service=""): # noqa: F811 ) logger.info("{}ed {}".format(action, service)) - """ Stop mux container for dual ToR """ - if 'dualtor' in tbinfo['topo']['name']: + is_dualtor = 'dualtor' in tbinfo['topo']['name'] + is_dualtor_active_standby = is_dualtor and active_standby_ports + """ Stop mux container for dual ToR Active-Standby """ + if is_dualtor: + if is_dualtor_active_standby: + toggle_all_simulator_ports(LOWER_TOR, retries=3) + check_result = wait_until( + 120, 10, 10, check_mux_status, duthosts, LOWER_TOR) + validate_check_result(check_result, duthosts, get_mux_status) + file = "/usr/local/bin/write_standby.py" backup_file = "/usr/local/bin/write_standby.py.bkup" - toggle_all_simulator_ports(LOWER_TOR, retries=3) - check_result = wait_until( - 120, 10, 10, check_mux_status, duthosts, LOWER_TOR) - validate_check_result(check_result, duthosts, get_mux_status) - try: lower_tor_host.shell("ls %s" % file) lower_tor_host.shell("sudo cp {} {}".format(file, backup_file)) lower_tor_host.shell("sudo rm {}".format(file)) lower_tor_host.shell("sudo touch {}".format(file)) + lower_tor_host.shell("sudo chmod +x {}".format(file)) except Exception as e: pytest.skip('file {} not found. Exception {}'.format(file, str(e))) @@ -1450,7 +1455,7 @@ def updateDockerService(host, docker="", action="", service=""): # noqa: F811 ] feature_list = ['lldp', 'bgp', 'syncd', 'swss'] - if 'dualtor' in tbinfo['topo']['name']: + if is_dualtor: disable_container_autorestart( upper_tor_host, testcase="test_qos_sai", feature_list=feature_list) @@ -1483,7 +1488,7 @@ def updateDockerService(host, docker="", action="", service=""): # noqa: F811 dst_dut.shell("sudo config bgp start all") """ Start mux conatiner for dual ToR """ - if 'dualtor' in tbinfo['topo']['name']: + if is_dualtor: try: lower_tor_host.shell("ls %s" % backup_file) lower_tor_host.shell("sudo cp {} {}".format(backup_file, file)) @@ -1499,7 +1504,7 @@ def updateDockerService(host, docker="", action="", service=""): # noqa: F811 enable_container_autorestart(src_dut, testcase="test_qos_sai", feature_list=feature_list) if src_asic != dst_asic: enable_container_autorestart(dst_dut, testcase="test_qos_sai", feature_list=feature_list) - if 'dualtor' in tbinfo['topo']['name']: + if is_dualtor: enable_container_autorestart( upper_tor_host, testcase="test_qos_sai", feature_list=feature_list)