Skip to content

Commit

Permalink
Merged PR 6692224: Manual merge github 202012 to internal-202012
Browse files Browse the repository at this point in the history 
Related work items: sonic-net#10654, sonic-net#11736, sonic-net#11757, sonic-net#11772, sonic-net#11794, sonic-net#11835, sonic-net#11871, sonic-net#11896, sonic-net#11901, sonic-net#11909
  • Loading branch information
@yxieca
yxieca committed Sep 2, 2022
2 parents 8f9bb92 + c4e2c33 commit fd6b862
Show file tree
Hide file tree
Showing 43 changed files with 2,012 additions and 254 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/label.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ jobs:
label:
runs-on: ubuntu-latest
steps:
- name: approve
run: |
set -e
echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
url=$(echo $GITHUB_CONTEXT | jq -r '.event.pull_request._links.html.href')
echo PR: $url
gh pr review $url --approve
- uses: actions/labeler@main
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
12 changes: 6 additions & 6 deletions device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
50000 5m 4608 4608 33792 0 4608
100000 5m 4608 4608 49408 0 4608
50000 40m 4608 4608 36352 0 4608
100000 40m 4608 4608 54528 0 4608
50000 300m 4608 4608 55296 0 4608
100000 300m 4608 4608 92672 0 4608
50000 5m 4608 4608 160000 0 4608
100000 5m 4608 4608 160000 0 4608
50000 40m 4608 4608 160000 0 4608
100000 40m 4608 4608 160000 0 4608
50000 300m 4608 4608 160000 0 4608
100000 300m 4608 4608 160000 0 4608
12 changes: 6 additions & 6 deletions device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/pg_profile_lookup.ini
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# PG lossless profiles.
# speed cable size xon xoff threshold xon_offset
50000 5m 4608 4608 79872 0 4608
100000 5m 4608 4608 54528 0 4608
50000 40m 4608 4608 39936 0 4608
100000 40m 4608 4608 60416 0 4608
50000 300m 4608 4608 61440 0 4608
100000 300m 4608 4608 103680 0 4608
50000 5m 4608 4608 160000 0 4608
100000 5m 4608 4608 160000 0 4608
50000 40m 4608 4608 160000 0 4608
100000 40m 4608 4608 160000 0 4608
50000 300m 4608 4608 160000 0 4608
100000 300m 4608 4608 160000 0 4608
238 changes: 204 additions & 34 deletions device/dell/x86_64-dell_s6000_s1220-r0/platform.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{
"chassis": {
"name": "S6000",
"status_led": {
"controllable": true,
"colors": ["amber", "blinking amber", "green", "blinking green"]
},
"components": [
{
"name": "BIOS"
Expand All @@ -17,111 +21,277 @@
],
"fans": [
{
"name": "FanTray1-Fan1"
},
{
"name": "FanTray1-Fan2"
},
{
"name": "FanTray2-Fan1"
},
{
"name": "FanTray2-Fan2"
},
{
"name": "FanTray3-Fan1"
},
{
"name": "FanTray3-Fan2"
"name": "FanTray1-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray1-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray2-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray2-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray3-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray3-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
],
"fan_drawers":[
{
"name": "FanTray1",
"status_led": {
"controllable": true,
"colors": ["amber", "green", "off"]
},
"fans": [
{
"name": "FanTray1-Fan1"
"name": "FanTray1-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray1-Fan2"
"name": "FanTray1-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
]
},
{
"name": "FanTray2",
"status_led": {
"controllable": true,
"colors": ["amber", "green", "off"]
},
"fans": [
{
"name": "FanTray2-Fan1"
"name": "FanTray2-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray2-Fan2"
"name": "FanTray2-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
]
},
{
"name": "FanTray3",
"status_led": {
"controllable": true,
"colors": ["amber", "green", "off"]
},
"fans": [
{
"name": "FanTray3-Fan1"
"name": "FanTray3-Fan1",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
},
{
"name": "FanTray3-Fan2"
"name": "FanTray3-Fan2",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
]
}
],
"psus": [
{
"name": "PSU1",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU1 Fan"
"name": "PSU1 Fan",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
],
"thermals": [
{
"name": "PSU1-Sensor 1"
"name": "PSU1-Sensor 1",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "PSU1-Sensor 2"
"name": "PSU1-Sensor 2",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
}
]
},
{
"name": "PSU2",
"status_led": {
"controllable": false
},
"fans": [
{
"name": "PSU2 Fan"
"name": "PSU2 Fan",
"speed": {
"controllable": true,
"minimum": 40
},
"status_led": {
"available": false
}
}
],
"thermals": [
{
"name": "PSU2-Sensor 1"
"name": "PSU2-Sensor 1",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "PSU2-Sensor 2"
"name": "PSU2-Sensor 2",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
}
]
}
],
"thermals": [
{
"name": "ASIC On-board"
"name": "ASIC On-board",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "NIC"
"name": "NIC",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "System Front"
"name": "System Front",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "DIMM"
"name": "DIMM",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "CPU Core 0"
"name": "CPU Core 0",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
},
{
"name": "CPU Core 1"
"name": "CPU Core 1",
"controllable": false,
"low-crit-threshold": false,
"high-crit-threshold": false,
"minimum-recorded": false,
"maximum-recorded": false
}
],
"modules": [],
Expand Down
Loading

0 comments on commit fd6b862

Please sign in to comment.