Skip to content

Commit fa4a6d7

Browse files
Junchao-MellanoxJunchao-Mellanox
committed
Fix conflict
2 parents a0929b3 + 5356244 commit fa4a6d7

File tree

221 files changed

+5058
-429
lines changed

Some content is hidden

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

221 files changed

+5058
-429
lines changed

‎.azure-pipelines/official-build-cisco-8000.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ stages:
4444
path: s/platform/cisco-8000
4545
displayName: 'Checkout cisco-8000'
4646
- script: |
47-
cisco_ref=(cat platform/checkout/cisco-8000.ini | grep '^ref=' | cut -d= -f2)
47+
cisco_ref=$(cat platform/checkout/cisco-8000.ini | grep '^ref=' | cut -d= -f2)
4848
echo "The cisco 8000 release version is $cisco_ref"
4949
echo "##vso[task.setvariable variable=cisco.ref]$cisco_ref"
5050
displayName: 'Export cisco release version'

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,6 @@
9494
[submodule "platform/broadcom/sonic-platform-modules-nokia"]
9595
path = platform/broadcom/sonic-platform-modules-nokia
9696
url = https://github.com/nokia/sonic-platform.git
97+
[submodule "src/linkmgrd"]
98+
path = src/linkmgrd
99+
url = https://github.com/Azure/sonic-linkmgrd.git

‎Makefile.work

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# * ENABLE_ZTP: Enables zero touch provisioning.
1111
# * SHUTDOWN_BGP_ON_START: Sets admin-down state for all bgp peerings after restart.
1212
# * INCLUDE_KUBERNETES: Allows including Kubernetes
13+
# * INCLUDE_MUX: Include MUX feature/services for TOR switch.
1314
# * ENABLE_PFCWD_ON_START: Enable PFC Watchdog (PFCWD) on server-facing ports
1415
# * by default for TOR switch.
1516
# * ENABLE_SYNCD_RPC: Enables rpc-based syncd builds.
@@ -274,6 +275,7 @@ SONIC_BUILD_INSTRUCTION := make \
274275
SONIC_INCLUDE_SYSTEM_TELEMETRY=$(INCLUDE_SYSTEM_TELEMETRY) \
275276
INCLUDE_DHCP_RELAY=$(INCLUDE_DHCP_RELAY) \
276277
SONIC_INCLUDE_RESTAPI=$(INCLUDE_RESTAPI) \
278+
SONIC_INCLUDE_MUX=$(INCLUDE_MUX) \
277279
TELEMETRY_WRITABLE=$(TELEMETRY_WRITABLE) \
278280
EXTRA_DOCKER_TARGETS=$(EXTRA_DOCKER_TARGETS) \
279281
BUILD_LOG_TIMESTAMP=$(BUILD_LOG_TIMESTAMP) \

‎device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/port_config.ini

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
##
2+
## Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
3+
## Apache-2.0
4+
##
5+
## Licensed under the Apache License, Version 2.0 (the "License");
6+
## you may not use this file except in compliance with the License.
7+
## You may obtain a copy of the License at
8+
##
9+
## http://www.apache.org/licenses/LICENSE-2.0
10+
##
11+
## Unless required by applicable law or agreed to in writing, software
12+
## distributed under the License is distributed on an "AS IS" BASIS,
13+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
## See the License for the specific language governing permissions and
15+
## limitations under the License.
16+
##
117
# name lanes index
218
Ethernet0 0 1
319
Ethernet4 4 2

‎device/mellanox/x86_64-mlnx_msn2010-r0/ACS-MSN2010/sai_2010.xml

+16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
4+
Apache-2.0
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
218
<root>
319
<platform_info type="2010">
420

‎device/mellanox/x86_64-mlnx_msn2010-r0/pcie.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
3+
# Apache-2.0
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
- bus: '00'
218
dev: '00'
319
fn: '0'

‎device/mellanox/x86_64-mlnx_msn2010-r0/plugins/psuutil.py

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Copyright (c) 2017-2021 NVIDIA CORPORATION & AFFILIATES.
3+
# Apache-2.0
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
#############################################################################
218
# Mellanox
319
#

‎device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/port_config.ini

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
##
2+
## Copyright (c) 2017-2021 NVIDIA CORPORATION & AFFILIATES.
3+
## Apache-2.0
4+
##
5+
## Licensed under the Apache License, Version 2.0 (the "License");
6+
## you may not use this file except in compliance with the License.
7+
## You may obtain a copy of the License at
8+
##
9+
## http://www.apache.org/licenses/LICENSE-2.0
10+
##
11+
## Unless required by applicable law or agreed to in writing, software
12+
## distributed under the License is distributed on an "AS IS" BASIS,
13+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
## See the License for the specific language governing permissions and
15+
## limitations under the License.
16+
##
117
# name lanes index
218
Ethernet0 0,1,2,3 1
319
Ethernet4 4,5,6,7 2

‎device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json.j2

+16
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1+
{#
2+
Copyright (c) 2017-2021 NVIDIA CORPORATION & AFFILIATES.
3+
Apache-2.0
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
#}
117
{%- include 'qos_config.j2' %}

‎device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/sai_2100.xml

+16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2016-2021 NVIDIA CORPORATION & AFFILIATES.
4+
Apache-2.0
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
218
<root>
319
<platform_info type="2100">
420

‎device/mellanox/x86_64-mlnx_msn2100-r0/pcie.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
3+
# Apache-2.0
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
- bus: '00'
218
dev: '00'
319
fn: '0'

‎device/mellanox/x86_64-mlnx_msn2100-r0/plugins/psuutil.py

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Copyright (c) 2017-2021 NVIDIA CORPORATION & AFFILIATES.
3+
# Apache-2.0
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
117
#############################################################################
218
# Mellanox
319
#

‎device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/port_config.ini

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
##
2+
## Copyright (c) 2017-2021 NVIDIA CORPORATION & AFFILIATES.
3+
## Apache-2.0
4+
##
5+
## Licensed under the Apache License, Version 2.0 (the "License");
6+
## you may not use this file except in compliance with the License.
7+
## You may obtain a copy of the License at
8+
##
9+
## http://www.apache.org/licenses/LICENSE-2.0
10+
##
11+
## Unless required by applicable law or agreed to in writing, software
12+
## distributed under the License is distributed on an "AS IS" BASIS,
13+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
## See the License for the specific language governing permissions and
15+
## limitations under the License.
16+
##
117
# name lanes index
218
Ethernet0 0 1
319
Ethernet4 4 2

‎device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json.j2

+16
Original file line numberDiff line numberDiff line change
@@ -1 +1,17 @@
1+
{#
2+
Copyright (c) 2017-2021 NVIDIA CORPORATION & AFFILIATES.
3+
Apache-2.0
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
#}
117
{%- include 'qos_config.j2' %}

‎device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/sai_2410.xml

+16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
<?xml version="1.0"?>
2+
<!--
3+
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
4+
Apache-2.0
5+
6+
Licensed under the Apache License, Version 2.0 (the "License");
7+
you may not use this file except in compliance with the License.
8+
You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing, software
13+
distributed under the License is distributed on an "AS IS" BASIS,
14+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
See the License for the specific language governing permissions and
16+
limitations under the License.
17+
-->
218
<root>
319
<platform_info type="2410">
420

‎device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2

+16
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,18 @@
1+
{#
2+
Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
3+
Apache-2.0
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
#}
117
{%- set default_topo = 't0' %}
218
{%- include 'buffers_config.j2' %}

‎device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
{#
2+
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
3+
Apache-2.0
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
#}
117
{% set default_cable = '5m' %}
218
{% set ingress_lossless_pool_size = '4580864' %}
319
{% set ingress_lossy_pool_size = '4580864' %}

‎device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
{#
2+
Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
3+
Apache-2.0
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
#}
117
{% set default_cable = '5m' %}
218
{% set ingress_lossless_pool_size = '3302912' %}
319
{% set ingress_lossy_pool_size = '3302912' %}

‎device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
{#
2+
Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
3+
Apache-2.0
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
#}
117
{%- set default_topo = 't0' %}
218
{%- set dynamic_mode = 'true' %}
319
{%- include 'buffers_config.j2' %}

‎device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/pg_profile_lookup.ini

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
##
2+
## Copyright (c) 2018-2021 NVIDIA CORPORATION & AFFILIATES.
3+
## Apache-2.0
4+
##
5+
## Licensed under the Apache License, Version 2.0 (the "License");
6+
## you may not use this file except in compliance with the License.
7+
## You may obtain a copy of the License at
8+
##
9+
## http://www.apache.org/licenses/LICENSE-2.0
10+
##
11+
## Unless required by applicable law or agreed to in writing, software
12+
## distributed under the License is distributed on an "AS IS" BASIS,
13+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
## See the License for the specific language governing permissions and
15+
## limitations under the License.
16+
##
117
# PG lossless profiles.
218
# speed cable size xon xoff threshold
319
10000 5m 49152 19456 29696 0

‎device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/port_config.ini

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
##
2+
## Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES.
3+
## Apache-2.0
4+
##
5+
## Licensed under the Apache License, Version 2.0 (the "License");
6+
## you may not use this file except in compliance with the License.
7+
## You may obtain a copy of the License at
8+
##
9+
## http://www.apache.org/licenses/LICENSE-2.0
10+
##
11+
## Unless required by applicable law or agreed to in writing, software
12+
## distributed under the License is distributed on an "AS IS" BASIS,
13+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
## See the License for the specific language governing permissions and
15+
## limitations under the License.
16+
##
117
# name lanes alias index
218
Ethernet0 0,1,2,3 etp1 1
319
Ethernet4 4,5,6,7 etp2 2

0 commit comments

Comments
 (0)