Skip to content

Revert "Add IPv6 TC to queue mapping test #10941" from master#12980

Merged
yxieca merged 3 commits intosonic-net:masterfrom
vivekverma-arista:revert-ipv6-testQosSaiDscpQueueMapping-master
May 28, 2024
Merged

Revert "Add IPv6 TC to queue mapping test #10941" from master#12980
yxieca merged 3 commits intosonic-net:masterfrom
vivekverma-arista:revert-ipv6-testQosSaiDscpQueueMapping-master

Conversation

@vivekverma-arista
Copy link
Contributor

Description of PR

Summary:
Fixes #126

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205
  • 202305
  • 202311

Approach

What is the motivation for this PR?

The new test is a poorly written IPV6 variant of testQosSaiDscpQueueMapping. It is expected to fail across all platforms/topolgies because qos/test_qos_sai.py cannot support IPV6 variant of any of it's testcase because IPV6 is disabled on the DUT by qos_sai_base.py: https://github.com/sonic-net/sonic-mgmt/blob/master/tests/qos/qos_sai_base.py#L1811-L1826 Also the changes made for this test touch class scoped fixtures which causes all the other testcases to error out as well.

How did you do it?

Revert #10941 as well as the following fixes that were made to get around the issue

  1. Fix qos/test_qos_sai.py #12334
  2. Skip IPV6 variant of testQosSaiDscpQueueMapping if IPV6 is not config… #12834

How did you verify/test it?

Verfied on T0 and T1, #126 was not seen.

Any platform specific information?

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

Documentation

@vivekverma-arista vivekverma-arista changed the title Revert PR10941 from master Revert "Add IPv6 TC to queue mapping test #10941" from master May 24, 2024
@mssonicbld
Copy link
Collaborator

The pre-commit check detected issues in the files touched by this pull request.
The pre-commit check is a mandatory check, please fix detected issues.

Detailed pre-commit check results:
trim trailing whitespace.................................................Passed
fix end of files.........................................................Passed
check yaml...........................................(no files to check)Skipped
check for added large files..............................................Passed
check python ast.........................................................Passed
flake8...................................................................Failed
- hook id: flake8
- exit code: 1

tests/common/devices/sonic.py:1971:15: E275 missing whitespace after keyword
tests/qos/qos_sai_base.py:775:9: F841 local variable 'src_port_ip' is assigned to but never used

flake8...............................................(no files to check)Skipped
check conditional mark sort..........................(no files to check)Skipped

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>

@vivekverma-arista
Copy link
Contributor Author

pull request for 202311: #12960

@yxieca yxieca merged commit 56531ac into sonic-net:master May 28, 2024
@vivekverma-arista vivekverma-arista deleted the revert-ipv6-testQosSaiDscpQueueMapping-master branch May 29, 2024 07:36
mrkcmo pushed a commit to Azarack/sonic-mgmt that referenced this pull request Jul 17, 2024
sonic-net#12980)

* Revert PR10941 from master

* Removed redundant statment and fixed other pylint errors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants