Skip to content

Commit c5d1b53

Browse files
renukamanavalanrenukamanavalan
committed
Merge remote-tracking branch 'upstream/master' into syslog_telemetry_shared
2 parents 4d025ef + cb707b7 commit c5d1b53

File tree

22 files changed

+1008
-182
lines changed

22 files changed

+1008
-182
lines changed

‎.github/workflows/pr_cherrypick_prestep.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
pr_url=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request._links.html.href")
3434
repository=$(echo $GITHUB_CONTEXT | jq -r ".repository")
3535
labels=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.labels[].name")
36-
author=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.base.user.login")
36+
author=$(echo $GITHUB_CONTEXT | jq -r ".event.pull_request.user.login")
3737
branches=$(git branch -a --list 'origin/20????' | awk -F/ '{print$3}' | grep -E "202[0-9]{3}")
3838
if [[ $(echo $GITHUB_CONTEXT | jq -r ".event.action") == "labeled" ]];then
3939
labels=$(echo $GITHUB_CONTEXT | jq -r ".event.label.name")

‎device/barefoot/x86_64-accton_as9516_32d-r0/platform.json

+22-20
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,31 @@
133133
"psus": [
134134
{
135135
"name": "psu-1",
136-
"temperature": false
136+
"thermals": [
137+
{
138+
"name": "psu_driver-i2c-7-5a:psu1-temp1"
139+
},
140+
{
141+
"name": "psu_driver-i2c-7-5a:psu1-temp2"
142+
},
143+
{
144+
"name": "psu_driver-i2c-7-5a:psu1-temp3"
145+
}
146+
]
137147
},
138148
{
139149
"name": "psu-2",
140-
"temperature": false
150+
"thermals": [
151+
{
152+
"name": "psu_driver-i2c-7-59:psu2-temp1"
153+
},
154+
{
155+
"name": "psu_driver-i2c-7-59:psu2-temp2"
156+
},
157+
{
158+
"name": "psu_driver-i2c-7-59:psu2-temp3"
159+
}
160+
]
141161
}
142162
],
143163
"thermals": [
@@ -147,24 +167,6 @@
147167
{
148168
"name": "com_e_driver-i2c-4-33:memory-temp"
149169
},
150-
{
151-
"name": "psu_driver-i2c-7-59:psu2-temp1"
152-
},
153-
{
154-
"name": "psu_driver-i2c-7-59:psu2-temp2"
155-
},
156-
{
157-
"name": "psu_driver-i2c-7-59:psu2-temp3"
158-
},
159-
{
160-
"name": "psu_driver-i2c-7-5a:psu1-temp1"
161-
},
162-
{
163-
"name": "psu_driver-i2c-7-5a:psu1-temp2"
164-
},
165-
{
166-
"name": "psu_driver-i2c-7-5a:psu1-temp3"
167-
},
168170
{
169171
"name": "tmp75-i2c-3-48:chip-temp"
170172
},

‎device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json

+100-32
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,131 @@
99
"name": "BMC"
1010
}
1111
],
12+
"thermal_manager": false,
1213
"fans": [
1314
{
14-
"name": "counter-rotating-fan-1"
15-
},
16-
{
17-
"name": "counter-rotating-fan-2"
18-
},
19-
{
20-
"name": "counter-rotating-fan-3"
21-
},
22-
{
23-
"name": "counter-rotating-fan-4"
24-
},
25-
{
26-
"name": "counter-rotating-fan-5"
15+
"name": "counter-rotating-fan-1",
16+
"status_led": {
17+
"controllable": false
18+
},
19+
"speed": {
20+
"controllable": false
21+
}
22+
},
23+
{
24+
"name": "counter-rotating-fan-2",
25+
"status_led": {
26+
"controllable": false
27+
},
28+
"speed": {
29+
"controllable": false
30+
}
31+
},
32+
{
33+
"name": "counter-rotating-fan-3",
34+
"status_led": {
35+
"controllable": false
36+
},
37+
"speed": {
38+
"controllable": false
39+
}
40+
},
41+
{
42+
"name": "counter-rotating-fan-4",
43+
"status_led": {
44+
"controllable": false
45+
},
46+
"speed": {
47+
"controllable": false
48+
}
49+
},
50+
{
51+
"name": "counter-rotating-fan-5",
52+
"status_led": {
53+
"controllable": false
54+
},
55+
"speed": {
56+
"controllable": false
57+
}
2758
}
2859
],
2960
"fan_drawers": [
3061
{
3162
"name": "fantray-1",
63+
"status_led": {
64+
"controllable": false
65+
},
3266
"fans": [
3367
{
34-
"name": "counter-rotating-fan-1"
68+
"name": "counter-rotating-fan-1",
69+
"status_led": {
70+
"controllable": false
71+
},
72+
"speed": {
73+
"controllable": false
74+
}
3575
},
3676
{
37-
"name": "counter-rotating-fan-2"
77+
"name": "counter-rotating-fan-2",
78+
"status_led": {
79+
"controllable": false
80+
},
81+
"speed": {
82+
"controllable": false
83+
}
3884
},
3985
{
40-
"name": "counter-rotating-fan-3"
86+
"name": "counter-rotating-fan-3",
87+
"status_led": {
88+
"controllable": false
89+
},
90+
"speed": {
91+
"controllable": false
92+
}
4193
},
4294
{
43-
"name": "counter-rotating-fan-4"
95+
"name": "counter-rotating-fan-4",
96+
"status_led": {
97+
"controllable": false
98+
},
99+
"speed": {
100+
"controllable": false
101+
}
44102
},
45103
{
46-
"name": "counter-rotating-fan-5"
104+
"name": "counter-rotating-fan-5",
105+
"status_led": {
106+
"controllable": false
107+
},
108+
"speed": {
109+
"controllable": false
110+
}
47111
}
48112
]
49113
}
50114
],
51115
"psus": [
52116
{
53-
"name": "psu-1"
117+
"name": "psu-1",
118+
"thermals": [
119+
{
120+
"name": "psu_driver-i2c-7-5a:psu1-temp1"
121+
},
122+
{
123+
"name": "psu_driver-i2c-7-5a:psu1-temp2"
124+
}
125+
]
54126
},
55127
{
56-
"name": "psu-2"
128+
"name": "psu-2",
129+
"thermals": [
130+
{
131+
"name": "psu_driver-i2c-7-59:psu2-temp1"
132+
},
133+
{
134+
"name": "psu_driver-i2c-7-59:psu2-temp2"
135+
}
136+
]
57137
}
58138
],
59139
"thermals": [
@@ -63,18 +143,6 @@
63143
{
64144
"name": "com_e_driver-i2c-4-33:memory-temp"
65145
},
66-
{
67-
"name": "psu_driver-i2c-7-59:psu2-temp1"
68-
},
69-
{
70-
"name": "psu_driver-i2c-7-59:psu2-temp2"
71-
},
72-
{
73-
"name": "psu_driver-i2c-7-5a:psu1-temp1"
74-
},
75-
{
76-
"name": "psu_driver-i2c-7-5a:psu1-temp2"
77-
},
78146
{
79147
"name": "tmp75-i2c-3-48:chip-temp"
80148
},

0 commit comments

Comments
 (0)