-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
arista: Fix device directories for 7800R3A linecard SKUs (#21512)
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Each 7800R3A SKU has a different name which must be present in the platform.json file. Previously each SKU directory was symlinked together causing sonic-mgmt platform API tests to fail. By instead symlinking the common files in each directory, we can have the `platform.json` file be different per SKU as required. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it I removed the symlinks and instead created separate directories per SKU. #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> I ran sonic-mgmt tests with this change and verified that the tests now pass. #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 - [x] 202405 - [x] 202411 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
- Loading branch information
1 parent
6106bbf
commit 7b77523
Showing
107 changed files
with
847 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"chassis": { | ||
"name": "7800R3A-36DM2-LC", | ||
"name": "7800R3A-36D2-LC", | ||
"components": [ | ||
{ | ||
"name": "Aboot()" | ||
|
2 changes: 1 addition & 1 deletion
2
device/arista/x86_64-arista_7800r3a_36d2_lc/platform_components.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36d_lc/Arista-7800R3A-36D-C36
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D-C36 |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36d_lc/Arista-7800R3A-36D-C72
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D-C72 |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36d_lc/Arista-7800R3A-36D-D36
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D-D36 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/asic.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/chassisdb.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Arista-7800R3A-36D-C72 t1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/media_settings.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/pcie.yaml |
140 changes: 140 additions & 0 deletions
140
device/arista/x86_64-arista_7800r3a_36d_lc/platform.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
{ | ||
"chassis": { | ||
"name": "7800R3A-36D-LC", | ||
"components": [ | ||
{ | ||
"name": "Aboot()" | ||
}, | ||
{ | ||
"name": "Scd(addr=0000:00:18.7)" | ||
}, | ||
{ | ||
"name": "Scd(addr=0000:08:00.0)" | ||
} | ||
], | ||
"fans": [], | ||
"fan_drawers": [], | ||
"psus": [], | ||
"thermals": [ | ||
{ | ||
"name": "Cpu temp sensor", | ||
"controllable": false | ||
}, | ||
{ | ||
"name": "Cpu SBTSI", | ||
"controllable": false | ||
} | ||
], | ||
"sfps": [ | ||
{ | ||
"name": "osfp1" | ||
}, | ||
{ | ||
"name": "osfp2" | ||
}, | ||
{ | ||
"name": "osfp3" | ||
}, | ||
{ | ||
"name": "osfp4" | ||
}, | ||
{ | ||
"name": "osfp5" | ||
}, | ||
{ | ||
"name": "osfp6" | ||
}, | ||
{ | ||
"name": "osfp7" | ||
}, | ||
{ | ||
"name": "osfp8" | ||
}, | ||
{ | ||
"name": "osfp9" | ||
}, | ||
{ | ||
"name": "osfp10" | ||
}, | ||
{ | ||
"name": "osfp11" | ||
}, | ||
{ | ||
"name": "osfp12" | ||
}, | ||
{ | ||
"name": "osfp13" | ||
}, | ||
{ | ||
"name": "osfp14" | ||
}, | ||
{ | ||
"name": "osfp15" | ||
}, | ||
{ | ||
"name": "osfp16" | ||
}, | ||
{ | ||
"name": "osfp17" | ||
}, | ||
{ | ||
"name": "osfp18" | ||
}, | ||
{ | ||
"name": "osfp19" | ||
}, | ||
{ | ||
"name": "osfp20" | ||
}, | ||
{ | ||
"name": "osfp21" | ||
}, | ||
{ | ||
"name": "osfp22" | ||
}, | ||
{ | ||
"name": "osfp23" | ||
}, | ||
{ | ||
"name": "osfp24" | ||
}, | ||
{ | ||
"name": "osfp25" | ||
}, | ||
{ | ||
"name": "osfp26" | ||
}, | ||
{ | ||
"name": "osfp27" | ||
}, | ||
{ | ||
"name": "osfp28" | ||
}, | ||
{ | ||
"name": "osfp29" | ||
}, | ||
{ | ||
"name": "osfp30" | ||
}, | ||
{ | ||
"name": "osfp31" | ||
}, | ||
{ | ||
"name": "osfp32" | ||
}, | ||
{ | ||
"name": "osfp33" | ||
}, | ||
{ | ||
"name": "osfp34" | ||
}, | ||
{ | ||
"name": "osfp35" | ||
}, | ||
{ | ||
"name": "osfp36" | ||
} | ||
] | ||
}, | ||
"interfaces": {} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/platform_asic |
11 changes: 11 additions & 0 deletions
11
device/arista/x86_64-arista_7800r3a_36d_lc/platform_components.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"chassis": { | ||
"7800R3A-36D-LC": { | ||
"component": { | ||
"Aboot()": {}, | ||
"Scd(addr=0000:00:18.7)": {}, | ||
"Scd(addr=0000:08:00.0)": {} | ||
} | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/platform_env.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_common/plugins |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36d_lc/pmon_daemon_control.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_common/pmon_daemon_control.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/sensors.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/services.conf |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36d_lc/startup-tsa-tsb.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/startup-tsa-tsb.conf |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36d_lc/system_health_monitoring_config.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_common/system_health_monitoring_config.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_common/thermal_policy.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/use_pci_id_chassis |
This file was deleted.
Oops, something went wrong.
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36dm2_lc/Arista-7800R3A-36DM2-C36
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36DM2-C36 |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36dm2_lc/Arista-7800R3A-36DM2-C72
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36DM2-C72 |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36dm2_lc/Arista-7800R3A-36DM2-D36
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36DM2-D36 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/asic.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/chassisdb.conf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Arista-7800R3A-36DM2-C72 t1 |
1 change: 1 addition & 0 deletions
1
device/arista/x86_64-arista_7800r3a_36dm2_lc/media_settings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/media_settings.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/pcie.yaml |
140 changes: 140 additions & 0 deletions
140
device/arista/x86_64-arista_7800r3a_36dm2_lc/platform.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
{ | ||
"chassis": { | ||
"name": "7800R3A-36DM2-LC", | ||
"components": [ | ||
{ | ||
"name": "Aboot()" | ||
}, | ||
{ | ||
"name": "Scd(addr=0000:00:18.7)" | ||
}, | ||
{ | ||
"name": "Scd(addr=0000:08:00.0)" | ||
} | ||
], | ||
"fans": [], | ||
"fan_drawers": [], | ||
"psus": [], | ||
"thermals": [ | ||
{ | ||
"name": "Cpu temp sensor", | ||
"controllable": false | ||
}, | ||
{ | ||
"name": "Cpu SBTSI", | ||
"controllable": false | ||
} | ||
], | ||
"sfps": [ | ||
{ | ||
"name": "osfp1" | ||
}, | ||
{ | ||
"name": "osfp2" | ||
}, | ||
{ | ||
"name": "osfp3" | ||
}, | ||
{ | ||
"name": "osfp4" | ||
}, | ||
{ | ||
"name": "osfp5" | ||
}, | ||
{ | ||
"name": "osfp6" | ||
}, | ||
{ | ||
"name": "osfp7" | ||
}, | ||
{ | ||
"name": "osfp8" | ||
}, | ||
{ | ||
"name": "osfp9" | ||
}, | ||
{ | ||
"name": "osfp10" | ||
}, | ||
{ | ||
"name": "osfp11" | ||
}, | ||
{ | ||
"name": "osfp12" | ||
}, | ||
{ | ||
"name": "osfp13" | ||
}, | ||
{ | ||
"name": "osfp14" | ||
}, | ||
{ | ||
"name": "osfp15" | ||
}, | ||
{ | ||
"name": "osfp16" | ||
}, | ||
{ | ||
"name": "osfp17" | ||
}, | ||
{ | ||
"name": "osfp18" | ||
}, | ||
{ | ||
"name": "osfp19" | ||
}, | ||
{ | ||
"name": "osfp20" | ||
}, | ||
{ | ||
"name": "osfp21" | ||
}, | ||
{ | ||
"name": "osfp22" | ||
}, | ||
{ | ||
"name": "osfp23" | ||
}, | ||
{ | ||
"name": "osfp24" | ||
}, | ||
{ | ||
"name": "osfp25" | ||
}, | ||
{ | ||
"name": "osfp26" | ||
}, | ||
{ | ||
"name": "osfp27" | ||
}, | ||
{ | ||
"name": "osfp28" | ||
}, | ||
{ | ||
"name": "osfp29" | ||
}, | ||
{ | ||
"name": "osfp30" | ||
}, | ||
{ | ||
"name": "osfp31" | ||
}, | ||
{ | ||
"name": "osfp32" | ||
}, | ||
{ | ||
"name": "osfp33" | ||
}, | ||
{ | ||
"name": "osfp34" | ||
}, | ||
{ | ||
"name": "osfp35" | ||
}, | ||
{ | ||
"name": "osfp36" | ||
} | ||
] | ||
}, | ||
"interfaces": {} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../x86_64-arista_7800r3a_36d2_lc/platform_asic |
Oops, something went wrong.