Merge pull request sonic-net#134 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
mlok-nokia · Oct 10, 2023 · 6078237 · 6078237
2 parents e878749 + 3343d24
commit 6078237
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,4 +1,4 @@
-LIBSAIBCM_XGS_VERSION = 7.1.54.4-3
+LIBSAIBCM_XGS_VERSION = 7.1.62.4
 LIBSAIBCM_DNX_VERSION = 7.1.60.4-1
 LIBSAIBCM_BRANCH_NAME = REL_7.0_202205
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"

diff --git a/sonic-slave-bullseye/Dockerfile.j2 b/sonic-slave-bullseye/Dockerfile.j2
@@ -400,6 +400,11 @@ RUN pip3 install wheel==0.38.1
 # For building sonic-utilities
 RUN pip3 install fastentrypoints mock
 
+# For building sonic_ycabled
+# Note: upstream build breaks with old version of setuptools
+# ref: https://github.com/grpc/grpc/issues/34569
+RUN pip3 install grpcio==1.58.0 grpcio-tools==1.58.0
+
 # For running Python unit tests
 RUN pip3 install pytest-runner==5.2
 RUN pip3 install nose==1.3.7

diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
@@ -60,7 +60,7 @@
     'BMCDATAV6': {
         "ACTIONS": ["PACKET_ACTION", "COUNTER"],
         "BIND_POINTS": ["PORT"],
-        "MATCHES": ["SRC_IPV6", "DST_IPV6", "ETHER_TYPE", "IP_TYPE", "IP_PROTOCOL", "IN_PORTS", "L4_SRC_PORT", "L4_DST_PORT", "L4_SRC_PORT_RANGE", "L4_DST_PORT_RANGE"]
+        "MATCHES": ["SRC_IPV6", "DST_IPV6", "ETHER_TYPE", "IP_TYPE", "IP_PROTOCOL", "IN_PORTS", "L4_SRC_PORT", "L4_DST_PORT", "L4_SRC_PORT_RANGE", "L4_DST_PORT_RANGE", "ICMPV6_TYPE", "ICMPV6_CODE", "TCP_FLAGS"]
     }
 }
 

diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -505,7 +505,7 @@ def test_minigraph_acl_type_bmcdata(self):
         expected_acl_type_bmcdatav6 = {
             "ACTIONS": ["PACKET_ACTION", "COUNTER"],
             "BIND_POINTS": ["PORT"],
-            "MATCHES": ["SRC_IPV6", "DST_IPV6", "ETHER_TYPE", "IP_TYPE", "IP_PROTOCOL", "IN_PORTS", "L4_SRC_PORT", "L4_DST_PORT", "L4_SRC_PORT_RANGE", "L4_DST_PORT_RANGE"],
+            "MATCHES": ["SRC_IPV6", "DST_IPV6", "ETHER_TYPE", "IP_TYPE", "IP_PROTOCOL", "IN_PORTS", "L4_SRC_PORT", "L4_DST_PORT", "L4_SRC_PORT_RANGE", "L4_DST_PORT_RANGE", "ICMPV6_TYPE", "ICMPV6_CODE", "TCP_FLAGS"],
         }
         expected_acl_table_bmc_acl_northbound =  {
             'policy_desc': 'BMC_ACL_NORTHBOUND',