Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Arista] skip testing sfp interfaces on Arista-7050QX-32S-S4Q31 #10821

Merged
merged 1 commit into from
Dec 18, 2023

Conversation

byu343
Copy link
Contributor

@byu343 byu343 commented Nov 21, 2023

Description of PR

Summary:
Fixes # (issue)
This is to skip testing SFP interfaces on Arista-7050QX-32S-S4Q31. They were skipped by RJ45 setting (https://github.com/sonic-net/sonic-mgmt/blob/master/tests/platform_tests/conftest.py#L70) by the hwsku.json (https://github.com/sonic-net/sonic-buildimage/pull/15251/files#diff-d66b493f5f334902184958f8afcbc387645e4033fe147bf1c0a1ac103d643d0bL5). But for some conflicts on port index setting of different breakout modes, hwsku.json would be deleted to use port_config.ini for the correct port index (sonic-net/sonic-buildimage#17253). The change here is to skip SFP interfaces of Arista-7050QX-32S-S4Q31 in the test code.

Type of change

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

Back port request

  • 201911
  • 202012
  • 202205
  • 202305

Approach

What is the motivation for this PR?

How did you do it?

How did you verify/test it?

Any platform specific information?

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

Documentation

This is to skip testing SFP interfaces on Arista-7050QX-32S-S4Q31.
They were skipped by RJ45 setting on the hwsku.json. But for some
conflicts on port index setting of different breakout modes, hwsku.json
is deleted to use port_config.ini for the correct port index.
@byu343 byu343 requested a review from prgeor as a code owner November 21, 2023 19:12
@@ -76,6 +76,12 @@ def xcvr_skip_list(duthosts):
logging.debug(
"hwsku.json absent or port_type for interfaces not included for hwsku {}".format(hwsku))

# No hwsku.json for Arista-7050-QX-32S/Arista-7050QX-32S-S4Q31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@byu343 Why there is a change in behavior?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We decided to remove hwsku.json (in the change sonic-net/sonic-buildimage#17253) because 1) the correct port index should be 1,2,3,4 for the SFP ports under this hwsku Arista-7050-QX-32S/Arista-7050QX-32S-S4Q31; 2) but same logical ports with a different breakout mode under another hwsku have to use port index 5,5,5,5, which is in https://github.com/sonic-net/sonic-buildimage/blob/master/device/arista/x86_64-arista_7050_qx32s/platform.json#L215; 3) removing hwsku.json will fall back to use port_config.ini, where we can set the port index as 1,2,3,4 while not affecting other hwskus.

The xcvr_skip_list here was to skip SFP based on the RJ45 setting in hwsku.json, but since the hwsku.json of Arista-7050-QX-32S/Arista-7050QX-32S-S4Q31 has to be removed, we decided to add the skip for the hwskus in the test code here.

@prgeor
Copy link
Contributor

prgeor commented Dec 15, 2023

@wangxin please merge

@mihirpat1
Copy link
Contributor

@StormLiangMS , @yxieca - Can you please help in merging to 202305 and 202205 branch.
MSFT ADO - 25820111

@prgeor prgeor merged commit 1e1d0f8 into sonic-net:master Dec 18, 2023
15 checks passed
@mihirpat1
Copy link
Contributor

@StormLiangMS , @yxieca - Can you please help in merging to 202305 and 202205 branch. MSFT ADO - 25820111

@StormLiangMS, @yxieca - This PR is merged now. It will be great if you can help with the cherry-pick process.

mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Dec 20, 2023
…c-net#10821)

This is to skip testing SFP interfaces on Arista-7050QX-32S-S4Q31.
They were skipped by RJ45 setting on the hwsku.json. But for some
conflicts on port index setting of different breakout modes, hwsku.json
is deleted to use port_config.ini for the correct port index.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202305: #11105

mssonicbld pushed a commit that referenced this pull request Dec 20, 2023
This is to skip testing SFP interfaces on Arista-7050QX-32S-S4Q31.
They were skipped by RJ45 setting on the hwsku.json. But for some
conflicts on port index setting of different breakout modes, hwsku.json
is deleted to use port_config.ini for the correct port index.
mssonicbld pushed a commit to mssonicbld/sonic-mgmt that referenced this pull request Feb 1, 2024
…c-net#10821)

This is to skip testing SFP interfaces on Arista-7050QX-32S-S4Q31.
They were skipped by RJ45 setting on the hwsku.json. But for some
conflicts on port index setting of different breakout modes, hwsku.json
is deleted to use port_config.ini for the correct port index.
@mssonicbld
Copy link
Collaborator

Cherry-pick PR to 202205: #11542

mssonicbld pushed a commit that referenced this pull request Feb 1, 2024
This is to skip testing SFP interfaces on Arista-7050QX-32S-S4Q31.
They were skipped by RJ45 setting on the hwsku.json. But for some
conflicts on port index setting of different breakout modes, hwsku.json
is deleted to use port_config.ini for the correct port index.
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.

6 participants