qos-sai:dwrr:cisco-8000:Handle non-multiasic part as well for the dshell-script change. #16315

rraghav-cisco · 2025-01-03T01:14:29Z

Description of PR

Summary:
Fixes # 16314

Type of change

Bug fix
Testbed and Framework(new/improvement)
Test case(new/improvement)

Back port request

Approach

What is the motivation for this PR?

The recent commit for dwrr works for multi-asic only. This PR handles the single asic platforms.

How did you do it?

Making sure to use the correct container to use for single asic tests.

How did you verify/test it?

Not done yet. @kevinskwang , @yejianquan : Can you pls try this out ? I will try it when I get the testbed access.

Any platform specific information?

For cisco-8000 only.

mssonicbld · 2025-01-03T01:14:31Z

/azp run

azure-pipelines · 2025-01-03T01:14:43Z

Azure Pipelines successfully started running 1 pipeline(s).

sdszhang · 2025-01-03T23:59:17Z

@rraghav-cisco it fails on t1 tesbed. Can you test it locally in your t0/t1 testbed?

        if (res.is_failed or 'exception' in res) and not module_ignore_errors:
>           raise RunAnsibleModuleFail("run module {} failed".format(self.module_name), res)
E           tests.common.errors.RunAnsibleModuleFail: run module shell failed, Ansible Results =>
E           failed = True
E           changed = True
E           end = 2025-01-03 04:12:02.327366
E           cmd = /root/env-python3/bin/ptf --test-dir saitests/py3 sai_qos_tests.WRRtest --platform-dir ptftests --qlen=10000 --platform remote -t 'router_mac='"'"'F8:E5:7E:5A:AA:64'"'"';src_server='"'"'10.150.22.128:9092'"'"';port_map_file='"'"'/root/ptf_test_port_map.json'"'"';sonic_asic_type='"'"'cisco-8000'"'"';sonic_version='"'"'20240510.test'"'"';src_dut_index=0;src_asic_index=0;dst_dut_index=0;dst_asic_index=0;dut_username='"'"'admin'"'"';dut_password='"'"'AzUrES0N1cR0cks!'"'"';platform_asic='"'"'cisco-8000'"'"';dst_port_id=16;dst_port_ip='"'"'10.0.0.9'"'"';dst_port_vlan=None;dst_port_2_id=20;dst_port_2_ip='"'"'10.0.0.13'"'"';dst_port_2_vlan=None;dst_port_3_id=34;dst_port_3_ip='"'"'10.0.0.33'"'"';dst_port_3_vlan=None;src_port_id=4;src_port_ip='"'"'10.0.0.5'"'"';src_port_vlan=None;dst_sys_ports={};uplink_port_ids=[0, 4, 16, 20];uplink_port_ips=['"'"'10.0.0.1'"'"', '"'"'10.0.0.5'"'"', '"'"'10.0.0.9'"'"', '"'"'10.0.0.13'"'"'];uplink_port_names=['"'"'Ethernet0'"'"', '"'"'Ethernet16'"'"', '"'"'Ethernet64'"'"', '"'"'Ethernet80'"'"'];downlink_port_ids=[34, 36, 37, 38, 39, 42, 44, 45, 46, 47, 50, 52, 53, 54, 55, 58, 60, 61, 62, 63];downlink_port_ips=['"'"'10.0.0.33'"'"', '"'"'10.0.0.35'"'"', '"'"'10.0.0.37'"'"', '"'"'10.0.0.39'"'"', '"'"'10.0.0.41'"'"', '"'"'10.0.0.43'"'"', '"'"'10.0.0.45'"'"', '"'"'10.0.0.47'"'"', '"'"'10.0.0.49'"'"', '"'"'10.0.0.51'"'"', '"'"'10.0.0.53'"'"', '"'"'10.0.0.55'"'"', '"'"'10.0.0.57'"'"', '"'"'10.0.0.59'"'"', '"'"'10.0.0.61'"'"', '"'"'10.0.0.63'"'"', '"'"'10.0.0.65'"'"', '"'"'10.0.0.67'"'"', '"'"'10.0.0.69'"'"', '"'"'10.0.0.71'"'"'];downlink_port_names=['"'"'Ethernet136'"'"', '"'"'Ethernet144'"'"', '"'"'Ethernet148'"'"', '"'"'Ethernet152'"'"', '"'"'Ethernet156'"'"', '"'"'Ethernet168'"'"', '"'"'Ethernet176'"'"', '"'"'Ethernet180'"'"', '"'"'Ethernet184'"'"', '"'"'Ethernet188'"'"', '"'"'Ethernet200'"'"', '"'"'Ethernet208'"'"', '"'"'Ethernet212'"'"', '"'"'Ethernet216'"'"', '"'"'Ethernet220'"'"', '"'"'Ethernet232'"'"', '"'"'Ethernet240'"'"', '"'"'Ethernet244'"'"', '"'"'Ethernet248'"'"', '"'"'Ethernet252'"'"'];testPortIds={0: {0: [0, 4, 16, 20, 34, 36, 37, 38, 39, 42, 44, 45, 46, 47, 50, 52, 53, 54, 55, 58, 60, 61, 62, 63]}};testPortIps={0: {0: {34: {'"'"'peer_addr'"'"': '"'"'10.0.0.33'"'"'}, 0: {'"'"'peer_addr'"'"': '"'"'10.0.0.1'"'"'}, 36: {'"'"'peer_addr'"'"': '"'"'10.0.0.35'"'"'}, 37: {'"'"'peer_addr'"'"': '"'"'10.0.0.37'"'"'}, 4: {'"'"'peer_addr'"'"': '"'"'10.0.0.5'"'"'}, 38: {'"'"'peer_addr'"'"': '"'"'10.0.0.39'"'"'}, 39: {'"'"'peer_addr'"'"': '"'"'10.0.0.41'"'"'}, 16: {'"'"'peer_addr'"'"': '"'"'10.0.0.9'"'"'}, 42: {'"'"'peer_addr'"'"': '"'"'10.0.0.43'"'"'}, 44: {'"'"'peer_addr'"'"': '"'"'10.0.0.45'"'"'}, 20: {'"'"'peer_addr'"'"': '"'"'10.0.0.13'"'"'}, 45: {'"'"'peer_addr'"'"': '"'"'10.0.0.47'"'"'}, 46: {'"'"'peer_addr'"'"': '"'"'10.0.0.49'"'"'}, 47: {'"'"'peer_addr'"'"': '"'"'10.0.0.51'"'"'}, 50: {'"'"'peer_addr'"'"': '"'"'10.0.0.53'"'"'}, 52: {'"'"'peer_addr'"'"': '"'"'10.0.0.55'"'"'}, 53: {'"'"'peer_addr'"'"': '"'"'10.0.0.57'"'"'}, 54: {'"'"'peer_addr'"'"': '"'"'10.0.0.59'"'"'}, 55: {'"'"'peer_addr'"'"': '"'"'10.0.0.61'"'"'}, 58: {'"'"'peer_addr'"'"': '"'"'10.0.0.63'"'"'}, 60: {'"'"'peer_addr'"'"': '"'"'10.0.0.65'"'"'}, 61: {'"'"'peer_addr'"'"': '"'"'10.0.0.67'"'"'}, 62: {'"'"'peer_addr'"'"': '"'"'10.0.0.69'"'"'}, 63: {'"'"'peer_addr'"'"': '"'"'10.0.0.71'"'"'}}}};testbed_type='"'"'t1-64-lag'"'"';ecn=1;limit=80;lossless_weight=30;lossy_weight=8;q0_num_of_pkts=40;q1_num_of_pkts=40;q2_num_of_pkts=40;q3_num_of_pkts=150;q4_num_of_pkts=150;q5_num_of_pkts=40;q6_num_of_pkts=40;pkts_num_leak_out=0;hwsku='"'"'Cisco-8102-C64'"'"';topo='"'"'t1-64-lag'"'"';qos_remap_enable=True' --debug info --log-file /tmp/sai_qos_tests.WRRtest.log --socket-recv-size 16384 --test-case-timeout 1200  --disable-ipv6 --disable-vxlan --disable-geneve --disable-erspan --disable-mpls --disable-nvgre
E           delta = 0:00:20.568197
E           rc = 1
E           invocation = {'module_args': {'creates': None, 'executable': None, 'chdir': '/root', 'strip_empty_ends': True, '_raw_params': '/root/env-python3/bin/ptf --test-dir saitests/py3 sai_qos_tests.WRRtest --platform-dir ptftests --qlen=10000 --platform remote -t \'router_mac=\'"\'"\'F8:E5:7E:5A:AA:64\'"\'"\';src_server=\'"\'"\'10.150.22.128:9092\'"\'"\';port_map_file=\'"\'"\'/root/ptf_test_port_map.json\'"\'"\';sonic_asic_type=\'"\'"\'cisco-8000\'"\'"\';sonic_version=\'"\'"\'20240510.test\'"\'"\';src_dut_index=0;src_asic_index=0;dst_dut_index=0;dst_asic_index=0;dut_username=\'"\'"\'admin\'"\'"\';dut_password=\'"\'"\'AzUrES0N1cR0cks!\'"\'"\';platform_asic=\'"\'"\'cisco-8000\'"\'"\';dst_port_id=16;dst_port_ip=\'"\'"\'10.0.0.9\'"\'"\';dst_port_vlan=None;dst_port_2_id=20;dst_port_2_ip=\'"\'"\'10.0.0.13\'"\'"\';dst_port_2_vlan=None;dst_port_3_id=34;dst_port_3_ip=\'"\'"\'10.0.0.33\'"\'"\';dst_port_3_vlan=None;src_port_id=4;src_port_ip=\'"\'"\'10.0.0.5\'"\'"\';src_port_vlan=None;dst_sys_ports={};uplink_port_ids=[0, 4, 16, 20];uplink_port_ips=[\'"\'"\'10.0.0.1\'"\'"\', \'"\'"\'10.0.0.5\'"\'"\', \'"\'"\'10.0.0.9\'"\'"\', \'"\'"\'10.0.0.13\'"\'"\'];uplink_port_names=[\'"\'"\'Ethernet0\'"\'"\', \'"\'"\'Ethernet16\'"\'"\', \'"\'"\'Ethernet64\'"\'"\', \'"\'"\'Ethernet80\'"\'"\'];downlink_port_ids=[34, 36, 37, 38, 39, 42, 44, 45, 46, 47, 50, 52, 53, 54, 55, 58, 60, 61, 62, 63];downlink_port_ips=[\'"\'"\'10.0.0.33\'"\'"\', \'"\'"\'10.0.0.35\'"\'"\', \'"\'"\'10.0.0.37\'"\'"\', \'"\'"\'10.0.0.39\'"\'"\', \'"\'"\'10.0.0.41\'"\'"\', \'"\'"\'10.0.0.43\'"\'"\', \'"\'"\'10.0.0.45\'"\'"\', \'"\'"\'10.0.0.47\'"\'"\', \'"\'"\'10.0.0.49\'"\'"\', \'"\'"\'10.0.0.51\'"\'"\', \'"\'"\'10.0.0.53\'"\'"\', \'"\'"\'10.0.0.55\'"\'"\', \'"\'"\'10.0.0.57\'"\'"\', \'"\'"\'10.0.0.59\'"\'"\', \'"\'"\'10.0.0.61\'"\'"\', \'"\'"\'10.0.0.63\'"\'"\', \'"\'"\'10.0.0.65\'"\'"\', \'"\'"\'10.0.0.67\'"\'"\', \'"\'"\'10.0.0.69\'"\'"\', \'"\'"\'10.0.0.71\'"\'"\'];downlink_port_names=[\'"\'"\'Ethernet136\'"\'"\', \'"\'"\'Ethernet144\'"\'"\', \'"\'"\'Ethernet148\'"\'"\', \'"\'"\'Ethernet152\'"\'"\', \'"\'"\'Ethernet156\'"\'"\', \'"\'"\'Ethernet168\'"\'"\', \'"\'"\'Ethernet176\'"\'"\', \'"\'"\'Ethernet180\'"\'"\', \'"\'"\'Ethernet184\'"\'"\', \'"\'"\'Ethernet188\'"\'"\', \'"\'"\'Ethernet200\'"\'"\', \'"\'"\'Ethernet208\'"\'"\', \'"\'"\'Ethernet212\'"\'"\', \'"\'"\'Ethernet216\'"\'"\', \'"\'"\'Ethernet220\'"\'"\', \'"\'"\'Ethernet232\'"\'"\', \'"\'"\'Ethernet240\'"\'"\', \'"\'"\'Ethernet244\'"\'"\', \'"\'"\'Ethernet248\'"\'"\', \'"\'"\'Ethernet252\'"\'"\'];testPortIds={0: {0: [0, 4, 16, 20, 34, 36, 37, 38, 39, 42, 44, 45, 46, 47, 50, 52, 53, 54, 55, 58, 60, 61, 62, 63]}};testPortIps={0: {0: {34: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.33\'"\'"\'}, 0: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.1\'"\'"\'}, 36: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.35\'"\'"\'}, 37: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.37\'"\'"\'}, 4: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.5\'"\'"\'}, 38: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.39\'"\'"\'}, 39: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.41\'"\'"\'}, 16: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.9\'"\'"\'}, 42: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.43\'"\'"\'}, 44: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.45\'"\'"\'}, 20: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.13\'"\'"\'}, 45: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.47\'"\'"\'}, 46: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.49\'"\'"\'}, 47: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.51\'"\'"\'}, 50: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.53\'"\'"\'}, 52: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.55\'"\'"\'}, 53: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.57\'"\'"\'}, 54: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.59\'"\'"\'}, 55: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.61\'"\'"\'}, 58: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.63\'"\'"\'}, 60: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.65\'"\'"\'}, 61: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.67\'"\'"\'}, 62: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.69\'"\'"\'}, 63: {\'"\'"\'peer_addr\'"\'"\': \'"\'"\'10.0.0.71\'"\'"\'}}}};testbed_type=\'"\'"\'t1-64-lag\'"\'"\';ecn=1;limit=80;lossless_weight=30;lossy_weight=8;q0_num_of_pkts=40;q1_num_of_pkts=40;q2_num_of_pkts=40;q3_num_of_pkts=150;q4_num_of_pkts=150;q5_num_of_pkts=40;q6_num_of_pkts=40;pkts_num_leak_out=0;hwsku=\'"\'"\'Cisco-8102-C64\'"\'"\';topo=\'"\'"\'t1-64-lag\'"\'"\';qos_remap_enable=True\' --debug info --log-file /tmp/sai_qos_tests.WRRtest.log --socket-recv-size 16384 --test-case-timeout 1200  --disable-ipv6 --disable-vxlan --disable-geneve --disable-erspan --disable-mpls --disable-nvgre', 'removes': None, 'argv': None, 'warn': False, '_uses_shell': True, 'stdin_add_newline': True, 'stdin': None}}
E           start = 2025-01-03 04:11:41.759169
E           msg = non-zero return code
E           _ansible_no_log = None
E           stdout =
E           Using packet manipulation module: ptf.packet_scapy
E           dst_port_id: 16, src_port_id: 4 qos_remap_enable: 1
E           dst_port_mac: 2a:e5:22:e3:00:10, src_port_mac: 1a:da:14:f0:40:04, src_port_ip: 10.0.0.5, dst_port_ip: 10.0.0.9
E           DST port counters: 
E           
E           ******************************************
E           ATTENTION: SOME TESTS DID NOT PASS!!!
E           
E           The following tests failed:
E           WRRtest
E           
E           ******************************************stderr =
E           /root/env-python3/lib/python3.7/site-packages/scapy/config.py:542: CryptographyDeprecationWarning: Python 3.7 is no longer supported by the Python core team and support for it is deprecated in cryptography. A future release of cryptography will remove support for Python 3.7.
E             import cryptography
E           /root/env-python3/lib/python3.7/site-packages/scapy/layers/ipsec.py:512: CryptographyDeprecationWarning: TripleDES has been moved to cryptography.hazmat.decrepit.ciphers.algorithms.TripleDES and will be removed from cryptography.hazmat.primitives.ciphers.algorithms in 48.0.0.
E             cipher=algorithms.TripleDES,
E           /root/env-python3/lib/python3.7/site-packages/scapy/layers/ipsec.py:516: CryptographyDeprecationWarning: TripleDES has been moved to cryptography.hazmat.decrepit.ciphers.algorithms.TripleDES and will be removed from cryptography.hazmat.primitives.ciphers.algorithms in 48.0.0.
E             cipher=algorithms.TripleDES,
E           sai_qos_tests.WRRtest ... dst_port_id: 16, src_port_id: 4, src_port_vlan: None
E           actual dst_port_id: 16
E           fill_leakout_plus_one: Success, sent 8 packets, queue occupancy bytes rose from 0 to 1524
E           fill_leakout_plus_one: Success, sent 2 packets, queue occupancy bytes rose from 0 to 1524
E           fill_leakout_plus_one: Success, sent 5 packets, queue occupancy bytes rose from 0 to 1524
E           fill_leakout_plus_one: Success, sent 3 packets, queue occupancy bytes rose from 0 to 1524
E           fill_leakout_plus_one: Success, sent 2 packets, queue occupancy bytes rose from 0 to 1524
E           Difference for each dscp: 
E           []
E           [44, 43, 0, 157, 151, 41, 0, 1]
E           [420, 0]
E           FAIL
E           
E           ======================================================================
E           FAIL: sai_qos_tests.WRRtest
E           ----------------------------------------------------------------------
E           Traceback (most recent call last):
E             File "saitests/py3/sai_qos_tests.py", line 3916, in runTest
E               assert (q_cnt_sum == total_pkts)
E           AssertionError
E           
E           ----------------------------------------------------------------------
E           Ran 1 test in 19.134s
E           
E           FAILED (failures=1)

complex_args = {'chdir': '/root'}
filename   = '/var/src/sonic-mgmt_xxxx8102_646f1404735219c3e54440da/tests/ptf_runner.py'
function_name = 'ptf_runner'
index      = 0
line_number = 123
lines      = ['        result = host.shell(cmd, chdir="/root", module_ignore_errors=module_ignore_errors, module_async=async_mode)\n']
DEBUG:tests.conftest:[log_custom_msg] item: <Function testQosSaiFullMeshTrafficSanity[multi_dut_shortlink_to_longlink-None]>
DEBUG:tests.conftest:append custom_msg: {'dut_check_result': {'config_db_check_pass': False, 'core_dump_check_pass': True}}
INFO:root:Can not get Allure report URL. Please check logs
module_args = ['/root/env-python3/bin/ptf --test-dir saitests/py3 sai_qos_tests.WRRtest --platform-dir ptftests --qlen=10000 --platf...st-case-timeout 1200  --disable-ipv6 --disable-vxlan --disable-geneve --disable-erspan --disable-mpls --disable-nvgre']
module_async = False
module_ignore_errors = False
previous_frame = <frame at 0x39d19d0, file '/var/src/sonic-mgmt_xxxx8102-1_646f1404735219c3e54440da/tests/ptf_runner.py', line 138, code ptf_runner>
res        = {'failed': True, 'changed': True, 'end': '2025-01-03 04:12:02.327366', 'stdout': 'Using packet manipulation module: pt...---------------------------------------', 'Ran 1 test in 19.134s', '', 'FAILED (failures=1)'], '_ansible_no_log': None}
self       = <tests.common.devices.ptf.PTFHost object at 0x7f8bbd21ebb0>
verbose    = True

sdszhang · 2025-01-05T23:05:08Z

@rraghav-cisco the dwrr test on this testbed was constantly passing.

rraghav-cisco · 2025-01-06T04:26:46Z

@sdszhang , Understood.. We are able to recreate the problem internally. Pls file a JIRA to track this. Thanks.

mssonicbld · 2025-01-06T20:07:56Z

/azp run

azure-pipelines · 2025-01-06T20:08:09Z

Azure Pipelines successfully started running 1 pipeline(s).

rraghav-cisco · 2025-01-06T21:33:30Z

@sdszhang : I have updated the PR for single and mAsic conditions. Pls check.
T1 results:

=========================================================================================================== PASSES ===========================================================================================================
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-1-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-2-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-3-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-4-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-5-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-6-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-7-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-8-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-9-10] _________________________________________________________________________________________
________________________________________________________________________________________ TestQosSai.testQosSaiDwrr[single_asic-10-10] ________________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-1-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-2-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-3-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-4-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-5-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-6-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-7-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-8-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-9-10] ___________________________________________________________________________________
__________________________________________________________________________________ TestQosSai.testQosSaiDwrrWeightChange[single_asic-10-10] __________________________________________________________________________________
---------------------------------------------------------------- generated xml file: /data/tests/logs/qos/test_qos_sai.py::TestQosSai_2025-01-06-20-50-03.xml ----------------------------------------------------------------
--------------------------------------------------------------------------------------------------- live log sessionfinish ---------------------------------------------------------------------------------------------------
21:10:32 __init__.pytest_terminal_summary         L0067 INFO   | Can not get Allure report URL. Please check logs
================================================================================================== short test summary info ===================================================================================================
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-1-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-2-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-3-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-4-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-5-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-6-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-7-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-8-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-9-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrr[single_asic-10-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-1-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-2-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-3-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-4-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-5-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-6-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-7-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-8-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-9-10]
PASSED qos/test_qos_sai.py::TestQosSai::testQosSaiDwrrWeightChange[single_asic-10-10]
SKIPPED [10] qos/test_qos_sai.py:1541: Did not find any frontend node that is multi-asic - so can't run single_dut_multi_asic tests
SKIPPED [10] qos/test_qos_sai.py:2091: Did not find any frontend node that is multi-asic - so can't run single_dut_multi_asic tests
SKIPPED [30] qos/test_qos_sai.py:1541: multi-dut is not supported on T1 topologies
SKIPPED [30] qos/test_qos_sai.py:2091: multi-dut is not supported on T1 topologies
========================================================================== 20 passed, 80 skipped, 2250 deselected, 1 warning in 1228.34s (0:20:28) ===========================================================================
DEBUG:tests.conftest:[log_custom_msg] item: <Function testQosSaiDwrrWeightChange[multi_dut_shortlink_to_longlink-10-10]>
INFO:root:Can not get Allure report URL. Please check logs
sonic@nonprod-sonic-mgmt-202405:/data/tests$

sdszhang · 2025-01-06T23:48:51Z

tests/saitests/py3/sai_qos_tests.py

-            if err != "" and out == "":
-                raise RuntimeError("cmd({}) might have failed in the DUT. Error:{}".format(cmd, err))
+            if err and out == []:
+                if "Invalid value for " in " ".join(err):


Instead of using fallback mechanism, can you check for the hwsku? you may need to add a function is_hwsku_multi_asic() for this.

mssonicbld · 2025-01-07T06:14:15Z

/azp run

azure-pipelines · 2025-01-07T06:14:27Z

Azure Pipelines successfully started running 1 pipeline(s).

XuChen-MSFT · 2025-01-08T06:49:38Z

tests/qos/qos_sai_base.py

        dut.docker_copy_to_all_asics(
-            container_name=f"syncd{asic}",
+            container_name=dest,


Function copy_and_run_set_cir_script_cisco_8000() just upload dshell script to dut, not really run this script. why do we call it copy_and_run__ ?

Why is asic value not 'none' on single asic platforms? If the value is none, would it also solve the issue?

Why is asic value not 'none' on single asic platforms? If the value is none, would it also solve the issue?

@yxieca : Yes, it was "0" for single-asic. That is why the original code failed. If it were "None" the original code would have worked.

XuChen-MSFT · 2025-01-08T06:51:32Z

tests/saitests/py3/sai_qos_tests.py

+                "show platform summary | egrep 'ASIC Count' | awk -F: '{print $2}'")
+            cmd_opt = "-n asic{}".format(self.test_params['dst_asic_index'])
+            if out[0].strip() == "1":
+                cmd_opt = ""


we set scheduler to 5Gpps during the wrr test, but why don't we revert scheduler to default value after test complete?

@XuChen-MSFT : That was an artifact from earlier logic. Earlier this function used to copy and run, but now only copy. The run is done in the ptf code.

@XuChen-MSFT : Its not needed, since tx_enable is taking care of that part. It resets the scheduler as well.

can you update the function name of "copy_and_run_set_cir_script_cisco_8000()" to reflect its real behaviors

@XuChen-MSFT this is updated now.

sdszhang

LGTM

mssonicbld · 2025-01-09T15:04:54Z

/azp run

azure-pipelines · 2025-01-09T15:05:07Z

Azure Pipelines successfully started running 1 pipeline(s).

XuChen-MSFT

looks good to me

mssonicbld · 2025-01-13T03:53:52Z

@rraghav-cisco PR conflicts with 202411 branch

rraghav-cisco · 2025-01-13T04:57:43Z

@mssonicbld : This PR is incorporated into the 202405 PR:#16199

Handle non-multiasic part as well.

bbed02b

rraghav-cisco mentioned this pull request Jan 3, 2025

[Bug]: dwrr failed on T0/T1 cisco platform. #16314

Closed

sdszhang mentioned this pull request Jan 3, 2025

Porting 15718 to 202405: Adding a fixture to set scheduler to slower speeds and revert it back. #16199

Merged

8 tasks

Change the PTF code to handle single or multi asic as well.

d2d8f5f

sdszhang reviewed Jan 6, 2025

View reviewed changes

Modified the logic to find if it is a single or multi asic.

d4a4c79

sdszhang added the Request for 202411 branch label Jan 7, 2025

XuChen-MSFT reviewed Jan 8, 2025

View reviewed changes

sdszhang approved these changes Jan 9, 2025

View reviewed changes

Change the name of the function, remove '_and_run' part.

fa3a6dc

XuChen-MSFT approved these changes Jan 13, 2025

View reviewed changes

yejianquan merged commit 6080489 into sonic-net:master Jan 13, 2025
20 checks passed

yejianquan added the Approved for 202411 branch label Jan 13, 2025

mssonicbld added the Cherry Pick Conflict_202411 label Jan 13, 2025

XuChen-MSFT mentioned this pull request Jan 21, 2025

Examine the tx counters in WRRtest instead of counting what arrives #15353

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qos-sai:dwrr:cisco-8000:Handle non-multiasic part as well for the dshell-script change. #16315

qos-sai:dwrr:cisco-8000:Handle non-multiasic part as well for the dshell-script change. #16315

rraghav-cisco commented Jan 3, 2025

mssonicbld commented Jan 3, 2025

azure-pipelines bot commented Jan 3, 2025

sdszhang commented Jan 3, 2025

sdszhang commented Jan 5, 2025

rraghav-cisco commented Jan 6, 2025

mssonicbld commented Jan 6, 2025

azure-pipelines bot commented Jan 6, 2025

rraghav-cisco commented Jan 6, 2025

sdszhang Jan 6, 2025

mssonicbld commented Jan 7, 2025

azure-pipelines bot commented Jan 7, 2025

XuChen-MSFT Jan 8, 2025

yxieca Jan 8, 2025

rraghav-cisco Jan 8, 2025

XuChen-MSFT Jan 8, 2025

rraghav-cisco Jan 8, 2025 •

edited

Loading

rraghav-cisco Jan 8, 2025

XuChen-MSFT Jan 9, 2025

sdszhang Jan 10, 2025

sdszhang left a comment

mssonicbld commented Jan 9, 2025

azure-pipelines bot commented Jan 9, 2025

XuChen-MSFT left a comment

mssonicbld commented Jan 13, 2025

rraghav-cisco commented Jan 13, 2025

qos-sai:dwrr:cisco-8000:Handle non-multiasic part as well for the dshell-script change. #16315

qos-sai:dwrr:cisco-8000:Handle non-multiasic part as well for the dshell-script change. #16315

Conversation

rraghav-cisco commented Jan 3, 2025

Description of PR

Type of change

Back port request

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

mssonicbld commented Jan 3, 2025

azure-pipelines bot commented Jan 3, 2025

sdszhang commented Jan 3, 2025

sdszhang commented Jan 5, 2025

rraghav-cisco commented Jan 6, 2025

mssonicbld commented Jan 6, 2025

azure-pipelines bot commented Jan 6, 2025

rraghav-cisco commented Jan 6, 2025

Choose a reason for hiding this comment

mssonicbld commented Jan 7, 2025

azure-pipelines bot commented Jan 7, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rraghav-cisco Jan 8, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sdszhang left a comment

Choose a reason for hiding this comment

mssonicbld commented Jan 9, 2025

azure-pipelines bot commented Jan 9, 2025

XuChen-MSFT left a comment

Choose a reason for hiding this comment

mssonicbld commented Jan 13, 2025

rraghav-cisco commented Jan 13, 2025

rraghav-cisco Jan 8, 2025 •

edited

Loading