X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=mecm%2Fmepm%2Fapplcm%2Fk8shelm%2Fpkg%2Fplugin%2Fgrpcserver.go;h=d2b4d4ae8354e4f892d37ab4ff422805dd648fb3;hb=b53813aee440d6c0a936a2827e5c304cf60d8be1;hp=6ec356f6277136b0ad8aa52429cd8d3bac0503aa;hpb=e363ff9fc0e8d060a3da53e44a95f1dbf0d84d3f;p=ealt-edge.git diff --git a/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go b/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go index 6ec356f..d2b4d4a 100644 --- a/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go +++ b/mecm/mepm/applcm/k8shelm/pkg/plugin/grpcserver.go @@ -18,17 +18,18 @@ package plugin import ( "bytes" "context" + "io" + "k8shelm/internal/lcmservice" + "net" + "os" + "strconv" + "github.com/sirupsen/logrus" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" _ "google.golang.org/grpc/encoding/gzip" "google.golang.org/grpc/status" - "io" - "k8shelm/internal/lcmservice" - "net" - "os" - "strconv" ) // GRPC server @@ -69,17 +70,16 @@ func (s *ServerGRPC) Listen() (err error) { // Listen announces on the network address listener, err = net.Listen("tcp", ":"+strconv.Itoa(s.port)) if err != nil { - s.logger.Fatalf("failed to listen on port: %s. Err: %s", s.port, err) - return err + s.logger.Fatalf("failed to listen on specified port") } - s.logger.Infof("Server started listening on port ", s.port) + s.logger.Infof("Server started listening on specified port") // Secure connection if asked if s.certificate != "" && s.key != "" { grpcCreds, err = credentials.NewServerTLSFromFile( s.certificate, s.key) if err != nil { - s.logger.Fatalf("failed to create tls grpc server using cert %s and key: %s. Err: %s", s.certificate, s.key, err) + s.logger.Fatalf("failed to create tls grpc server using given cert and key") } grpcOpts = append(grpcOpts, grpc.Creds(grpcCreds)) } @@ -104,20 +104,19 @@ func (s *ServerGRPC) Query(ctx context.Context, req *lcmservice.QueryRequest) (r // Input validation if (req.GetHostIp() == "") || (req.GetWorkloadId() == "") { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Nil input HostIp: %s or workloadId: %s. " + - "Err: %s", req.GetHostIp(), req.GetWorkloadId(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "HostIP & WorkloadId can't be null", err)) } // Create HELM Client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig for HostIp can't be found: %s. " + - "Err: %s", req.GetHostIp(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. "+ + "Err: %s", err)) } // Query Chart r, err := hc.queryChart(req.GetWorkloadId()) - if (err != nil) { + if err != nil { return nil, s.logError(status.Errorf(codes.NotFound, "Chart not found for workloadId: %s. Err: %s", req.GetWorkloadId(), err)) } @@ -131,21 +130,20 @@ func (s *ServerGRPC) Query(ctx context.Context, req *lcmservice.QueryRequest) (r func (s *ServerGRPC) Terminate(ctx context.Context, req *lcmservice.TerminateRequest) (resp *lcmservice.TerminateResponse, err error) { // Input validation if (req.GetHostIp() == "") || (req.GetWorkloadId() == "") { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Nil input HostIp: %s or workloadId: %s. " + - "Err: %s", req.GetHostIp(), req.GetWorkloadId(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "HostIP & WorkloadId can't be null", err)) } // Create HELM client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig for HostIp can't be found: %s. " + - "Err: %s", req.GetHostIp(), err)) + return nil, s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to given Edge can't be found. "+ + "Err: %s", err)) } // Uninstall chart err = hc.uninstallChart(req.GetWorkloadId()) - if (err != nil) { + if err != nil { resp = &lcmservice.TerminateResponse{ Status: "Failure", } @@ -170,11 +168,11 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er } hostIP := req.GetHostIp() - s.logger.Info("Recieved instantiate request for host ", hostIP) + s.logger.Infof("Recieved instantiate request") // Host validation - if (hostIP == "") { - return s.logError(status.Errorf(codes.InvalidArgument, "Nil input for HostIp: %s Err: %s", req.GetHostIp(), err)) + if hostIP == "" { + return s.logError(status.Errorf(codes.InvalidArgument, "HostIP & WorkloadId can't be null", err)) } // Receive package @@ -185,11 +183,11 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er return err } - s.logger.Info("Waiting to receive more data") + s.logger.Debug("Waiting to receive more data") req, err := stream.Recv() if err == io.EOF { - s.logger.Info("No more data") + s.logger.Debug("No more data") break } if err != nil { @@ -199,7 +197,7 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er // Receive chunk and write to helm package chunk := req.GetPackage() - s.logger.Info("Recieved chunk") + s.logger.Infof("Recieved chunk") _, err = helmPkg.Write(chunk) if err != nil { @@ -210,8 +208,8 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er // Create HELM client hc, err := NewHelmClient(req.GetHostIp(), s.logger) if os.IsNotExist(err) { - return s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig for HostIp can't be found: %s. " + - "Err: %s", req.GetHostIp(), err)) + return s.logError(status.Errorf(codes.InvalidArgument, "Kubeconfig corresponding to edge can't be found. "+ + "Err: %s", err)) } relName, err := hc.installChart(helmPkg) @@ -219,17 +217,18 @@ func (s *ServerGRPC) Instantiate(stream lcmservice.AppLCM_InstantiateServer) (er var res lcmservice.InstantiateResponse res.WorkloadId = relName - if (err != nil) { + if err != nil { res.Status = "Failure" + s.logger.Infof("Instantiation Failed") } else { res.Status = "Success" + s.logger.Infof("Successful Instantiation") } err = stream.SendAndClose(&res) if err != nil { return s.logError(status.Errorf(codes.Unknown, "cannot send response: %v", err)) } - s.logger.Info("Successful Instantiation") return } @@ -249,4 +248,4 @@ func (s *ServerGRPC) logError(err error) error { s.logger.Errorf("Error Information: ", err) } return err -} \ No newline at end of file +}