[CLI] support gateway host

Author: zhengya

cli/ctl/example/domain_additional_resource.yaml

@@ -31,7 +31,7 @@ hosts:
   domain_uuid: xxxx        # required
   vinterfaces:             # optional. network interfaces
   - mac: xx:xx:xx:xx:xx:xx # required
-    subnet_uuid: xxxx      # required
+    subnet_uuid: xxxx      # optional
     ips: ["x.x.x.x"]       # optional
 
 # chost, cloud/legacy host, including vm (virtual mechine) and bm (bare metal)
@@ -74,4 +74,4 @@ lbs:
     port: xx               # required
     lb_target_servers:     # optional, lb target servers
     - ip: x.x.x.x          # required
-      port: xx             # required
+      port: xx             # required

server/controller/cloud/model/model.go

@@ -144,7 +144,7 @@ type VInterface struct {
 	TapMac          string `json:"tap_mac"`
 	DeviceLcuuid    string `json:"device_lcuuid" binding:"required"`
 	DeviceType      int    `json:"device_type" binding:"required"`
-	NetworkLcuuid   string `json:"network_lcuuid" binding:"required"`
+	NetworkLcuuid   string `json:"network_lcuuid"`
 	VPCLcuuid       string `json:"vpc_lcuuid"` // TODO not used
 	RegionLcuuid    string `json:"region_lcuuid" binding:"required"`
 	SubDomainLcuuid string `json:"sub_domain_lcuuid"`

server/controller/http/service/resource/domain_additional_resource.go

@@ -253,6 +253,15 @@ func generateToolDataSet(additionalRsc model.AdditionalResource) (map[string]*ad
 		toolDS.hostIPToUUID[host.IP] = host.UUID
 		toolDS.additionalHosts = append(toolDS.additionalHosts, host)
 		for _, vif := range host.VInterfaces {
+			if vif.SubnetUUID == "" {
+				if len(vif.IPs) != 0 {
+					return nil, servicecommon.NewError(
+						common.RESOURCE_NOT_FOUND,
+						fmt.Sprintf("host (name: %s) vinterface (mac: %s) subnet (uuid: %s) not found", host.Name, vif.Mac, vif.SubnetUUID),
+					)
+				}
+				continue
+			}
 			if _, ok := toolDS.subnetUUIDToType[vif.SubnetUUID]; !ok {
 				return nil, servicecommon.NewError(
 					common.RESOURCE_NOT_FOUND,

server/controller/recorder/updater/vinterface.go

@@ -51,17 +51,21 @@ func (i *VInterface) getDiffBaseByCloudItem(cloudItem *cloudmodel.VInterface) (d
 }
 
 func (i *VInterface) generateDBItemToAdd(cloudItem *cloudmodel.VInterface) (*mysql.VInterface, bool) {
-	networkID, exists := i.cache.ToolDataSet.GetNetworkIDByLcuuid(cloudItem.NetworkLcuuid)
-	if !exists {
-		if i.domainToolDataSet != nil {
-			networkID, exists = i.domainToolDataSet.GetNetworkIDByLcuuid(cloudItem.NetworkLcuuid)
-		}
+	var networkID int
+	if cloudItem.NetworkLcuuid != "" {
+		var exists bool
+		networkID, exists = i.cache.ToolDataSet.GetNetworkIDByLcuuid(cloudItem.NetworkLcuuid)
 		if !exists {
-			log.Errorf(resourceAForResourceBNotFound(
-				common.RESOURCE_TYPE_NETWORK_EN, cloudItem.NetworkLcuuid,
-				common.RESOURCE_TYPE_VINTERFACE_EN, cloudItem.Lcuuid,
-			))
-			return nil, false
+			if i.domainToolDataSet != nil {
+				networkID, exists = i.domainToolDataSet.GetNetworkIDByLcuuid(cloudItem.NetworkLcuuid)
+			}
+			if !exists {
+				log.Errorf(resourceAForResourceBNotFound(
+					common.RESOURCE_TYPE_NETWORK_EN, cloudItem.NetworkLcuuid,
+					common.RESOURCE_TYPE_VINTERFACE_EN, cloudItem.Lcuuid,
+				))
+				return nil, false
+			}
 		}
 	}
 	deviceID, exists := i.cache.ToolDataSet.GetDeviceIDByDeviceLcuuid(cloudItem.DeviceType, cloudItem.DeviceLcuuid)