fix

openconfig · Jun 4, 2024 · 51cbff3 · 51cbff3
1 parent 724835d
commit 51cbff3
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 35 deletions.
diff --git a/dataplane/saiserver/ports.go b/dataplane/saiserver/ports.go
@@ -358,7 +358,7 @@ func (port *port) CreatePort(ctx context.Context, req *saipb.CreatePortRequest)
 	}, swAttr); err != nil {
 		return nil, fmt.Errorf("Failed to retrive the default VLAN's OID. This is working as intended in unit tests.")
 	}
-	if _, err := port.vlan.CreateVlanMember(ctx, &saipb.CreateVlanMemberRequest{
+	if _, err := attrmgr.InvokeAndSave(ctx, port.mgr, port.vlan.CreateVlanMember, &saipb.CreateVlanMemberRequest{
 		VlanId:          proto.Uint64(swAttr.GetAttr().GetDefaultVlanId()),
 		BridgePortId:    proto.Uint64(id),
 		VlanTaggingMode: saipb.VlanTaggingMode_VLAN_TAGGING_MODE_UNTAGGED.Enum(),
@@ -762,3 +762,30 @@ func (sg *schedulerGroup) CreateSchedulerGroup(context.Context, *saipb.CreateSch
 func (sg *schedulerGroup) SetSchedulerGroupAttribute(context.Context, *saipb.SetSchedulerGroupAttributeRequest) (*saipb.SetSchedulerGroupAttributeResponse, error) {
 	return &saipb.SetSchedulerGroupAttributeResponse{}, nil
 }
+
+func newScheduler(mgr *attrmgr.AttrMgr, dataplane switchDataplaneAPI, srv *grpc.Server) *scheduler {
+	s := &scheduler{
+		mgr:       mgr,
+		dataplane: dataplane,
+	}
+	saipb.RegisterSchedulerServer(srv, s)
+	return s
+}
+
+type scheduler struct {
+	saipb.UnimplementedSchedulerServer
+	mgr       *attrmgr.AttrMgr
+	dataplane switchDataplaneAPI
+}
+
+func (s *scheduler) CreateScheduler(context.Context, *saipb.CreateSchedulerRequest) (*saipb.CreateSchedulerResponse, error) {
+	id := s.mgr.NextID()
+
+	return &saipb.CreateSchedulerResponse{
+		Oid: id,
+	}, nil
+}
+
+func (s *scheduler) SetSchedulerAttribute(context.Context, *saipb.SetSchedulerAttributeRequest) (*saipb.SetSchedulerAttributeResponse, error) {
+	return &saipb.SetSchedulerAttributeResponse{}, nil
+}
diff --git a/dataplane/saiserver/saiserver.go b/dataplane/saiserver/saiserver.go
@@ -106,10 +106,6 @@ type samplePacket struct {
 	saipb.UnimplementedSamplepacketServer
 }
 
-type scheduler struct {
-	saipb.UnimplementedSchedulerServer
-}
-
 type srv6 struct {
 	saipb.UnimplementedSrv6Server
 }
@@ -146,34 +142,32 @@ func (fc *forwardingContext) ID() string {
 type Server struct {
 	saipb.UnimplementedEntrypointServer
 	*forwardingContext
-	mgr            *attrmgr.AttrMgr
-	initialized    bool
-	bfd            *bfd
-	buffer         *buffer
-	counter        *counter
-	debugCounter   *debugCounter
-	dtel           *dtel
-	fdb            *fdb
-	ipmcGroup      *ipmcGroup
-	ipmc           *ipmc
-	ipsec          *ipsec
-	l2mcGroup      *l2mcGroup
-	l2mc           *l2mc
-	macsec         *macsec
-	mcastFdb       *mcastFdb
-	mirror         *mirror
-	mpls           *mpls
-	nat            *nat
-	qosMap         *qosMap
-	rpfGroup       *rpfGroup
-	samplePacket   *samplePacket
-	schedulerGroup *schedulerGroup
-	scheduler      *scheduler
-	srv6           *srv6
-	saiSwitch      *saiSwitch
-	systemPort     *systemPort
-	tam            *tam
-	wred           *wred
+	mgr          *attrmgr.AttrMgr
+	initialized  bool
+	bfd          *bfd
+	buffer       *buffer
+	counter      *counter
+	debugCounter *debugCounter
+	dtel         *dtel
+	fdb          *fdb
+	ipmcGroup    *ipmcGroup
+	ipmc         *ipmc
+	ipsec        *ipsec
+	l2mcGroup    *l2mcGroup
+	l2mc         *l2mc
+	macsec       *macsec
+	mcastFdb     *mcastFdb
+	mirror       *mirror
+	mpls         *mpls
+	nat          *nat
+	qosMap       *qosMap
+	rpfGroup     *rpfGroup
+	samplePacket *samplePacket
+	srv6         *srv6
+	saiSwitch    *saiSwitch
+	systemPort   *systemPort
+	tam          *tam
+	wred         *wred
 }
 
 func (s *Server) ObjectTypeQuery(_ context.Context, req *saipb.ObjectTypeQueryRequest) (*saipb.ObjectTypeQueryResponse, error) {
@@ -253,7 +247,6 @@ func New(ctx context.Context, mgr *attrmgr.AttrMgr, s *grpc.Server, opts *dplane
 		qosMap:            &qosMap{},
 		rpfGroup:          &rpfGroup{},
 		samplePacket:      &samplePacket{},
-		scheduler:         &scheduler{},
 		srv6:              &srv6{},
 		saiSwitch:         sw,
 		systemPort:        &systemPort{},
@@ -281,7 +274,6 @@ func New(ctx context.Context, mgr *attrmgr.AttrMgr, s *grpc.Server, opts *dplane
 	saipb.RegisterQosMapServer(s, srv.qosMap)
 	saipb.RegisterRpfGroupServer(s, srv.rpfGroup)
 	saipb.RegisterSamplepacketServer(s, srv.samplePacket)
-	saipb.RegisterSchedulerServer(s, srv.scheduler)
 	saipb.RegisterSrv6Server(s, srv.srv6)
 	saipb.RegisterSystemPortServer(s, srv.systemPort)
 	saipb.RegisterTamServer(s, srv.tam)

diff --git a/dataplane/saiserver/switch.go b/dataplane/saiserver/switch.go
@@ -58,6 +58,7 @@ type saiSwitch struct {
 	sg              *schedulerGroup
 	routerInterface *routerInterface
 	udf             *udf
+	scheduler       *scheduler
 	mgr             *attrmgr.AttrMgr
 }
 
@@ -136,6 +137,7 @@ func newSwitch(mgr *attrmgr.AttrMgr, engine switchDataplaneAPI, s *grpc.Server,
 		lag:             newLAG(mgr, engine, s),
 		tunnel:          newTunnel(mgr, engine, s),
 		udf:             newUdf(mgr, engine, s),
+		scheduler:       newScheduler(mgr, engine, s),
 		queue:           q,
 		sg:              sg,
 		mgr:             mgr,