Skip to content

Commit

Permalink
Merge branch 'sonic-net:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
abdosi authored Oct 18, 2024
2 parents c3446ad + 6d4bdb2 commit bb4daa4
Show file tree
Hide file tree
Showing 1,412 changed files with 180,777 additions and 69,352 deletions.
4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-image-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ jobs:
fetchDepth: 0
condition: and(succeeded(), eq(variables.SKIP_CHECKOUT, ''))
displayName: 'Checkout code'
- script: |
set -x
sudo setfacl -R -b $(Agent.BuildDirectory)
displayName: 'setfacl'
- script: |
BRANCH_NAME=$(Build.SourceBranchName)
[ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
Expand Down
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ endif
PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
PLATFORM_CHECKOUT := platform/checkout
PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
ifeq ($(SMARTSWITCH),1)
PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM)-smartswitch.ini
endif
PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
MAKE_WITH_RETRY := ./scripts/run_with_retry $(MAKE)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1926,95 +1926,3 @@ device:
DEVICE_CONFIG:
AUTOLOAD_BOARD_SETTINGS: 0
...
## Baseline
---
device:
0:
TM_THD_CONFIG:
SKIP_BUFFER_RESERVATION: 1
THRESHOLD_MODE: LOSSY_AND_LOSSLESS
...
---
device:
0:
TM_ING_THD_HEADROOM_POOL:
?
BUFFER_POOL: [[0,1]]
TM_HEADROOM_POOL_ID: [[0,3]]
:
LIMIT_CELLS: 0

TM_ING_THD_SERVICE_POOL:
?
BUFFER_POOL: [[0,1]]
TM_ING_SERVICE_POOL_ID: [[0,3]]
:
SHARED_LIMIT_CELLS: 0
SHARED_RESUME_OFFSET_CELLS: 0
COLOR_SPECIFIC_LIMITS: 0

TM_EGR_THD_SERVICE_POOL:
?
BUFFER_POOL: [[0,1]]
TM_EGR_SERVICE_POOL_ID: [[0,3]]
:
SHARED_LIMIT_CELLS: 0
SHARED_RESUME_LIMIT_CELLS: 0
COLOR_SPECIFIC_LIMITS: 0
YELLOW_SHARED_LIMIT_CELLS: 0
YELLOW_SHARED_RESUME_LIMIT_CELLS: 0
RED_SHARED_LIMIT_CELLS: 0
RED_SHARED_RESUME_LIMIT_CELLS: 0

TM_THD_MC_EGR_SERVICE_POOL:
?
BUFFER_POOL: [[0,1]]
TM_EGR_SERVICE_POOL_ID: [[0,3]]
:
SHARED_LIMIT_CELLS: 0
SHARED_RESUME_LIMIT_CELLS: 0
COLOR_SPECIFIC_LIMITS: 0
YELLOW_SHARED_LIMIT_CELLS: 0
YELLOW_SHARED_RESUME_LIMIT_CELLS: 0
RED_SHARED_LIMIT_CELLS: 0
RED_SHARED_RESUME_LIMIT_CELLS: 0

TM_ING_PORT_PRI_GRP:
?
PORT_ID: [[1, 8],
[11, 18],
[22, 29],
[33, 40],
[44, 51],
[55, 62],
[66, 73],
[77, 84],
[88, 95],
[99, 106],
[110, 117],
[121, 128],
[132, 139],
[143, 150],
[154, 161],
[165, 172],
[176, 183],
[187, 194],
[198, 205],
[209, 216],
[220, 227],
[231, 238],
[242, 249],
[253, 260],
[264, 271],
[275, 282],
[286, 293],
[297, 304],
[308, 315],
[319, 326],
[330, 337],
[341, 348]]
TM_PRI_GRP_ID: 3
:
PFC: 1
LOSSLESS: 1
...
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
{%- for port_idx in range(0, 512, 4) %}
{%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
{%- endfor %}
{%- endmacro %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{%- set default_topo = 't1' %}
{%- include 'buffers_config.j2' %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
{
"interfaces": {
"Ethernet0": {
"default_brkout_mode": "2x400G"
},
"Ethernet8": {
"default_brkout_mode": "2x400G"
},
"Ethernet16": {
"default_brkout_mode": "2x400G"
},
"Ethernet24": {
"default_brkout_mode": "2x400G"
},
"Ethernet32": {
"default_brkout_mode": "2x400G"
},
"Ethernet40": {
"default_brkout_mode": "2x400G"
},
"Ethernet48": {
"default_brkout_mode": "2x400G"
},
"Ethernet56": {
"default_brkout_mode": "2x400G"
},
"Ethernet64": {
"default_brkout_mode": "2x400G"
},
"Ethernet72": {
"default_brkout_mode": "2x400G"
},
"Ethernet80": {
"default_brkout_mode": "2x400G"
},
"Ethernet88": {
"default_brkout_mode": "2x400G"
},
"Ethernet96": {
"default_brkout_mode": "2x400G"
},
"Ethernet104": {
"default_brkout_mode": "2x400G"
},
"Ethernet112": {
"default_brkout_mode": "2x400G"
},
"Ethernet120": {
"default_brkout_mode": "2x400G"
},
"Ethernet128": {
"default_brkout_mode": "2x400G"
},
"Ethernet136": {
"default_brkout_mode": "2x400G"
},
"Ethernet144": {
"default_brkout_mode": "2x400G"
},
"Ethernet152": {
"default_brkout_mode": "2x400G"
},
"Ethernet160": {
"default_brkout_mode": "2x400G"
},
"Ethernet168": {
"default_brkout_mode": "2x400G"
},
"Ethernet176": {
"default_brkout_mode": "2x400G"
},
"Ethernet184": {
"default_brkout_mode": "2x400G"
},
"Ethernet192": {
"default_brkout_mode": "2x400G"
},
"Ethernet200": {
"default_brkout_mode": "2x400G"
},
"Ethernet208": {
"default_brkout_mode": "2x400G"
},
"Ethernet216": {
"default_brkout_mode": "2x400G"
},
"Ethernet224": {
"default_brkout_mode": "2x400G"
},
"Ethernet232": {
"default_brkout_mode": "2x400G"
},
"Ethernet240": {
"default_brkout_mode": "2x400G"
},
"Ethernet248": {
"default_brkout_mode": "2x400G"
},
"Ethernet256": {
"default_brkout_mode": "2x400G"
},
"Ethernet264": {
"default_brkout_mode": "2x400G"
},
"Ethernet272": {
"default_brkout_mode": "2x400G"
},
"Ethernet280": {
"default_brkout_mode": "2x400G"
},
"Ethernet288": {
"default_brkout_mode": "2x400G"
},
"Ethernet296": {
"default_brkout_mode": "2x400G"
},
"Ethernet304": {
"default_brkout_mode": "2x400G"
},
"Ethernet312": {
"default_brkout_mode": "2x400G"
},
"Ethernet320": {
"default_brkout_mode": "2x400G"
},
"Ethernet328": {
"default_brkout_mode": "2x400G"
},
"Ethernet336": {
"default_brkout_mode": "2x400G"
},
"Ethernet344": {
"default_brkout_mode": "2x400G"
},
"Ethernet352": {
"default_brkout_mode": "2x400G"
},
"Ethernet360": {
"default_brkout_mode": "2x400G"
},
"Ethernet368": {
"default_brkout_mode": "2x400G"
},
"Ethernet376": {
"default_brkout_mode": "2x400G"
},
"Ethernet384": {
"default_brkout_mode": "2x400G"
},
"Ethernet392": {
"default_brkout_mode": "2x400G"
},
"Ethernet400": {
"default_brkout_mode": "2x400G"
},
"Ethernet408": {
"default_brkout_mode": "2x400G"
},
"Ethernet416": {
"default_brkout_mode": "2x400G"
},
"Ethernet424": {
"default_brkout_mode": "2x400G"
},
"Ethernet432": {
"default_brkout_mode": "2x400G"
},
"Ethernet440": {
"default_brkout_mode": "2x400G"
},
"Ethernet448": {
"default_brkout_mode": "2x400G"
},
"Ethernet456": {
"default_brkout_mode": "2x400G"
},
"Ethernet464": {
"default_brkout_mode": "2x400G"
},
"Ethernet472": {
"default_brkout_mode": "2x400G"
},
"Ethernet480": {
"default_brkout_mode": "2x400G"
},
"Ethernet488": {
"default_brkout_mode": "2x400G"
},
"Ethernet496": {
"default_brkout_mode": "2x400G"
},
"Ethernet504": {
"default_brkout_mode": "2x400G"
},
"Ethernet512": {
"default_brkout_mode": "1x10G"
},
"Ethernet513": {
"default_brkout_mode": "1x10G"
}
}
}
Loading

0 comments on commit bb4daa4

Please sign in to comment.