Skip to content

Commit d28b734

Browse files
patrickmacarthurpatrickmacarthur
authored
arista: Fix device directories for Wolverine SKUs (sonic-net#21277)
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.
1 parent 9588a40 commit d28b734

File tree

107 files changed

+847
-7
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+847
-7
lines changed

‎device/arista/x86_64-arista_7800r3a_36d2_lc/platform.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chassis": {
3-
"name": "7800R3A-36DM2-LC",
3+
"name": "7800R3A-36D2-LC",
44
"components": [
55
{
66
"name": "Aboot()"

‎device/arista/x86_64-arista_7800r3a_36d2_lc/platform_components.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"chassis": {
3-
"7800R3A-36DM2-LC": {
3+
"7800R3A-36D2-LC": {
44
"component": {
55
"Aboot()": {},
66
"Scd(addr=0000:00:18.7)": {},

‎device/arista/x86_64-arista_7800r3a_36d_lc

-1
This file was deleted.

‎device/arista/x86_64-arista_7800r3a_36d_lc/Arista-7800R3A-36D-C36

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D-C36

‎device/arista/x86_64-arista_7800r3a_36d_lc/Arista-7800R3A-36D-C72

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D-C72

‎device/arista/x86_64-arista_7800r3a_36d_lc/Arista-7800R3A-36D-D36

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D-D36

‎device/arista/x86_64-arista_7800r3a_36d_lc/asic.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/asic.conf

‎device/arista/x86_64-arista_7800r3a_36d_lc/chassisdb.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/chassisdb.conf

‎device/arista/x86_64-arista_7800r3a_36d_lc/default_sku

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arista-7800R3A-36D-C72 t1

‎device/arista/x86_64-arista_7800r3a_36d_lc/media_settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/media_settings.json

‎device/arista/x86_64-arista_7800r3a_36d_lc/pcie.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/pcie.yaml

‎device/arista/x86_64-arista_7800r3a_36d_lc/platform.json

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
{
2+
"chassis": {
3+
"name": "7800R3A-36D-LC",
4+
"components": [
5+
{
6+
"name": "Aboot()"
7+
},
8+
{
9+
"name": "Scd(addr=0000:00:18.7)"
10+
},
11+
{
12+
"name": "Scd(addr=0000:08:00.0)"
13+
}
14+
],
15+
"fans": [],
16+
"fan_drawers": [],
17+
"psus": [],
18+
"thermals": [
19+
{
20+
"name": "Cpu temp sensor",
21+
"controllable": false
22+
},
23+
{
24+
"name": "Cpu SBTSI",
25+
"controllable": false
26+
}
27+
],
28+
"sfps": [
29+
{
30+
"name": "osfp1"
31+
},
32+
{
33+
"name": "osfp2"
34+
},
35+
{
36+
"name": "osfp3"
37+
},
38+
{
39+
"name": "osfp4"
40+
},
41+
{
42+
"name": "osfp5"
43+
},
44+
{
45+
"name": "osfp6"
46+
},
47+
{
48+
"name": "osfp7"
49+
},
50+
{
51+
"name": "osfp8"
52+
},
53+
{
54+
"name": "osfp9"
55+
},
56+
{
57+
"name": "osfp10"
58+
},
59+
{
60+
"name": "osfp11"
61+
},
62+
{
63+
"name": "osfp12"
64+
},
65+
{
66+
"name": "osfp13"
67+
},
68+
{
69+
"name": "osfp14"
70+
},
71+
{
72+
"name": "osfp15"
73+
},
74+
{
75+
"name": "osfp16"
76+
},
77+
{
78+
"name": "osfp17"
79+
},
80+
{
81+
"name": "osfp18"
82+
},
83+
{
84+
"name": "osfp19"
85+
},
86+
{
87+
"name": "osfp20"
88+
},
89+
{
90+
"name": "osfp21"
91+
},
92+
{
93+
"name": "osfp22"
94+
},
95+
{
96+
"name": "osfp23"
97+
},
98+
{
99+
"name": "osfp24"
100+
},
101+
{
102+
"name": "osfp25"
103+
},
104+
{
105+
"name": "osfp26"
106+
},
107+
{
108+
"name": "osfp27"
109+
},
110+
{
111+
"name": "osfp28"
112+
},
113+
{
114+
"name": "osfp29"
115+
},
116+
{
117+
"name": "osfp30"
118+
},
119+
{
120+
"name": "osfp31"
121+
},
122+
{
123+
"name": "osfp32"
124+
},
125+
{
126+
"name": "osfp33"
127+
},
128+
{
129+
"name": "osfp34"
130+
},
131+
{
132+
"name": "osfp35"
133+
},
134+
{
135+
"name": "osfp36"
136+
}
137+
]
138+
},
139+
"interfaces": {}
140+
}

‎device/arista/x86_64-arista_7800r3a_36d_lc/platform_asic

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/platform_asic

‎device/arista/x86_64-arista_7800r3a_36d_lc/platform_components.json

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"chassis": {
3+
"7800R3A-36D-LC": {
4+
"component": {
5+
"Aboot()": {},
6+
"Scd(addr=0000:00:18.7)": {},
7+
"Scd(addr=0000:08:00.0)": {}
8+
}
9+
}
10+
}
11+
}

‎device/arista/x86_64-arista_7800r3a_36d_lc/platform_env.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/platform_env.conf

‎device/arista/x86_64-arista_7800r3a_36d_lc/plugins

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/plugins

‎device/arista/x86_64-arista_7800r3a_36d_lc/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/pmon_daemon_control.json

‎device/arista/x86_64-arista_7800r3a_36d_lc/sensors.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/sensors.conf

‎device/arista/x86_64-arista_7800r3a_36d_lc/services.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/services.conf

‎device/arista/x86_64-arista_7800r3a_36d_lc/startup-tsa-tsb.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/startup-tsa-tsb.conf

‎device/arista/x86_64-arista_7800r3a_36d_lc/system_health_monitoring_config.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/system_health_monitoring_config.json

‎device/arista/x86_64-arista_7800r3a_36d_lc/thermal_policy.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_common/thermal_policy.json

‎device/arista/x86_64-arista_7800r3a_36d_lc/use_pci_id_chassis

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/use_pci_id_chassis

‎device/arista/x86_64-arista_7800r3a_36dm2_lc

-1
This file was deleted.

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/Arista-7800R3A-36DM2-C36

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36DM2-C36

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/Arista-7800R3A-36DM2-C72

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36DM2-C72

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/Arista-7800R3A-36DM2-D36

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36DM2-D36

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/asic.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/asic.conf

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/chassisdb.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/chassisdb.conf

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/default_sku

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Arista-7800R3A-36DM2-C72 t1

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/media_settings.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/media_settings.json

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/pcie.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/pcie.yaml

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/platform.json

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
{
2+
"chassis": {
3+
"name": "7800R3A-36DM2-LC",
4+
"components": [
5+
{
6+
"name": "Aboot()"
7+
},
8+
{
9+
"name": "Scd(addr=0000:00:18.7)"
10+
},
11+
{
12+
"name": "Scd(addr=0000:08:00.0)"
13+
}
14+
],
15+
"fans": [],
16+
"fan_drawers": [],
17+
"psus": [],
18+
"thermals": [
19+
{
20+
"name": "Cpu temp sensor",
21+
"controllable": false
22+
},
23+
{
24+
"name": "Cpu SBTSI",
25+
"controllable": false
26+
}
27+
],
28+
"sfps": [
29+
{
30+
"name": "osfp1"
31+
},
32+
{
33+
"name": "osfp2"
34+
},
35+
{
36+
"name": "osfp3"
37+
},
38+
{
39+
"name": "osfp4"
40+
},
41+
{
42+
"name": "osfp5"
43+
},
44+
{
45+
"name": "osfp6"
46+
},
47+
{
48+
"name": "osfp7"
49+
},
50+
{
51+
"name": "osfp8"
52+
},
53+
{
54+
"name": "osfp9"
55+
},
56+
{
57+
"name": "osfp10"
58+
},
59+
{
60+
"name": "osfp11"
61+
},
62+
{
63+
"name": "osfp12"
64+
},
65+
{
66+
"name": "osfp13"
67+
},
68+
{
69+
"name": "osfp14"
70+
},
71+
{
72+
"name": "osfp15"
73+
},
74+
{
75+
"name": "osfp16"
76+
},
77+
{
78+
"name": "osfp17"
79+
},
80+
{
81+
"name": "osfp18"
82+
},
83+
{
84+
"name": "osfp19"
85+
},
86+
{
87+
"name": "osfp20"
88+
},
89+
{
90+
"name": "osfp21"
91+
},
92+
{
93+
"name": "osfp22"
94+
},
95+
{
96+
"name": "osfp23"
97+
},
98+
{
99+
"name": "osfp24"
100+
},
101+
{
102+
"name": "osfp25"
103+
},
104+
{
105+
"name": "osfp26"
106+
},
107+
{
108+
"name": "osfp27"
109+
},
110+
{
111+
"name": "osfp28"
112+
},
113+
{
114+
"name": "osfp29"
115+
},
116+
{
117+
"name": "osfp30"
118+
},
119+
{
120+
"name": "osfp31"
121+
},
122+
{
123+
"name": "osfp32"
124+
},
125+
{
126+
"name": "osfp33"
127+
},
128+
{
129+
"name": "osfp34"
130+
},
131+
{
132+
"name": "osfp35"
133+
},
134+
{
135+
"name": "osfp36"
136+
}
137+
]
138+
},
139+
"interfaces": {}
140+
}

‎device/arista/x86_64-arista_7800r3a_36dm2_lc/platform_asic

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-arista_7800r3a_36d2_lc/platform_asic

0 commit comments

Comments
 (0)