Skip to content

Upgrade Lucius SAI version to 1.15. #637

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

Open
royyi8 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade Lucius SAI version to 1.15. #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ cc_library(
""",
patch_args = ["-p1"],
patches = ["//patches:sai.patch"],
sha256 = "4e3a1d010bda0c589db46e077725a2cd9624a5cc255c89d1caa79deb408d1fa7",
strip_prefix = "SAI-1.14.0",
urls = ["https://github.com/opencomputeproject/SAI/archive/refs/tags/v1.14.0.tar.gz"],
sha256 = "94b7a7dd9dbcc46bf14ba9f12b8597e9e9c2069fcb8e383a61cdf6ca172f3511",
strip_prefix = "SAI-1.15.0",
urls = ["https://github.com/opencomputeproject/SAI/archive/refs/tags/v1.15.0.tar.gz"],
)

######################################
Expand Down
6 changes: 5 additions & 1 deletion dataplane/apigen/typeinfo/typeinfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,8 +757,12 @@ func CreateAttrs(startIdx int, typeName string, xmlInfo *docparser.SAIInfo, attr
if strings.Contains(attr.SaiType, "sai_pointer_t") {
continue
}
// Proto field names can't begin with numbers, prepend _.
name := attr.MemberName
// Rename attribute to avoid collision with Proto _size methods.
if name == "json_formatted_debug_data_size" {
name = "json_formatted_debug_data_sz"
}
// Proto field names can't begin with numbers, prepend _.
if unicode.IsDigit(rune(attr.MemberName[0])) {
name = fmt.Sprintf("_%s", name)
}
Expand Down
5 changes: 5 additions & 0 deletions dataplane/proto/sai/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ proto_library(
"common.proto",
"counter.proto",
"dash_acl.proto",
"dash_appliance.proto",
"dash_direction_lookup.proto",
"dash_eni.proto",
"dash_flow.proto",
"dash_ha.proto",
"dash_inbound_routing.proto",
"dash_meter.proto",
"dash_outbound_ca_to_pa.proto",
"dash_outbound_routing.proto",
"dash_pa_validation.proto",
"dash_tunnel.proto",
"dash_vip.proto",
"dash_vnet.proto",
"debug_counter.proto",
Expand All @@ -32,6 +36,7 @@ proto_library(
"generic_programmable.proto",
"hash.proto",
"hostif.proto",
"icmp_echo.proto",
"ipmc.proto",
"ipmc_group.proto",
"ipsec.proto",
Expand Down
660 changes: 364 additions & 296 deletions dataplane/proto/sai/bfd.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions dataplane/proto/sai/bfd.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ enum BfdSessionAttr {
BFD_SESSION_ATTR_REMOTE_DIAG = 39;
BFD_SESSION_ATTR_REMOTE_MULTIPLIER = 40;
BFD_SESSION_ATTR_SRV6_SIDLIST_ID = 41;
BFD_SESSION_ATTR_STATS_COUNT_MODE = 42;
BFD_SESSION_ATTR_SELECTIVE_COUNTER_LIST = 43;
}

message CreateBfdSessionRequest {
Expand Down Expand Up @@ -89,6 +91,8 @@ message CreateBfdSessionRequest {
optional uint32 multiplier = 32[(attr_enum_value) = 31];
optional BfdSessionOffloadType offload_type = 33[(attr_enum_value) = 35];
optional uint64 srv6_sidlist_id = 34[(attr_enum_value) = 41];
optional StatsCountMode stats_count_mode = 35[(attr_enum_value) = 42];
repeated uint64 selective_counter_list = 36[(attr_enum_value) = 43];
}

message CreateBfdSessionResponse {
Expand Down Expand Up @@ -121,6 +125,8 @@ message SetBfdSessionAttributeRequest {
optional uint32 min_tx = 16[(attr_enum_value) = 29];
optional uint32 min_rx = 17[(attr_enum_value) = 30];
optional uint32 multiplier = 18[(attr_enum_value) = 31];
optional StatsCountMode stats_count_mode = 19[(attr_enum_value) = 42];
repeated uint64 selective_counter_list = 20[(attr_enum_value) = 43];
}

message SetBfdSessionAttributeResponse {
Expand Down
1,005 changes: 570 additions & 435 deletions dataplane/proto/sai/bridge.pb.go
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions dataplane/proto/sai/bridge.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ enum BridgeAttr {
BRIDGE_ATTR_UNKNOWN_MULTICAST_FLOOD_GROUP = 8;
BRIDGE_ATTR_BROADCAST_FLOOD_CONTROL_TYPE = 9;
BRIDGE_ATTR_BROADCAST_FLOOD_GROUP = 10;
BRIDGE_ATTR_STATS_COUNT_MODE = 11;
BRIDGE_ATTR_SELECTIVE_COUNTER_LIST = 12;
}

enum BridgePortAttr {
Expand All @@ -38,6 +40,8 @@ enum BridgePortAttr {
BRIDGE_PORT_ATTR_INGRESS_FILTERING = 12;
BRIDGE_PORT_ATTR_EGRESS_FILTERING = 13;
BRIDGE_PORT_ATTR_ISOLATION_GROUP = 14;
BRIDGE_PORT_ATTR_STATS_COUNT_MODE = 15;
BRIDGE_PORT_ATTR_SELECTIVE_COUNTER_LIST = 16;
}

message CreateBridgeRequest {
Expand All @@ -52,6 +56,8 @@ message CreateBridgeRequest {
optional uint64 unknown_multicast_flood_group = 8[(attr_enum_value) = 8];
optional BridgeFloodControlType broadcast_flood_control_type = 9[(attr_enum_value) = 9];
optional uint64 broadcast_flood_group = 10[(attr_enum_value) = 10];
optional StatsCountMode stats_count_mode = 11[(attr_enum_value) = 11];
repeated uint64 selective_counter_list = 12[(attr_enum_value) = 12];
}

message CreateBridgeResponse {
Expand All @@ -75,6 +81,8 @@ message SetBridgeAttributeRequest {
optional uint64 unknown_multicast_flood_group = 7[(attr_enum_value) = 8];
optional BridgeFloodControlType broadcast_flood_control_type = 8[(attr_enum_value) = 9];
optional uint64 broadcast_flood_group = 9[(attr_enum_value) = 10];
optional StatsCountMode stats_count_mode = 10[(attr_enum_value) = 11];
repeated uint64 selective_counter_list = 11[(attr_enum_value) = 12];
}

message SetBridgeAttributeResponse {
Expand Down Expand Up @@ -115,6 +123,8 @@ message CreateBridgePortRequest {
optional bool ingress_filtering = 13[(attr_enum_value) = 12];
optional bool egress_filtering = 14[(attr_enum_value) = 13];
optional uint64 isolation_group = 15[(attr_enum_value) = 14];
optional StatsCountMode stats_count_mode = 16[(attr_enum_value) = 15];
repeated uint64 selective_counter_list = 17[(attr_enum_value) = 16];
}

message CreateBridgePortResponse {
Expand All @@ -139,6 +149,8 @@ message SetBridgePortAttributeRequest {
optional bool ingress_filtering = 8[(attr_enum_value) = 12];
optional bool egress_filtering = 9[(attr_enum_value) = 13];
optional uint64 isolation_group = 10[(attr_enum_value) = 14];
optional StatsCountMode stats_count_mode = 11[(attr_enum_value) = 15];
repeated uint64 selective_counter_list = 12[(attr_enum_value) = 16];
}

message SetBridgePortAttributeResponse {
Expand Down
Loading
Loading