opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2813 from swordqiu/hotfix/qj-esxi-vm-fail-find-virtualconsole-ip

Browse Source 
fix: fail to find host ip in virtual console vnic
This commit is contained in:
yunion-ci-robot
2019-09-09 16:27:20 +08:00
committed by GitHub
parent b153175c65 94c160b9db
commit 9ce20cd694
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/esxi/host.go
+11 -4
View File
@@ -320,14 +320,21 @@ func (self *SHost) fetchNicInfo() []SHostNicInfo {
nicInfoList = append(nicInfoList, info)
}
vnics := make([]types.HostVirtualNic, 0)
if len(moHost.Config.Network.Vnic) > 0 {
vnics = append(vnics, moHost.Config.Network.Vnic...)
}
if len(moHost.Config.Network.ConsoleVnic) > 0 {
vnics = append(vnics, moHost.Config.Network.ConsoleVnic...)
}
findMaster := false
for _, nic := range moHost.Config.Network.Vnic {
for _, nic := range vnics {
mac := netutils.FormatMacAddr(nic.Spec.Mac)
pnic := findHostNicByMac(nicInfoList, mac)
if pnic != nil {
findMaster = true
pnic.IpAddr = nic.Spec.Ip.IpAddress
if nic.Spec.Portgroup == "Management Network" {
if nic.Spec.Portgroup == "Management Network" || nic.Spec.Portgroup == "Service Console" {
pnic.NicType = api.NIC_TYPE_ADMIN
}
pnic.LinkUp = true
@@ -339,8 +346,8 @@ func (self *SHost) fetchNicInfo() []SHostNicInfo {
// no match pnic found for master nic
// choose the first pnic
pnic := &nicInfoList[0]
for _, nic := range moHost.Config.Network.Vnic {
if nic.Spec.Portgroup == "Management Network" {
for _, nic := range vnics {
if nic.Spec.Portgroup == "Management Network" || nic.Spec.Portgroup == "Service Console" {
pnic.NicType = api.NIC_TYPE_ADMIN
pnic.IpAddr = nic.Spec.Ip.IpAddress
pnic.LinkUp = true