Merge pull request #1232 from ioito/hotfix/qx-host-access-ip

fix(esxi): host access ip sync

Author: ioito

pkg/multicloud/esxi/host.go

@@ -390,20 +390,24 @@ func mask2len(mask string) int8 {
 }
 
 func (host *SHost) isVnicAdmin(nic types.HostVirtualNic) bool {
+	return host.isIpAdmin(nic.Spec.Ip.IpAddress)
+}
+
+func (host *SHost) isIpAdmin(ip string) bool {
 	if len(host.masterIp) > 0 {
-		if host.masterIp == nic.Spec.Ip.IpAddress {
+		if host.masterIp == ip {
 			return true
 		} else {
 			return false
 		}
 	}
-	exist, err := host.manager.IsHostIpExists(nic.Spec.Ip.IpAddress)
+	exist, err := host.manager.IsHostIpExists(ip)
 	if err != nil {
-		log.Errorf("IsHostIpExists %s fail %s", nic.Spec.Ip.IpAddress, err)
+		log.Errorf("IsHostIpExists %s fail %s", ip, err)
 		return false
 	}
 	if exist {
-		host.masterIp = nic.Spec.Ip.IpAddress
+		host.masterIp = ip
 		return true
 	}
 	return false
@@ -444,15 +448,11 @@ func (host *SHost) fetchNicInfo(debug bool) []sHostNicInfo {
 	}
 
 	for _, nic := range vnics {
-		gateway := ""
-		if nic.Spec.IpRouteSpec != nil && nic.Spec.IpRouteSpec.IpRouteConfig.GetHostIpRouteConfig() != nil {
-			gateway = nic.Spec.IpRouteSpec.IpRouteConfig.GetHostIpRouteConfig().DefaultGateway
-		}
 		// log.Debugf("vnic %d: %s %#v", i, jsonutils.Marshal(nic), nic)
 		mac := netutils.FormatMacAddr(nic.Spec.Mac)
 		pnic := findHostNicByMac(nicInfoList, mac)
 		if pnic != nil {
-			if len(pnic.IpAddr) > 0 && len(gateway) == 0 {
+			if len(pnic.IpAddr) > 0 && host.isIpAdmin(pnic.IpAddr) {
 				continue
 			}
 			// findMaster = true

pkg/multicloud/esxi/mobase.go

@@ -83,7 +83,7 @@ func (self *SManagedObject) fetchPath() []string {
 func (self *SManagedObject) GetPath() []string {
 	if self.path == nil {
 		self.path = self.fetchPath()
-		log.Errorf("fetch path: %s", self.path)
+		log.Debugf("fetch path: %s", self.path)
 	}
 	return self.path
 }