Skip to content

Add Arista-7060X6-64DE-O128S2 and Arista-7060X6-64PE-C224O8 HWSKUs#15781

Merged
StormLiangMS merged 5 commits intosonic-net:masterfrom
ccroy-arista:add-some-qs-hwskus
Dec 6, 2024
Merged

Add Arista-7060X6-64DE-O128S2 and Arista-7060X6-64PE-C224O8 HWSKUs#15781
StormLiangMS merged 5 commits intosonic-net:masterfrom
ccroy-arista:add-some-qs-hwskus

Conversation

@ccroy-arista
Copy link
Contributor

Description of PR

Summary:
Fixes # (issue)

Add the necessary support files for the Arista-7060X6-64DE-O128S2 and Arista-7060X6-64PE-C224O8 hwskus to sonic-mgmt.

Type of change

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

Back port request

  • 202012
  • 202205
  • 202305
  • 202311
  • 202405

Approach

What is the motivation for this PR?

To support sonic-mgmt testing for the Arista-7060X6-64DE-O128S2 and Arista-7060X6-64PE-C224O8 hwskus.

How did you do it?

Added the necessary ansible variable/port util definitions for these hwskus.

How did you verify/test it?

Verified the testbed can be successfully configured and the sonic-mgmt suite of tests can be run against these hwskus.

Any platform specific information?

This targets the Arista-7060X6-64DE-O128S2 and Arista-7060X6-64PE-C224O8 hwskus.

Add the Arista-7060X6-64DE-O128S2 HWSKU
to sonic-mgmt.
@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

ansible/module_utils/port_utils.py:133:51: E261 at least two spaces before inline comment

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>

@ccroy-arista ccroy-arista changed the title Add some qs hwskus Add Arista-7060X6-64DE-O128S2 and Arista-7060X6-64PE-C224O8 HWSKUs Nov 27, 2024
port_alias_to_name_map["Ethernet13/1"] = "Ethernet96"
port_alias_to_name_map["Ethernet13/5"] = "Ethernet100"
for j in range(1, 9):
port_alias_to_name_map["Ethernet14/%d" % (j)] = "Ethernet%d" % (14 * 8 + (j - 1))
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be port 15.

Copy link
Contributor

@sdszhang sdszhang Dec 1, 2024

Choose a reason for hiding this comment

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

can we replace the for loop with the following?

for i in range(1, 65, 2):
        if i in [13, 17, 45, 49]:
            for j in [1, 5]:
                port_alias_to_name_map["Ethernet%d/%d" % (i, j)] = "Ethernet%d" % ((i - 1) * 8 + j - 1)
        else:
            for j in range(1, 9):
                port_alias_to_name_map["Ethernet%d/%d" % (i, j)] = "Ethernet%d" % ((i - 1) * 8 + j - 1)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks @sdszhang, updated in latest commit.

@StormLiangMS StormLiangMS merged commit 39a5dbb into sonic-net:master Dec 6, 2024
@ccroy-arista ccroy-arista deleted the add-some-qs-hwskus branch December 6, 2024 04:33
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.

4 participants