[Arista] Add port definitions for 7060X6 HwSkus in port_utils

[Staphylo]

Description of PR

Summary: Add port definition for Arista 7060X6 HwSkus in port_utils

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?

Allow add-topo to properly generate a minigraph on these new 7060X6 HwSku
Also register these HwSku into the broadcom_<asic>_hwskus to allow some tests to pass.

How did you do it?

Added the definitions of the 7060X6 HwSkus in the port_utils.py and variables files

How did you verify/test it?

Ran t0 and t1 topologies on these HwSkus

Any platform specific information?

Specific to Arista 7060X6

[mssonicbld]

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:117:16: E111 indentation is not a multiple of 4
ansible/module_utils/port_utils.py:118:19: E111 indentation is not a multiple of 4
ansible/module_utils/port_utils.py:123:16: E111 indentation is not a multiple of 4
ansible/module_utils/port_utils.py:124:19: E111 indentation is not a multiple of 4

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

3. Go to repository root folder
4. Install the pre-commit hooks:

pre-commit install

5. Use pre-commit to check staged file:

pre-commit

6. Alternatively, you can check committed files using:

pre-commit run --from-ref <commit_id> --to-ref <commit_id>

[r12f]

I have tried the port config file and some I am hitting this issue before due to Ethernet2 key is missing in the hwsku_dict:

and the hwsku.json looks like below:

@ccroy-arista , do you mind to help see if anything is missing and related to this change? Thanks a lot!

[Staphylo]

@r12f this issue is unrelated to this change so this one should be ready to go.

You are running into the subport issue.
We actually delayed publishing our hwsku.json until the subport fix merged so you wouldn't run into this issue.
However it seems that your image has the hwsku.json change but not the subport fix.
Please make sure you have both these in your image.
sonic-net/sonic-buildimage#18499
sonic-net/sonic-swss#3161

[r12f]

Hi Samuel, is the build image change back ported to 202311?

[r12f]

after deploying this change, deploying minigraph is not failing anymore.

[r12f]

lgtm. consider approved after fixing the CI.

[Staphylo]

/azpw run Azure.sonic-mgmt

[mssonicbld]

/AzurePipelines run Azure.sonic-mgmt

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).

[Pterosaur]

@yxieca @bingwang-ms Please help to approve the request labels.

[Janetxxx]

@yxieca @bingwang-ms Please help to approve the request labels.

[mssonicbld]

Cherry-pick PR to 202405: #14345

[mssonicbld]

Cherry-pick PR to 202311: #14346