placeholder code for gnoi server.

gnmi_server/gnoi.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	gnoi_system_pb "github.com/openconfig/gnoi/system"
 	gnoi_file_pb "github.com/openconfig/gnoi/file"
+	gnoi_containerz_pb "github.com/openconfig/gnoi/containerz"
 	log "github.com/golang/glog"
 	"time"
 	spb "github.com/sonic-net/sonic-gnmi/proto/gnoi"
@@ -265,6 +266,11 @@ func (srv *SystemServer) Time(ctx context.Context, req *gnoi_system_pb.TimeReque
 	return &tm, nil
 }
 
+func (srv *ContainerzServer) ListContainer(req *gnoi_containerz_pb.ListContainerRequest, list_srv gnoi_containerz_pb.Containerz_ListContainerServer) (error) {
+	log.V(1).Info("gNOI: List Container")
+	return status.Errorf(codes.Unimplemented, "")
+}
+
 func (srv *Server) Authenticate(ctx context.Context, req *spb_jwt.AuthenticateRequest) (*spb_jwt.AuthenticateResponse, error) {
 	// Can't enforce normal authentication here.. maybe only enforce client cert auth if enabled?
 	// ctx,err := authenticate(srv.config, ctx, false)
@@ -286,7 +292,7 @@ func (srv *Server) Authenticate(ctx context.Context, req *spb_jwt.AuthenticateRe
 				return &spb_jwt.AuthenticateResponse{Token: tokenResp(req.Username, roles)}, nil
 			}
 		}
-		
+
 	}
 	return nil, status.Errorf(codes.PermissionDenied, "Invalid Username or Password")
 
@@ -314,7 +320,7 @@ func (srv *Server) Refresh(ctx context.Context, req *spb_jwt.RefreshRequest) (*s
 	if time.Unix(claims.ExpiresAt, 0).Sub(time.Now()) > JwtRefreshInt {
 		return nil, status.Errorf(codes.InvalidArgument, "Invalid JWT Token")
 	}
-	
+
 	return &spb_jwt.RefreshResponse{Token: tokenResp(claims.Username, claims.Roles)}, nil
 
 }
@@ -357,13 +363,13 @@ func (srv *Server) CopyConfig(ctx context.Context, req *spb.CopyConfigRequest) (
 		return nil, err
 	}
 	log.V(1).Info("gNOI: Sonic CopyConfig")
-	
+
 	resp := &spb.CopyConfigResponse{
 		Output: &spb.SonicOutput {
 
 		},
 	}
-	
+
 	reqstr, err := json.Marshal(req)
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
@@ -373,12 +379,12 @@ func (srv *Server) CopyConfig(ctx context.Context, req *spb.CopyConfigRequest) (
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
-	
+
 	err = json.Unmarshal(jsresp, resp)
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
-	
+
 	return resp, nil
 }
 
@@ -388,7 +394,7 @@ func (srv *Server) ShowTechsupport(ctx context.Context, req *spb.TechsupportRequ
 		return nil, err
 	}
 	log.V(1).Info("gNOI: Sonic ShowTechsupport")
-	
+
 	resp := &spb.TechsupportResponse{
 		Output: &spb.TechsupportResponse_Output {
 
@@ -404,13 +410,13 @@ func (srv *Server) ShowTechsupport(ctx context.Context, req *spb.TechsupportRequ
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
-	
+
 	err = json.Unmarshal(jsresp, resp)
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
-	
-	
+
+
 	return resp, nil
 }
 
@@ -420,7 +426,7 @@ func (srv *Server) ImageInstall(ctx context.Context, req *spb.ImageInstallReques
 		return nil, err
 	}
 	log.V(1).Info("gNOI: Sonic ImageInstall")
-	
+
 	resp := &spb.ImageInstallResponse{
 		Output: &spb.SonicOutput {
 
@@ -436,13 +442,13 @@ func (srv *Server) ImageInstall(ctx context.Context, req *spb.ImageInstallReques
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
-	
+
 	err = json.Unmarshal(jsresp, resp)
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
 
-	
+
 	return resp, nil
 }
 
@@ -452,7 +458,7 @@ func (srv *Server) ImageRemove(ctx context.Context, req *spb.ImageRemoveRequest)
 		return nil, err
 	}
 	log.V(1).Info("gNOI: Sonic ImageRemove")
-	
+
 	resp := &spb.ImageRemoveResponse{
 		Output: &spb.SonicOutput {
 
@@ -468,7 +474,7 @@ func (srv *Server) ImageRemove(ctx context.Context, req *spb.ImageRemoveRequest)
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
-	
+
 	err = json.Unmarshal(jsresp, resp)
 	if err != nil {
 		return nil, status.Error(codes.Unknown, err.Error())
@@ -482,7 +488,7 @@ func (srv *Server) ImageDefault(ctx context.Context, req *spb.ImageDefaultReques
 		return nil, err
 	}
 	log.V(1).Info("gNOI: Sonic ImageDefault")
-	
+
 	resp := &spb.ImageDefaultResponse{
 		Output: &spb.SonicOutput {
 
@@ -504,6 +510,6 @@ func (srv *Server) ImageDefault(ctx context.Context, req *spb.ImageDefaultReques
 		return nil, status.Error(codes.Unknown, err.Error())
 	}
 
-	
+
 	return resp, nil
 }

gnmi_server/server.go

@@ -22,6 +22,7 @@ import (
 	gnmi_extpb "github.com/openconfig/gnmi/proto/gnmi_ext"
 	gnoi_system_pb "github.com/openconfig/gnoi/system"
 	gnoi_file_pb "github.com/openconfig/gnoi/file"
+	gnoi_containerz_pb "github.com/openconfig/gnoi/containerz"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
@@ -70,6 +71,14 @@ type SystemServer struct {
 	gnoi_system_pb.UnimplementedSystemServer
 }
 
+// ContainerzServer is the server API for Containerz service.
+// All implementations must embed UnimplementedContainerzServer
+// for forward compatibility
+type ContainerzServer struct {
+	*Server
+	gnoi_containerz_pb.UnimplementedContainerzServer
+}
+
 type AuthTypes map[string]bool
 
 // Config is a collection of values for Server
@@ -180,6 +189,7 @@ func NewServer(config *Config, opts []grpc.ServerOption) (*Server, error) {
 
 	fileSrv := &FileServer{Server: srv}
 	systemSrv := &SystemServer{Server: srv}
+	containerzSrv := &ContainerzServer{Server: srv}
 
 	var err error
 	if srv.config.Port < 0 {
@@ -194,6 +204,7 @@ func NewServer(config *Config, opts []grpc.ServerOption) (*Server, error) {
 	if srv.config.EnableTranslibWrite || srv.config.EnableNativeWrite {
 		gnoi_system_pb.RegisterSystemServer(srv.s, systemSrv)
 		gnoi_file_pb.RegisterFileServer(srv.s, fileSrv)
+		gnoi_containerz_pb.RegisterContainerzServer(srv.s, containerzSrv)
 	}
 	if srv.config.EnableTranslibWrite {
 		spb_gnoi.RegisterSonicServiceServer(srv.s, srv)