fixes

openconfig · Dec 5, 2023 · fbc5708 · fbc5708
1 parent 8348b76
commit fbc5708
Show file tree

Hide file tree

Showing 51 changed files with 38,279 additions and 38,379 deletions.
diff --git a/dataplane/proto/acl.pb.go b/dataplane/proto/acl.pb.go
diff --git a/dataplane/proto/bfd.pb.go b/dataplane/proto/bfd.pb.go
diff --git a/dataplane/proto/bmtor.pb.go b/dataplane/proto/bmtor.pb.go
diff --git a/dataplane/proto/bridge.pb.go b/dataplane/proto/bridge.pb.go
diff --git a/dataplane/proto/buffer.pb.go b/dataplane/proto/buffer.pb.go
diff --git a/dataplane/proto/common.pb.go b/dataplane/proto/common.pb.go
diff --git a/dataplane/proto/counter.pb.go b/dataplane/proto/counter.pb.go
diff --git a/dataplane/proto/debug_counter.pb.go b/dataplane/proto/debug_counter.pb.go
diff --git a/dataplane/proto/dtel.pb.go b/dataplane/proto/dtel.pb.go
diff --git a/dataplane/proto/fdb.pb.go b/dataplane/proto/fdb.pb.go
diff --git a/dataplane/proto/generic_programmable.pb.go b/dataplane/proto/generic_programmable.pb.go
diff --git a/dataplane/proto/hash.pb.go b/dataplane/proto/hash.pb.go
diff --git a/dataplane/proto/hostif.pb.go b/dataplane/proto/hostif.pb.go
diff --git a/dataplane/proto/ipmc.pb.go b/dataplane/proto/ipmc.pb.go
diff --git a/dataplane/proto/ipmc_group.pb.go b/dataplane/proto/ipmc_group.pb.go
diff --git a/dataplane/proto/ipsec.pb.go b/dataplane/proto/ipsec.pb.go
diff --git a/dataplane/proto/isolation_group.pb.go b/dataplane/proto/isolation_group.pb.go
diff --git a/dataplane/proto/l2mc.pb.go b/dataplane/proto/l2mc.pb.go
diff --git a/dataplane/proto/l2mc_group.pb.go b/dataplane/proto/l2mc_group.pb.go
diff --git a/dataplane/proto/lag.pb.go b/dataplane/proto/lag.pb.go
diff --git a/dataplane/proto/macsec.pb.go b/dataplane/proto/macsec.pb.go
diff --git a/dataplane/proto/mcast_fdb.pb.go b/dataplane/proto/mcast_fdb.pb.go
diff --git a/dataplane/proto/mirror.pb.go b/dataplane/proto/mirror.pb.go
diff --git a/dataplane/proto/mpls.pb.go b/dataplane/proto/mpls.pb.go
diff --git a/dataplane/proto/my_mac.pb.go b/dataplane/proto/my_mac.pb.go
diff --git a/dataplane/proto/nat.pb.go b/dataplane/proto/nat.pb.go
diff --git a/dataplane/proto/neighbor.pb.go b/dataplane/proto/neighbor.pb.go
diff --git a/dataplane/proto/next_hop.pb.go b/dataplane/proto/next_hop.pb.go
diff --git a/dataplane/proto/next_hop_group.pb.go b/dataplane/proto/next_hop_group.pb.go
diff --git a/dataplane/proto/policer.pb.go b/dataplane/proto/policer.pb.go
diff --git a/dataplane/proto/port.pb.go b/dataplane/proto/port.pb.go
diff --git a/dataplane/proto/qos_map.pb.go b/dataplane/proto/qos_map.pb.go
diff --git a/dataplane/proto/queue.pb.go b/dataplane/proto/queue.pb.go
diff --git a/dataplane/proto/route.pb.go b/dataplane/proto/route.pb.go
diff --git a/dataplane/proto/router_interface.pb.go b/dataplane/proto/router_interface.pb.go
diff --git a/dataplane/proto/rpf_group.pb.go b/dataplane/proto/rpf_group.pb.go
diff --git a/dataplane/proto/samplepacket.pb.go b/dataplane/proto/samplepacket.pb.go
diff --git a/dataplane/proto/scheduler.pb.go b/dataplane/proto/scheduler.pb.go
diff --git a/dataplane/proto/scheduler_group.pb.go b/dataplane/proto/scheduler_group.pb.go
diff --git a/dataplane/proto/srv6.pb.go b/dataplane/proto/srv6.pb.go
diff --git a/dataplane/proto/stp.pb.go b/dataplane/proto/stp.pb.go
diff --git a/dataplane/proto/switch.pb.go b/dataplane/proto/switch.pb.go
diff --git a/dataplane/proto/system_port.pb.go b/dataplane/proto/system_port.pb.go
diff --git a/dataplane/proto/tam.pb.go b/dataplane/proto/tam.pb.go
diff --git a/dataplane/proto/tunnel.pb.go b/dataplane/proto/tunnel.pb.go
diff --git a/dataplane/proto/udf.pb.go b/dataplane/proto/udf.pb.go
diff --git a/dataplane/proto/virtual_router.pb.go b/dataplane/proto/virtual_router.pb.go
diff --git a/dataplane/proto/vlan.pb.go b/dataplane/proto/vlan.pb.go
diff --git a/dataplane/proto/wred.pb.go b/dataplane/proto/wred.pb.go
diff --git a/dataplane/saiserver/saiserver.go b/dataplane/saiserver/saiserver.go
@@ -236,16 +236,16 @@ func (s *Server) Initialize(ctx context.Context, _ *saipb.InitializeRequest) (*s
 	return &saipb.InitializeResponse{}, nil
 }
 
-func (srv *Server) Reset(ctx context.Context) error {
-	_, err := srv.forwardingContext.ContextDelete(ctx, &fwdpb.ContextDeleteRequest{
-		ContextId: &fwdpb.ContextId{Id: srv.forwardingContext.id},
+func (s *Server) Reset(ctx context.Context) error {
+	_, err := s.forwardingContext.ContextDelete(ctx, &fwdpb.ContextDeleteRequest{
+		ContextId: &fwdpb.ContextId{Id: s.forwardingContext.id},
 	})
 	if err != nil {
 		return err
 	}
 
-	_, err = srv.forwardingContext.ContextCreate(ctx, &fwdpb.ContextCreateRequest{
-		ContextId: &fwdpb.ContextId{Id: srv.forwardingContext.id},
+	_, err = s.forwardingContext.ContextCreate(ctx, &fwdpb.ContextCreateRequest{
+		ContextId: &fwdpb.ContextId{Id: s.forwardingContext.id},
 	})
 	if err != nil {
 		return err

diff --git a/dataplane/standalone/BUILD b/dataplane/standalone/BUILD
@@ -5,8 +5,8 @@ cc_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        "//dataplane/standalone/packetio",
         "//dataplane/proto:sai_cc_grpc",
+        "//dataplane/standalone/packetio",
         "//dataplane/standalone/sai",
         "@com_github_google_glog//:glog",
         "@com_github_grpc_grpc//:grpc++",