[gNOI] Added initial implementation of gNOI.OS Install RPC.

Author: VSuryaprasad-HCL

common_utils/context.go

@@ -43,6 +43,9 @@ const (
 	GNMI_SET
 	GNMI_SET_FAIL
 	GNOI_REBOOT
+	GNOI_OS_ACTIVATE
+	GNOI_OS_INSTALL
+	GNOI_OS_VERIFY
 	DBUS
 	DBUS_FAIL
 	DBUS_APPLY_PATCH_DB
@@ -77,6 +80,12 @@ func (c CounterType) String() string {
 		return "GNMI set fail"
 	case GNOI_REBOOT:
 		return "GNOI reboot"
+	case GNOI_OS_ACTIVATE:
+		return "GNOI OS Activate"
+	case GNOI_OS_INSTALL:
+		return "GNOI OS Install"
+	case GNOI_OS_VERIFY:
+		return "GNOI OS VERIFY"
 	case DBUS:
 		return "DBUS"
 	case DBUS_FAIL:

gnmi_server/gnoi.go

@@ -6,14 +6,12 @@ import (
 	jwt "github.com/dgrijalva/jwt-go"
 	log "github.com/golang/glog"
 	gnoi_file_pb "github.com/openconfig/gnoi/file"
-	gnoi_os_pb "github.com/openconfig/gnoi/os"
 	spb "github.com/sonic-net/sonic-gnmi/proto/gnoi"
 	spb_jwt "github.com/sonic-net/sonic-gnmi/proto/gnoi/jwt"
 	ssc "github.com/sonic-net/sonic-gnmi/sonic_service_client"
 	transutil "github.com/sonic-net/sonic-gnmi/transl_utils"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"os"
 	"os/user"
 	"strconv"
 	"strings"
@@ -96,98 +94,6 @@ func (srv *FileServer) Get(req *gnoi_file_pb.GetRequest, stream gnoi_file_pb.Fil
 	return status.Errorf(codes.Unimplemented, "")
 }
 
-func (srv *OSServer) Verify(ctx context.Context, req *gnoi_os_pb.VerifyRequest) (*gnoi_os_pb.VerifyResponse, error) {
-	_, err := authenticate(srv.config, ctx, "gnoi", false)
-	if err != nil {
-		log.V(2).Infof("Failed to authenticate: %v", err)
-		return nil, err
-	}
-
-	log.V(1).Info("gNOI: Verify")
-	dbus, err := ssc.NewDbusClient()
-	if err != nil {
-		log.V(2).Infof("Failed to create dbus client: %v", err)
-		return nil, err
-	}
-	defer dbus.Close()
-
-	image_json, err := dbus.ListImages()
-	if err != nil {
-		log.V(2).Infof("Failed to list images: %v", err)
-		return nil, err
-	}
-
-	images := make(map[string]interface{})
-	err = json.Unmarshal([]byte(image_json), &images)
-	if err != nil {
-		log.V(2).Infof("Failed to unmarshal images: %v", err)
-		return nil, err
-	}
-
-	current, exists := images["current"]
-	if !exists {
-		return nil, status.Errorf(codes.Internal, "Key 'current' not found in images")
-	}
-	current_image, ok := current.(string)
-	if !ok {
-		return nil, status.Errorf(codes.Internal, "Failed to assert current image as string")
-	}
-	resp := &gnoi_os_pb.VerifyResponse{
-		Version: current_image,
-	}
-	return resp, nil
-}
-
-func (srv *OSServer) Activate(ctx context.Context, req *gnoi_os_pb.ActivateRequest) (*gnoi_os_pb.ActivateResponse, error) {
-	_, err := authenticate(srv.config, ctx, "gnoi" /*writeAccess=*/, true)
-	if err != nil {
-		log.Errorf("Failed to authenticate: %v", err)
-		return nil, err
-	}
-
-	log.Infof("gNOI: Activate")
-	image := req.GetVersion()
-	log.Infof("Requested to activate image %s", image)
-
-	dbus, err := ssc.NewDbusClient()
-	if err != nil {
-		log.Errorf("Failed to create dbus client: %v", err)
-		return nil, err
-	}
-	defer dbus.Close()
-
-	var resp gnoi_os_pb.ActivateResponse
-	err = dbus.ActivateImage(image)
-	if err != nil {
-		log.Errorf("Failed to activate image %s: %v", image, err)
-		image_not_exists := os.IsNotExist(err) ||
-			(strings.Contains(strings.ToLower(err.Error()), "not") &&
-				strings.Contains(strings.ToLower(err.Error()), "exist"))
-		if image_not_exists {
-			// Image does not exist.
-			resp.Response = &gnoi_os_pb.ActivateResponse_ActivateError{
-				ActivateError: &gnoi_os_pb.ActivateError{
-					Type:   gnoi_os_pb.ActivateError_NON_EXISTENT_VERSION,
-					Detail: err.Error(),
-				},
-			}
-		} else {
-			// Other error.
-			resp.Response = &gnoi_os_pb.ActivateResponse_ActivateError{
-				ActivateError: &gnoi_os_pb.ActivateError{
-					Type:   gnoi_os_pb.ActivateError_UNSPECIFIED,
-					Detail: err.Error(),
-				},
-			}
-		}
-		return &resp, nil
-	}
-
-	log.Infof("Successfully activated image %s", image)
-	resp.Response = &gnoi_os_pb.ActivateResponse_ActivateOk{}
-	return &resp, nil
-}
-
 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)