Skip to content

Update qos test param for dualtor topology#6948

Merged
bingwang-ms merged 2 commits intosonic-net:masterfrom
bingwang-ms:qos_params_dualtor
Dec 2, 2022
Merged

Update qos test param for dualtor topology#6948
bingwang-ms merged 2 commits intosonic-net:masterfrom
bingwang-ms:qos_params_dualtor

Conversation

@bingwang-ms
Copy link
Copy Markdown
Collaborator

@bingwang-ms bingwang-ms commented Dec 2, 2022

Description of PR

Summary:
This PR is to add separated QoS params for different topologies.
The buffer pool size is different on different dualtor topologies. To support different topologies, two sets of parameters are added for topology dualtor and dualtor-56.

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205

Approach

What is the motivation for this PR?

This PR is to add separated QoS params for different topologies.

How did you do it?

Update qos.yml to add different parameters for dualtor and dualtor-56 topology.

How did you verify/test it?

Verified on both dualtor and dualtor-56 topology.

qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_1] PASSED                                                                                                                                                                                     [ 25%]
qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_2] PASSED                                                                                                                                                                                     [ 50%]
qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_3] PASSED                                                                                                                                                                                     [ 75%]
qos/test_tunnel_qos_remap.py::test_xoff_for_pcbb[pcbb_xoff_4] PASSED                                                                                                                                                                                     [100%]

Any platform specific information?

Broadcom platform specific.

Supported testbed topology if it's a new test case?

No.

Documentation

@azure-pipelines
Copy link
Copy Markdown

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing tests/qos/files/qos.yml

fix end of files.........................................................Passed
check yaml...............................................................Failed
- hook id: check-yaml
- exit code: 1

while constructing a mapping
in "tests/qos/files/qos.yml", line 3186, column 13
found duplicate key "ecn_1" with value "{}" (original value: "{}")
in "tests/qos/files/qos.yml", line 3439, column 13

To suppress this check see:
http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys
...
[truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@azure-pipelines
Copy link
Copy Markdown

The pre-commit check detected issues in the files touched by this pull request.
The detected issues may be old or new. For new issues, please try to fix them.

For old issues, it is not mandatory to fix them because they were not caused by this change. It is unfair to blame
author of this pull request. But if you can take extra effort to fix the old issues as well, that would be great!

Detailed pre-commit check results:
trim trailing whitespace.................................................Failed
- hook id: trailing-whitespace
- exit code: 1
- files were modified by this hook

Fixing tests/qos/files/qos.yml
Fixing tests/qos/test_tunnel_qos_remap.py

fix end of files.........................................................Passed
check yaml...............................................................Failed
- hook id: check-yaml
- exit code: 1

while constructing a mapping
in "tests/qos/files/qos.yml", line 3186, column 13
found duplicate key "ecn_1" with value "{}" (original value: "{}")
in "tests/qos/files/qos.yml", line 3439, column 13

To suppress this check see:
http://yaml.readthedocs.io/en/latest/api.html#duplicate-keys
...
[truncated extra lines, please run pre-commit locally to view full check results]

To run the pre-commit checks locally, you can follow below steps:

  1. Ensure that default python is python3. In sonic-mgmt docker container, default python is python2. You can run
    the check by activating the python3 virtual environment in sonic-mgmt docker container or outside of sonic-mgmt
    docker container.
  2. Ensure that the pre-commit package is installed:
sudo pip install pre-commit
  1. Go to repository root folder
  2. Install the pre-commit hooks:
pre-commit install
  1. Use pre-commit to check staged file:
pre-commit
  1. Alternatively, you can check committed files using:
pre-commit run --from-ref <commit_id> --to-ref <commit_id>

@bingwang-ms bingwang-ms merged commit 4dac61a into sonic-net:master Dec 2, 2022
wangxin pushed a commit that referenced this pull request Dec 7, 2022
* Update qos test param for dualtor topology
wangxin pushed a commit that referenced this pull request Dec 7, 2022
* Update qos test param for dualtor topology
bingwang-ms pushed a commit to bingwang-ms/sonic-mgmt that referenced this pull request Jul 27, 2023
…ic-mgmt into internal-202205

Fix merge conflicts.
- [pre-commit] Fix style issues in test scripts under `tests/acl` folder (sonic-net#6679)
- Moving check for reboot cause after interface status check (sonic-net#6721)
- Adding watchdog timeout values for Cisco 8808 Supervisor and Different LCs (sonic-net#6776)
- add Ether check in macsec_dp_poll (sonic-net#6828)
- Disable PFC watchdog in test_cpu_memory_usage_counterpoll (sonic-net#6851)
- Testcase to verify that lossless traffic is not dropped during congesion. (sonic-net#6853)
- Ignore Broadcom sai sai unbind ERR log for now (sonic-net#6539)
- [chassis][multi-asic] update the loganalyser regex for multi asic (sonic-net#6885)
- [mx] Fix test_acl failed on mx topo (sonic-net#6971) (sonic-net#6983)
- [202205][mx] Add support for mx in test_null_route_helper (sonic-net#6967) (sonic-net#6982)
- [m0][everflow] Add m0 support for everflow and refactor everflow setup_info (sonic-net#6900)
- [ACL] Add acl stress test (sonic-net#6903)
- Enhance test_tor_ecn (sonic-net#6906)
- Fix erros - Added unique IPV6 address for the missed ACL rules PR sonic-net#6390 (sonic-net#6909)
- enabled bfd tests (sonic-net#6919)
- Skip bgp speaker test on backend topo (sonic-net#6922)
- [advanced-reboot] Handle logs in tmpfs: backup two log files before reboot (sonic-net#6923)
- Fix missing definition (sonic-net#6930)
- [Mellanox] Add minimal table definition for SN2201 (sonic-net#6943)
- Update qos test param for dualtor topology (sonic-net#6948)
- fix setup for single asic lc (sonic-net#6951)
- Fix QoS sai test for running with python3 (sonic-net#6961)
- Don't fail if logrotate cron job file isn't present (sonic-net#6964)
- Disable post sanity check for vxlan test (sonic-net#6980)
- Merge branch 'azure-202205' into dev/yaqiangzhu/202205_merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants