Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Dockerfile.saibuilder
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM us-west1-docker.pkg.dev/openconfig-lemming/internal/builder@sha256:6a960d06bfd63c9cd8cff1f2ab3b3cc21e578b570979b5574d232be644dd0bf9
WORKDIR /build
COPY patches/sai.patch sai.patch
RUN wget -q https://github.com/opencomputeproject/SAI/archive/refs/tags/v1.11.0.tar.gz && tar xf v1.11.0.tar.gz && rm v1.11.0.tar.gz
RUN mkdir external && mv SAI-1.11.0 external/com_github_opencomputeproject_sai && patch -p1 -d external/com_github_opencomputeproject_sai < sai.patch
RUN wget -q https://github.com/opencomputeproject/SAI/archive/refs/tags/v1.14.0.tar.gz && tar xf v1.14.0.tar.gz && rm v1.14.0.tar.gz
RUN mkdir external && mv SAI-1.14.0 external/com_github_opencomputeproject_sai && patch -p1 -d external/com_github_opencomputeproject_sai < sai.patch
COPY go.* .
COPY dataplane/proto/sai/*.proto dataplane/proto/sai/
COPY dataplane/cpusink/*.go dataplane/cpusink/
Expand All @@ -15,4 +15,4 @@ COPY dataplane/standalone/sai/*.cc dataplane/standalone/sai/
COPY dataplane/standalone/sai/*.h dataplane/standalone/sai/
COPY dataplane/standalone/entrypoint.cc dataplane/standalone/entrypoint.cc
COPY Makefile .
RUN make lucius-libsai -j 48
RUN make lucius-libsai -j 48
6 changes: 3 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -283,9 +283,9 @@ cc_library(
""",
patch_args = ["-p1"],
patches = ["//patches:sai.patch"],
sha256 = "240d0211bbea2758faabfdbfa5e5488d837a47d42839bfe99b4bfbff52ab6c11",
strip_prefix = "SAI-1.11.0",
urls = ["https://github.com/opencomputeproject/SAI/archive/refs/tags/v1.11.0.tar.gz"],
sha256 = "4e3a1d010bda0c589db46e077725a2cd9624a5cc255c89d1caa79deb408d1fa7",
strip_prefix = "SAI-1.14.0",
urls = ["https://github.com/opencomputeproject/SAI/archive/refs/tags/v1.14.0.tar.gz"],
)

http_archive(
Expand Down
12 changes: 12 additions & 0 deletions dataplane/apigen/typeinfo/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,15 @@ var (
Repeated: true,
ProtoType: "PortErrStatus",
},
"sai_port_frequency_offset_ppm_list_t": {
ProtoType: "bytes",
},
"sai_port_snr_list_t": {
ProtoType: "bytes",
},
"sai_acl_chain_list_t": {
ProtoType: "bytes",
},
"sai_vlan_list_t": {
Repeated: true,
ProtoType: "uint32",
Expand Down Expand Up @@ -551,6 +560,9 @@ message FdbEventNotificationData {
"sai_acl_field_data_t": func(_ string, _ *docparser.SAIInfo) (string, bool) {
return "AclFieldData", false
},
"sai_acl_field_data_mask_t": func(_ string, _ *docparser.SAIInfo) (string, bool) {
return "AclFieldData", false
},
"map_sai_acl_field_data_t": func(_ string, _ *docparser.SAIInfo) (string, bool) {
return "map<uint64, AclFieldData>", true
},
Expand Down
14 changes: 14 additions & 0 deletions dataplane/proto/sai/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,24 @@ proto_library(
name = "sai_proto",
srcs = [
"acl.proto",
"ars.proto",
"ars_profile.proto",
"bfd.proto",
"bmtor.proto",
"bridge.proto",
"buffer.proto",
"common.proto",
"counter.proto",
"dash_acl.proto",
"dash_direction_lookup.proto",
"dash_eni.proto",
"dash_inbound_routing.proto",
"dash_meter.proto",
"dash_outbound_ca_to_pa.proto",
"dash_outbound_routing.proto",
"dash_pa_validation.proto",
"dash_vip.proto",
"dash_vnet.proto",
"debug_counter.proto",
"dtel.proto",
"fdb.proto",
Expand All @@ -35,6 +47,7 @@ proto_library(
"neighbor.proto",
"next_hop.proto",
"next_hop_group.proto",
"poe.proto",
"policer.proto",
"port.proto",
"qos_map.proto",
Expand All @@ -51,6 +64,7 @@ proto_library(
"system_port.proto",
"tam.proto",
"tunnel.proto",
"twamp.proto",
"udf.proto",
"virtual_router.proto",
"vlan.proto",
Expand Down
9,115 changes: 5,179 additions & 3,936 deletions dataplane/proto/sai/acl.pb.go

Large diffs are not rendered by default.

Loading
Loading