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.

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

Bulk remove and implement more remove RPC #436

Merged
merged 3 commits into from
Jun 17, 2024
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
43 changes: 37 additions & 6 deletions dataplane/apigen/ccgen/ccgen.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,18 @@ func createCCData(meta *saiast.FuncMetadata, apiName string, sai *saiast.SAIAPI,
}
smt.EnumValue = attr.EnumName
}
case "remove_bulk":
convertFn = nil
opFn.EntryVar = strings.TrimPrefix(opFn.EntryVar, "*") // Usual entry is pointer, but for remove_bulk it's an array.
for _, attr := range info.Attrs[meta.TypeName].CreateFields {
name := sanitizeProtoName(attr.MemberName)
smt, err := protoFieldSetter(attr.SaiType, "", name, "attr_list[i].value", info)
if err != nil {
fmt.Println("skipping due to error: ", err)
continue
}
smt.EnumValue = attr.EnumName
}
case "get_stats":
convertFn = nil
opFn.AttrEnumType = strcase.UpperCamelCase(meta.TypeName + " stat")
Expand Down Expand Up @@ -487,7 +499,7 @@ var supportedOperation = map[string]bool{
"get_stats": true,
"get_stats_ext": true,
"create_bulk": true,
"remove_bulk": false,
"remove_bulk": true,
"set_attribute_bulk": false,
"get_attribute_bulk": false,
}
Expand Down Expand Up @@ -524,7 +536,7 @@ extern const {{ .APIType }} l_{{ .APIName }};
#endif // {{ .IncludeGuard }}
`))
ccTmpl = template.Must(template.New("cc").Parse(`
{{ define "getattr" }}
{{- define "getattr" }}
{{ $parent := . }}
switch ({{ .Var }}) {
{{ range .Attrs }}
Expand All @@ -546,7 +558,7 @@ switch ({{ .Var }}) {
{{- end }}
}
{{ end }}
{{ define "setattr" }}
{{- define "setattr" }}
{{ $parent := . }}
switch ({{ .Var }}) {
{{ range .Attrs }}
Expand All @@ -562,9 +574,7 @@ switch ({{ .Var }}) {
break;
{{- end }}
}
{{ end }}


{{ end -}}
// Copyright 2023 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -701,6 +711,27 @@ return msg;
LOG(ERROR) << status.error_message();
return SAI_STATUS_FAILURE;
}
{{ else if eq .Operation "remove_bulk" }}
lemming::dataplane::sai::{{ .ReqType }} req;
lemming::dataplane::sai::{{ .RespType }} resp;
grpc::ClientContext context;

for (uint32_t i = 0; i < object_count; i++) {
{{ if .OidVar -}} req.add_reqs()->set_oid(object_id[i]); {{ end }}
{{ if .EntryVar }} *req.add_reqs()->mutable_entry() = {{ .EntryConversionFunc }}({{ .EntryVar }}[i]); {{ end }}
}

grpc::Status status = {{ .Client }}->{{ .RPCMethod }}(&context, req, &resp);
if (!status.ok()) {
LOG(ERROR) << status.error_message();
return SAI_STATUS_FAILURE;
}
if (object_count != resp.resps().size()) {
return SAI_STATUS_FAILURE;
}
for (uint32_t i = 0; i < object_count; i++) {
object_statuses[i] = SAI_STATUS_SUCCESS;
}
{{ else if eq .Operation "get_stats" }}
lemming::dataplane::sai::{{ .ReqType }} req;
lemming::dataplane::sai::{{ .RespType }} resp;
Expand Down
11 changes: 11 additions & 0 deletions dataplane/apigen/protogen/protogen.go
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,17 @@ func populateTmplDataFromFunc(apis map[string]*protoAPITmplData, docInfo *docpar
ProtoType: repeatedType + strcase.UpperCamelCase("Create "+meta.TypeName+"Response"),
Index: 1,
})
case "remove_bulk":
req.Fields = append(req.Fields, protoTmplField{
Name: "reqs",
ProtoType: repeatedType + strcase.UpperCamelCase("Remove "+meta.TypeName+"Request"),
Index: 1,
})
resp.Fields = append(resp.Fields, protoTmplField{
Name: "resps",
ProtoType: repeatedType + strcase.UpperCamelCase("Remove "+meta.TypeName+"Response"),
Index: 1,
})
case "get_stats":
req.Fields = append(req.Fields, idField, protoTmplField{
Name: "counter_ids",
Expand Down
361 changes: 270 additions & 91 deletions dataplane/proto/sai/fdb.pb.go

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions dataplane/proto/sai/fdb.proto
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,14 @@ message CreateFdbEntriesResponse {
repeated CreateFdbEntryResponse resps = 1;
}

message RemoveFdbEntriesRequest {
repeated RemoveFdbEntryRequest reqs = 1;
}

message RemoveFdbEntriesResponse {
repeated RemoveFdbEntryResponse resps = 1;
}

service Fdb {
rpc CreateFdbEntry(CreateFdbEntryRequest) returns (CreateFdbEntryResponse) {}
rpc RemoveFdbEntry(RemoveFdbEntryRequest) returns (RemoveFdbEntryResponse) {}
Expand All @@ -80,4 +88,6 @@ service Fdb {
returns (GetFdbEntryAttributeResponse) {}
rpc CreateFdbEntries(CreateFdbEntriesRequest)
returns (CreateFdbEntriesResponse) {}
rpc RemoveFdbEntries(RemoveFdbEntriesRequest)
returns (RemoveFdbEntriesResponse) {}
}
249 changes: 214 additions & 35 deletions dataplane/proto/sai/lag.pb.go

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions dataplane/proto/sai/lag.proto
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ message CreateLagMembersResponse {
repeated CreateLagMemberResponse resps = 1;
}

message RemoveLagMembersRequest {
repeated RemoveLagMemberRequest reqs = 1;
}

message RemoveLagMembersResponse {
repeated RemoveLagMemberResponse resps = 1;
}

service Lag {
rpc CreateLag(CreateLagRequest) returns (CreateLagResponse) {}
rpc RemoveLag(RemoveLagRequest) returns (RemoveLagResponse) {}
Expand All @@ -137,4 +145,6 @@ service Lag {
returns (GetLagMemberAttributeResponse) {}
rpc CreateLagMembers(CreateLagMembersRequest)
returns (CreateLagMembersResponse) {}
rpc RemoveLagMembers(RemoveLagMembersRequest)
returns (RemoveLagMembersResponse) {}
}
Loading
Loading