fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16330 from swordqiu/automated-cherry-pick-of-#16327-upstream-release-3.8

Browse Source 
Automated cherry pick of #16327: fix: host remove netif also remove baremnetal server netif
This commit is contained in:
Zexi Li
2023-04-03 13:33:56 +08:00
committed by GitHub
parent 9882832478 2858c11ce6
commit f471b608e9
1 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pkg/compute/models/hosts.go
View File

@@ -4793,12 +4793,6 @@ func (self *SHost) RemoveNetif(ctx context.Context, userCred mcclient.TokenCrede
if err != nil {
return errors.Wrap(err, "netif.Remove")
}
if nicType == api.NIC_TYPE_ADMIN && self.AccessMac == mac {
err := self.setAccessMac(userCred, "")
if err != nil {
return errors.Wrap(err, "self.setAccessMac")
}
}
if wire != nil {
others := self.GetNetifsOnWire(wire)
if len(others) == 0 {
@@ -4806,10 +4800,40 @@ func (self *SHost) RemoveNetif(ctx context.Context, userCred mcclient.TokenCrede
if hw != nil {
db.OpsLog.LogDetachEvent(ctx, self, wire, userCred, jsonutils.NewString(fmt.Sprintf("disable netif %s", self.AccessMac)))
log.Debugf("Detach host wire because of remove netif %s", netif.Mac)
return hw.Delete(ctx, userCred)
err := hw.Delete(ctx, userCred)
if err != nil {
return errors.Wrap(err, "remove host wire")
}
}
}
}
// is this a converted host?
if self.HostType == api.HOST_TYPE_HYPERVISOR && self.IsBaremetal {
guests, err := self.GetGuests()
if err != nil {
return errors.Wrap(err, "GetGuests")
}
for i := range guests {
guest := &guests[i]
if guest.Hypervisor == api.HYPERVISOR_BAREMETAL {
gn, err := guest.GetGuestnetworkByMac(netif.Mac)
if err != nil && errors.Cause(err) != sql.ErrNoRows {
return errors.Wrap(err, "GetGuestnetworkByMac")
} else if gn != nil {
err = gn.Detach(ctx, userCred)
if err != nil {
return errors.Wrap(err, "detach guest nic")
}
}
}
}
}
if nicType == api.NIC_TYPE_ADMIN && self.AccessMac == mac {
err := self.setAccessMac(userCred, "")
if err != nil {
return errors.Wrap(err, "setAccessMac")
}
}
self.ClearSchedDescCache()
return nil
}