matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update packages and pointers to use SAI1.6 headers. (#4597)

Browse Source 
* Update sonic-sairedis (sairedis with SAI 1.6 headers)

* Update SAIBCM to 3.7.4.2, which is built upon SAI1.6 headers

* missed updating BRCM_SAI variable, fixed it

* Update SAIBCM to 3.7.4.2, updated link to libsaibcm

* [Mellanox] Update SAI (release:v1.16.3; API:v1.6)

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

* Update sonic-sairedis pointer to include SAI1.6 headers

* [Mellanox] Update SDK to 4.4.0914 and FW to xx.2007.1112 to match SAI 1.16.3 (API:v1.6)

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

* ensure the veth link is up in docker VS container

* ensure the veth link is up in docker VS container

* [Mellanox] Update SAI (release:v1.16.3.2; API:v1.6)

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

* use 'config interface startup' instead of using ifconfig command, also undid the previous change'

Co-authored-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
This commit is contained in:
Mahesh Maddikayala 2020-05-30 14:23:34 -07:00 committed by GitHub
parent c37c949342
commit fb6916f88b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platform/broadcom/sai.mk
View File

@ -1,8 +1,8 @@
BRCM_SAI = libsaibcm_3.7.3.3-4_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm_3.7.3.3-4_amd64.deb?sv=2015-04-05&sr=b&sig=9z7vLhweD%2B%2FZylkr9XsDAJ3DdE5NJlcPTslFYyBuAXU%3D&se=2033-12-25T14%3A52%3A25Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_3.7.3.3-4_amd64.deb
BRCM_SAI = libsaibcm_3.7.4.2_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm_3.7.4.2_amd64.deb?sv=2015-04-05&sr=b&sig=Iqgd1HDmXOa%2F2OEnez1D4dQ4wVICZlnvVOYao1FYlio%3D&se=2034-01-14T18%3A51%3A07Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_3.7.4.2_amd64.deb
$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm-dev_3.7.3.3-4_amd64.deb?sv=2015-04-05&sr=b&sig=SAOoGh2zdljiPuKeDoa%2B1lSJzZ8uXh2Irl2RZX1uAiA%3D&se=2033-12-25T14%3A53%3A44Z&sp=r"
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm-dev_3.7.4.2_amd64.deb?sv=2015-04-05&sr=b&sig=cbQJOwQcILWYbjuI3LObY6H7bvCNijKfEkdAIrm3Q64%3D&se=2034-01-14T18%3A49%3A15Z&sp=r"
SONIC_ONLINE_DEBS += $(BRCM_SAI)
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

6
platform/mellanox/fw.mk
View File

@ -11,17 +11,17 @@ else
FW_FROM_URL = n
endif
MLNX_SPC_FW_VERSION = 13.2007.1140
MLNX_SPC_FW_VERSION = 13.2007.1112
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
MLNX_SPC2_FW_VERSION = 29.2007.1140
MLNX_SPC2_FW_VERSION = 29.2007.1112
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
MLNX_SPC3_FW_VERSION = 30.2007.1140
MLNX_SPC3_FW_VERSION = 30.2007.1112
MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)

2
platform/mellanox/mlnx-sai.mk
View File

@ -1,6 +1,6 @@
# Mellanox SAI
MLNX_SAI_VERSION = SAIRel1.16.4-master
MLNX_SAI_VERSION = SAIRel1.16.3.2-sai16
export MLNX_SAI_VERSION

2
platform/mellanox/mlnx-sai/SAI-Implementation

@ -1 +1 @@
Subproject commit 8cbb3aaaa2d3ff3d5770d5d2452a0ebe32149206
Subproject commit aa5a09b712609d7c903fbacd63a87deeab922a2b

2
platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers

@ -1 +1 @@
Subproject commit 0115fcd6b6dea3dd9faf957389885a7ed40b671d
Subproject commit 3160d980ff766addb459e1ff0f81778516eb55a0

2
platform/mellanox/sdk.mk
View File

@ -1,5 +1,5 @@
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
MLNX_SDK_VERSION = 4.4.0918
MLNX_SDK_VERSION = 4.4.0914
MLNX_SDK_ISSU_VERSION = 101
MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))

4
platform/vs/tests/bgp/test_gr_livelock.py
View File

@ -86,10 +86,10 @@ def test_gr_livelock(dvs, testlog):
time.sleep(5)
dvs.runcmd("supervisorctl start bgpd")
dvs.runcmd("ip addr add 10.0.0.0/31 dev Ethernet0")
dvs.runcmd("ifconfig Ethernet0 up")
dvs.runcmd("config interface startup Ethernet0")
dvs.runcmd("ip addr add 10.0.0.2/31 dev Ethernet4")
dvs.runcmd("ifconfig Ethernet4 up")
dvs.runcmd("config interface startup Ethernet4")
dvs.servers[0].runcmd("ip addr add 10.0.0.1/31 dev eth0")
dvs.servers[0].runcmd("ifconfig eth0 up")

2
platform/vs/tests/bgp/test_invalid_nexthop.py
View File

@ -10,7 +10,7 @@ def test_InvalidNexthop(dvs, testlog):
dvs.copy_file("/etc/frr/", "bgp/files/invalid_nexthop/bgpd.conf")
dvs.runcmd("supervisorctl start bgpd")
dvs.runcmd("ip addr add fc00::1/126 dev Ethernet0")
dvs.runcmd("ifconfig Ethernet0 up")
dvs.runcmd("config interface startup Ethernet0")
dvs.servers[0].runcmd("ip addr add fc00::2/126 dev eth0")
dvs.servers[0].runcmd("ifconfig eth0 up")

4
platform/vs/tests/bgp/test_no_export.py
View File

@ -9,10 +9,10 @@ def test_bounce(dvs, testlog):
dvs.copy_file("/etc/frr/", "bgp/files/no_export/bgpd.conf")
dvs.runcmd("supervisorctl start bgpd")
dvs.runcmd("ip addr add 10.0.0.0/31 dev Ethernet0")
dvs.runcmd("ifconfig Ethernet0 up")
dvs.runcmd("config interface startup Ethernet0")
dvs.runcmd("ip addr add 10.0.0.2/31 dev Ethernet4")
dvs.runcmd("ifconfig Ethernet4 up")
dvs.runcmd("config interface startup Ethernet4")
dvs.servers[0].runcmd("ip addr add 10.0.0.1/31 dev eth0")
dvs.servers[0].runcmd("ifconfig eth0 up")

2
src/sonic-sairedis

@ -1 +1 @@
Subproject commit f972073fae66a56e32bfe0a30dac81ceae4c5d75
Subproject commit ebdf4fff1ce4db87886629ef7a9e251ee41390d1