Support bulk remove API

openconfig · Jun 17, 2024 · 864f778 · 864f778
1 parent c1934e0
commit 864f778
Show file tree

Hide file tree

Showing 50 changed files with 17 additions and 115 deletions.
diff --git a/dataplane/apigen/ccgen/ccgen.go b/dataplane/apigen/ccgen/ccgen.go
@@ -202,6 +202,7 @@ func createCCData(meta *saiast.FuncMetadata, apiName string, sai *saiast.SAIAPI,
 		}
 	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)
@@ -535,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 }}
@@ -557,7 +558,7 @@ switch ({{ .Var }}) {
  {{- end }}
 }
 {{ end }}
-{{ define "setattr" }}
+{{- define "setattr" }}
 {{ $parent := . }}
 switch ({{ .Var }}) {
   {{ range .Attrs }}
@@ -573,9 +574,7 @@ switch ({{ .Var }}) {
 	break;
  {{- end }}
 }
-{{ end }}
-
-
+{{ end -}}
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -718,8 +717,8 @@ return msg;
 	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 }}({{ printf "" .EntryVar }}[i]); {{ end }}
+		{{ 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);

diff --git a/dataplane/standalone/pkthandler/BUILD b/dataplane/standalone/pkthandler/BUILD
@@ -63,5 +63,5 @@ pkg_deb(
     preinst = "preinst",
     prerm = "prerm",
     tags = ["manual"],
-    version = "1.0-0",
+    version = "1.2-0",
 )
diff --git a/dataplane/standalone/sai/acl.cc b/dataplane/standalone/sai/acl.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/bfd.cc b/dataplane/standalone/sai/bfd.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/bmtor.cc b/dataplane/standalone/sai/bmtor.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/bridge.cc b/dataplane/standalone/sai/bridge.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/buffer.cc b/dataplane/standalone/sai/buffer.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/counter.cc b/dataplane/standalone/sai/counter.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/debug_counter.cc b/dataplane/standalone/sai/debug_counter.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/dtel.cc b/dataplane/standalone/sai/dtel.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/fdb.cc b/dataplane/standalone/sai/fdb.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/generic_programmable.cc b/dataplane/standalone/sai/generic_programmable.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/hash.cc b/dataplane/standalone/sai/hash.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/hostif.cc b/dataplane/standalone/sai/hostif.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/ipmc.cc b/dataplane/standalone/sai/ipmc.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/ipmc_group.cc b/dataplane/standalone/sai/ipmc_group.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/ipsec.cc b/dataplane/standalone/sai/ipsec.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/isolation_group.cc b/dataplane/standalone/sai/isolation_group.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/l2mc.cc b/dataplane/standalone/sai/l2mc.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/l2mc_group.cc b/dataplane/standalone/sai/l2mc_group.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/lag.cc b/dataplane/standalone/sai/lag.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -389,7 +387,7 @@ sai_status_t l_remove_lag_members(uint32_t object_count,
   grpc::ClientContext context;
 
   for (uint32_t i = 0; i < object_count; i++) {
-    req.add_reqs().set_oid(object_id[i]);
+    req.add_reqs()->set_oid(object_id[i]);
   }
 
   grpc::Status status = lag->RemoveLagMembers(&context, req, &resp);

diff --git a/dataplane/standalone/sai/macsec.cc b/dataplane/standalone/sai/macsec.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/mcast_fdb.cc b/dataplane/standalone/sai/mcast_fdb.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/mirror.cc b/dataplane/standalone/sai/mirror.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/mpls.cc b/dataplane/standalone/sai/mpls.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/my_mac.cc b/dataplane/standalone/sai/my_mac.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/nat.cc b/dataplane/standalone/sai/nat.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/neighbor.cc b/dataplane/standalone/sai/neighbor.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -268,7 +266,7 @@ sai_status_t l_remove_neighbor_entries(
 
   for (uint32_t i = 0; i < object_count; i++) {
     *req.add_reqs()->mutable_entry() =
-        convert_from_neighbor_entry(*neighbor_entry[i]);
+        convert_from_neighbor_entry(neighbor_entry[i]);
   }
 
   grpc::Status status = neighbor->RemoveNeighborEntries(&context, req, &resp);

diff --git a/dataplane/standalone/sai/next_hop.cc b/dataplane/standalone/sai/next_hop.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -322,7 +320,7 @@ sai_status_t l_remove_next_hops(uint32_t object_count,
   grpc::ClientContext context;
 
   for (uint32_t i = 0; i < object_count; i++) {
-    req.add_reqs().set_oid(object_id[i]);
+    req.add_reqs()->set_oid(object_id[i]);
   }
 
   grpc::Status status = next_hop->RemoveNextHops(&context, req, &resp);

diff --git a/dataplane/standalone/sai/next_hop_group.cc b/dataplane/standalone/sai/next_hop_group.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -441,7 +439,7 @@ sai_status_t l_remove_next_hop_group_members(uint32_t object_count,
   grpc::ClientContext context;
 
   for (uint32_t i = 0; i < object_count; i++) {
-    req.add_reqs().set_oid(object_id[i]);
+    req.add_reqs()->set_oid(object_id[i]);
   }
 
   grpc::Status status =

diff --git a/dataplane/standalone/sai/policer.cc b/dataplane/standalone/sai/policer.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/port.cc b/dataplane/standalone/sai/port.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -1866,7 +1864,7 @@ sai_status_t l_remove_ports(uint32_t object_count,
   grpc::ClientContext context;
 
   for (uint32_t i = 0; i < object_count; i++) {
-    req.add_reqs().set_oid(object_id[i]);
+    req.add_reqs()->set_oid(object_id[i]);
   }
 
   grpc::Status status = port->RemovePorts(&context, req, &resp);

diff --git a/dataplane/standalone/sai/qos_map.cc b/dataplane/standalone/sai/qos_map.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/queue.cc b/dataplane/standalone/sai/queue.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/route.cc b/dataplane/standalone/sai/route.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -228,8 +226,7 @@ sai_status_t l_remove_route_entries(uint32_t object_count,
   grpc::ClientContext context;
 
   for (uint32_t i = 0; i < object_count; i++) {
-    *req.add_reqs()->mutable_entry() =
-        convert_from_route_entry(*route_entry[i]);
+    *req.add_reqs()->mutable_entry() = convert_from_route_entry(route_entry[i]);
   }
 
   grpc::Status status = route->RemoveRouteEntries(&context, req, &resp);

diff --git a/dataplane/standalone/sai/router_interface.cc b/dataplane/standalone/sai/router_interface.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/rpf_group.cc b/dataplane/standalone/sai/rpf_group.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/samplepacket.cc b/dataplane/standalone/sai/samplepacket.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/scheduler.cc b/dataplane/standalone/sai/scheduler.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/scheduler_group.cc b/dataplane/standalone/sai/scheduler_group.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/srv6.cc b/dataplane/standalone/sai/srv6.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -220,7 +218,7 @@ sai_status_t l_remove_srv6_sidlists(uint32_t object_count,
   grpc::ClientContext context;
 
   for (uint32_t i = 0; i < object_count; i++) {
-    req.add_reqs().set_oid(object_id[i]);
+    req.add_reqs()->set_oid(object_id[i]);
   }
 
   grpc::Status status = srv6->RemoveSrv6Sidlists(&context, req, &resp);

diff --git a/dataplane/standalone/sai/stp.cc b/dataplane/standalone/sai/stp.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -292,7 +290,7 @@ sai_status_t l_remove_stp_ports(uint32_t object_count,
   grpc::ClientContext context;
 
   for (uint32_t i = 0; i < object_count; i++) {
-    req.add_reqs().set_oid(object_id[i]);
+    req.add_reqs()->set_oid(object_id[i]);
   }
 
   grpc::Status status = stp->RemoveStpPorts(&context, req, &resp);

diff --git a/dataplane/standalone/sai/switch.cc b/dataplane/standalone/sai/switch.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/system_port.cc b/dataplane/standalone/sai/system_port.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/dataplane/standalone/sai/tam.cc b/dataplane/standalone/sai/tam.cc
@@ -1,5 +1,3 @@
-
-
 // Copyright 2023 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");