Merge pull request #949 from seokho-son/main

Fix object information for MCIS provisioning

src/api/grpc/server/mcis/control.go

@@ -265,7 +265,7 @@ func (s *MCISService) CreateMcisVMGroup(ctx context.Context, req *pb.TbVmGroupCr
 		return nil, gc.ConvGrpcStatusErr(err, "", "MCISService.CreateMcisVMGroup()")
 	}
 
-	result, err := mcis.CorePostMcisGroupVm(req.NsId, req.McisId, &mcisObj)
+	result, err := mcis.CreateMcisGroupVm(req.NsId, req.McisId, &mcisObj)
 	if err != nil {
 		return nil, gc.ConvGrpcStatusErr(err, "", "MCISService.CreateMcisVMGroup()")
 	}

src/api/rest/server/mcis/control.go

@@ -632,7 +632,7 @@ func RestPostMcisVmGroup(c echo.Context) error {
 	}
 	common.PrintJsonPretty(*vmInfoData)
 
-	result, err := mcis.CorePostMcisGroupVm(nsId, mcisId, vmInfoData)
+	result, err := mcis.CreateMcisGroupVm(nsId, mcisId, vmInfoData)
 	if err != nil {
 		mapA := map[string]string{"message": err.Error()}
 		return c.JSON(http.StatusInternalServerError, &mapA)

src/core/mcir/image.go

@@ -30,11 +30,13 @@ import (
 	validator "github.com/go-playground/validator/v10"
 )
 
+// SpiderImageReqInfoWrapper struct is ...
 type SpiderImageReqInfoWrapper struct { // Spider
 	ConnectionName string
 	ReqInfo        SpiderImageInfo
 }
 
+// SpiderImageInfo struct is ...
 type SpiderImageInfo struct { // Spider
 	// Fields for request
 	Name string
@@ -46,13 +48,15 @@ type SpiderImageInfo struct { // Spider
 	KeyValueList []common.KeyValue
 }
 
+// TbImageReq struct is for image create request
 type TbImageReq struct {
 	Name           string `json:"name" validate:"required"`
 	ConnectionName string `json:"connectionName" validate:"required"`
 	CspImageId     string `json:"cspImageId" validate:"required"`
 	Description    string `json:"description"`
 }
 
+// TbImageReqStructLevelValidation func is for Validation
 func TbImageReqStructLevelValidation(sl validator.StructLevel) {
 
 	u := sl.Current().Interface().(TbImageReq)
@@ -64,6 +68,7 @@ func TbImageReqStructLevelValidation(sl validator.StructLevel) {
 	}
 }
 
+// TbImageInfo struct is for image object
 type TbImageInfo struct {
 	Namespace            string            `json:"namespace,omitempty"` // required to save in RDB
 	Id                   string            `json:"id,omitempty"`
@@ -277,6 +282,7 @@ func RegisterImageWithInfo(nsId string, content *TbImageInfo) (TbImageInfo, erro
 	return *content, nil
 }
 
+// SpiderImageList is struct for Spider Image List
 type SpiderImageList struct {
 	Image []SpiderImageInfo `json:"image"`
 }

src/core/mcis/provisioning.go

@@ -481,61 +481,6 @@ func CorePostMcisVm(nsId string, mcisId string, vmInfoData *TbVmInfo) (*TbVmInfo
 	return vmInfoData, nil
 }
 
-// CorePostMcisGroupVm is func for a wrapper for CreateMcisGroupVm
-func CorePostMcisGroupVm(nsId string, mcisId string, vmReq *TbVmReq) (*TbMcisInfo, error) {
-
-	err := common.CheckString(nsId)
-	if err != nil {
-		temp := &TbMcisInfo{}
-		common.CBLog.Error(err)
-		return temp, err
-	}
-
-	err = common.CheckString(mcisId)
-	if err != nil {
-		temp := &TbMcisInfo{}
-		common.CBLog.Error(err)
-		return temp, err
-	}
-
-	// returns InvalidValidationError for bad validation input, nil or ValidationErrors ( []FieldError )
-	err = validate.Struct(vmReq)
-	if err != nil {
-
-		// this check is only needed when your code could produce
-		// an invalid value for validation such as interface with nil
-		// value most including myself do not usually have code like this.
-		if _, ok := err.(*validator.InvalidValidationError); ok {
-			fmt.Println(err)
-			return nil, err
-		}
-
-		// for _, err := range err.(validator.ValidationErrors) {
-
-		// 	fmt.Println(err.Namespace()) // can differ when a custom TagNameFunc is registered or
-		// 	fmt.Println(err.Field())     // by passing alt name to ReportError like below
-		// 	fmt.Println(err.StructNamespace())
-		// 	fmt.Println(err.StructField())
-		// 	fmt.Println(err.Tag())
-		// 	fmt.Println(err.ActualTag())
-		// 	fmt.Println(err.Kind())
-		// 	fmt.Println(err.Type())
-		// 	fmt.Println(err.Value())
-		// 	fmt.Println(err.Param())
-		// 	fmt.Println()
-		// }
-
-		return nil, err
-	}
-
-	content, err := CreateMcisGroupVm(nsId, mcisId, vmReq)
-	if err != nil {
-		common.CBLog.Error(err)
-		return content, err
-	}
-	return content, nil
-}
-
 // CreateMcisGroupVm is func to create MCIS groupVM
 func CreateMcisGroupVm(nsId string, mcisId string, vmRequest *TbVmReq) (*TbMcisInfo, error) {
 
@@ -907,6 +852,8 @@ func CreateMcis(nsId string, req *TbMcisReq) (*TbMcisInfo, error) {
 			vmInfoData.VmUserAccount = k.VmUserAccount
 			vmInfoData.VmUserPassword = k.VmUserPassword
 
+			vmInfoData.Label = k.Label
+
 			// Avoid concurrent requests to CSP.
 			time.Sleep(time.Duration(i) * time.Second)
 
@@ -973,12 +920,12 @@ func CreateMcis(nsId string, req *TbMcisReq) (*TbMcisInfo, error) {
 		}
 	}
 
-	mcisTmp, err = GetMcisObject(nsId, mcisId)
+	mcisResult, err := GetMcisInfo(nsId, mcisId)
 	if err != nil {
 		common.CBLog.Error(err)
 		return nil, err
 	}
-	return &mcisTmp, nil
+	return mcisResult, nil
 }
 
 // CreateMcisDynamic is func to create MCIS obeject and deploy requested VMs in a dynamic way