Updated to SAI v1.13+ (#205)

* Added nlohmann-json3-dev as new sairedis dependency * Extended list of unsupported types in get_by_type() --------- Signed-off-by: Andriy Kokhan <[email protected]>
opencomputeproject · Sep 30, 2023 · 233a896 · 233a896
1 parent c2d359d
commit 233a896
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/common/sai.py b/common/sai.py
@@ -338,7 +338,9 @@ def get_by_type(self, obj, attr, attr_type, do_assert=False):
         unsupported_types = [
                                 "sai_port_eye_values_list_t", "sai_prbs_rx_state_t",
                                 "sai_port_err_status_list_t", "sai_fabric_port_reachability_t",
-                                "sai_port_lane_latch_status_list_t", "sai_latch_status_t"
+                                "sai_port_lane_latch_status_list_t", "sai_latch_status_t",
+                                "sai_port_frequency_offset_ppm_list_t", "sai_port_snr_list_t",
+                                "sai_acl_chain_list_t"
                             ]
         if attr_type == "sai_object_list_t":
             status, data = self.get(obj, [attr, "1:oid:0x0"], do_assert)

diff --git a/dockerfiles/bullseye/Dockerfile.server b/dockerfiles/bullseye/Dockerfile.server
@@ -34,7 +34,8 @@ RUN apt-get install -y \
         make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
         libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig \
         libgtest-dev libgmock-dev libboost-dev autoconf-archive \
-        uuid-dev libboost-serialization-dev libyang-dev libyang1
+        uuid-dev libboost-serialization-dev libyang-dev libyang1 \
+        nlohmann-json3-dev
 
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev

diff --git a/dockerfiles/buster/Dockerfile.server b/dockerfiles/buster/Dockerfile.server
@@ -40,7 +40,8 @@ RUN apt-get install -y \
         make libtool m4 autoconf dh-exec debhelper automake cmake pkg-config \
         libhiredis-dev libnl-3-dev libnl-genl-3-dev libnl-route-3-dev swig3.0 \
         libgtest-dev libgmock-dev libboost-dev autoconf-archive \
-        uuid-dev libboost-serialization-dev libyang-dev libyang0.16
+        uuid-dev libboost-serialization-dev libyang-dev libyang0.16 \
+        nlohmann-json3-dev
 
 RUN apt-get install -y \
         libnl-3-dev libnl-genl-3-dev libnl-route-3-dev libnl-nf-3-dev libzmq3-dev

diff --git a/sai.env b/sai.env
@@ -1,13 +1,13 @@
 # The sonic-swss-common and sonic-sairedis commits were taken from
-# sonic-buildimage master as of Aug 15, 2023
+# sonic-buildimage master as of Sep 29, 2023
 #
-# https://github.com/sonic-net/sonic-buildimage/tree/4acaaf8
+# https://github.com/sonic-net/sonic-buildimage/tree/81a2f56
 
-SWSS_COMMON_ID=be425ed
-SAIREDIS_ID=eb24302
+SWSS_COMMON_ID=b0f148e
+SAIREDIS_ID=c22b76b
 
 # SAI version:
-#   Branch v1.12
-#   May 17, 2023
+#   Branch master (post v1.13)
+#   Sep 8, 2023
 
-SAI_ID=92875f9
+SAI_ID=7f7a758