Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to SAI v1.13+ #205

Merged
merged 3 commits into from
Sep 30, 2023
Merged

Updated to SAI v1.13+ #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33c0b7b
Updated to SAI v1.13+
andriy-kokhan Sep 30, 2023
5fbaedb
Added nlohmann-json3-dev as new sairedis dependency
andriy-kokhan Sep 30, 2023
664c910
Extended list of unsupported types in get_by_type()
andriy-kokhan Sep 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion common/sai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/bullseye/Dockerfile.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion dockerfiles/buster/Dockerfile.server
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions sai.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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