Merge pull request #1629 from powerkimhub/enhance/nlb-vm-optional-creation-and-fixes

[KeyPair/NLB] Allow NLB creation without VMs and resolve multi-CSP bugs

Author: cb-spider

api-runtime/common-runtime/NLBManager.go

@@ -372,30 +372,33 @@ func CreateNLB(connectionName string, rsType string, reqInfo cres.NLBInfo, IDTra
 	reqInfo.VpcIID = getDriverIID(cres.IID{NameId: vpcIIDInfo.NameId, SystemId: vpcIIDInfo.SystemId})
 	//+++++++++++++++++++++++++++++++++++++++++++
 
+	// VMGroup.VMs is optional, skip if not provided
 	vmList := reqInfo.VMGroup.VMs
-	for idx, vmIID := range *vmList {
-		var vmIIDInfo VMIIDInfo
-		if os.Getenv("PERMISSION_BASED_CONTROL_MODE") != "" {
-			var iidInfoList []*VMIIDInfo
-			err = getAuthIIDInfoList(connectionName, &iidInfoList)
-			if err != nil {
-				cblog.Error(err)
-				return nil, err
-			}
-			castedIIDInfo, err := getAuthIIDInfo(&iidInfoList, vmIID.NameId)
-			if err != nil {
-				cblog.Error(err)
-				return nil, err
-			}
-			vmIIDInfo = *castedIIDInfo.(*VMIIDInfo)
-		} else {
-			err = infostore.GetByConditions(&vmIIDInfo, CONNECTION_NAME_COLUMN, connectionName, NAME_ID_COLUMN, vmIID.NameId)
-			if err != nil {
-				cblog.Error(err)
-				return nil, err
+	if vmList != nil && len(*vmList) > 0 {
+		for idx, vmIID := range *vmList {
+			var vmIIDInfo VMIIDInfo
+			if os.Getenv("PERMISSION_BASED_CONTROL_MODE") != "" {
+				var iidInfoList []*VMIIDInfo
+				err = getAuthIIDInfoList(connectionName, &iidInfoList)
+				if err != nil {
+					cblog.Error(err)
+					return nil, err
+				}
+				castedIIDInfo, err := getAuthIIDInfo(&iidInfoList, vmIID.NameId)
+				if err != nil {
+					cblog.Error(err)
+					return nil, err
+				}
+				vmIIDInfo = *castedIIDInfo.(*VMIIDInfo)
+			} else {
+				err = infostore.GetByConditions(&vmIIDInfo, CONNECTION_NAME_COLUMN, connectionName, NAME_ID_COLUMN, vmIID.NameId)
+				if err != nil {
+					cblog.Error(err)
+					return nil, err
+				}
 			}
+			(*vmList)[idx] = getDriverIID(cres.IID{NameId: vmIIDInfo.NameId, SystemId: vmIIDInfo.SystemId})
 		}
-		(*vmList)[idx] = getDriverIID(cres.IID{NameId: vmIIDInfo.NameId, SystemId: vmIIDInfo.SystemId})
 	}
 	//+++++++++++++++++++++++++++++++++++++++++++
 
@@ -1692,6 +1695,12 @@ func GetVMGroupHealthInfo(connectionName string, nlbName string) (*cres.HealthIn
 
 func setVMUserIIDwithSystemId(connectionName string, nlbName string, healthInfo *cres.HealthInfo) error {
 	var errList []string
+
+	// If AllVMs is nil or empty, return early (no VMs to process)
+	if healthInfo.AllVMs == nil || len(*healthInfo.AllVMs) == 0 {
+		return nil
+	}
+
 	vmIIDList := healthInfo.AllVMs
 	for idx, vm := range *vmIIDList {
 		foundFlag := false

api-runtime/rest-runtime/NLBRest.go

@@ -152,7 +152,7 @@ type NLBCreateRequest struct {
 		Type          string                   `json:"Type" validate:"required" example:"PUBLIC"`  // PUBLIC(V) | INTERNAL
 		Scope         string                   `json:"Scope" validate:"required" example:"REGION"` // REGION(V) | GLOBAL
 		Listener      NLBListenerCreateRequest `json:"Listener" validate:"required"`
-		VMGroup       NLBVMGroupRequest        `json:"VMGroup" validate:"required"`
+		VMGroup       NLBVMGroupRequest        `json:"VMGroup,omitempty" validate:"omitempty"`
 		HealthChecker NLBHealthCheckerRequest  `json:"HealthChecker" validate:"required"`
 		TagList       []cres.KeyValue          `json:"TagList,omitempty" validate:"omitempty"`
 	} `json:"ReqInfo" validate:"required"`
@@ -193,10 +193,18 @@ func CreateNLB(c echo.Context) error {
 		Type:     req.ReqInfo.Type,
 		Scope:    req.ReqInfo.Scope,
 		Listener: convertListenerInfo(req.ReqInfo.Listener),
-		VMGroup:  convertVMGroupInfo(req.ReqInfo.VMGroup),
 		TagList:  req.ReqInfo.TagList,
 		//HealthChecker: below
 	}
+
+	// VMGroup is optional - if not provided, use Listener's Protocol and Port with empty VMs
+	if req.ReqInfo.VMGroup.Protocol != "" || req.ReqInfo.VMGroup.Port != "" || len(req.ReqInfo.VMGroup.VMs) > 0 {
+		reqInfo.VMGroup = convertVMGroupInfo(req.ReqInfo.VMGroup)
+	} else {
+		// Use Listener's Protocol and Port for VMGroup when not specified
+		emptyVMList := []cres.IID{}
+		reqInfo.VMGroup = cres.VMGroupInfo{req.ReqInfo.Listener.Protocol, req.ReqInfo.Listener.Port, &emptyVMList, "", nil}
+	}
 	healthChecker, err := convertHealthCheckerInfo(req.ReqInfo.HealthChecker)
 	if err != nil {
 		return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
@@ -224,7 +232,7 @@ func convertListenerInfo(listenerReq NLBListenerCreateRequest) cres.ListenerInfo
 type NLBVMGroupRequest struct {
 	Protocol string   `json:"Protocol" validate:"required" example:"TCP"` // TCP|UDP
 	Port     string   `json:"Port" validate:"required" example:"22"`      // Listener Port or 1-65535
-	VMs      []string `json:"VMs" validate:"required" example:"vm-01", "vm-02"`
+	VMs      []string `json:"VMs,omitempty" validate:"omitempty" example:"vm-01,vm-02"`
 }
 
 func convertVMGroupInfo(vgInfo NLBVMGroupRequest) cres.VMGroupInfo {