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

fix(region): convert to kvm overwirte networks (#20667)

Browse Source
This commit is contained in:
wanyaoqi
2024-06-27 20:39:11 +08:00
committed by GitHub
parent 836a8d66e2
commit c5f0dcedb5
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_convert.go
+7 -14
View File
@@ -21,6 +21,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/netutils"
"yunion.io/x/pkg/utils"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -134,12 +135,8 @@ func (self *SGuest) ConvertEsxiToKvm(ctx context.Context, userCred mcclient.Toke
createInput.Networks[i].Network = ""
createInput.Networks[i].Wire = ""
if data.Networks != nil {
if data.Networks[i].Network != "" {
createInput.Networks[i].Network = data.Networks[i].Network
}
if data.Networks[i].Address != "" {
createInput.Networks[i].Address = data.Networks[i].Address
}
createInput.Networks[i].Network = data.Networks[i].Network
createInput.Networks[i].Address = data.Networks[i].Address
if data.Networks[i].Schedtags != nil {
createInput.Networks[i].Schedtags = data.Networks[i].Schedtags
}
@@ -207,8 +204,8 @@ func (self *SGuest) createConvertedServer(ctx context.Context, userCred mcclient
if self.Hypervisor == api.HYPERVISOR_ESXI {
// change drivers so as to bootable in KVM
for i := range createInput.Disks {
if createInput.Disks[i].Driver != "ide" {
createInput.Disks[i].Driver = "ide"
if !utils.IsInStringArray(createInput.Disks[i].Driver, []string{api.DISK_DRIVER_VIRTIO, api.DISK_DRIVER_PVSCSI, api.DISK_DRIVER_IDE}) {
createInput.Disks[i].Driver = api.DISK_DRIVER_IDE
}
createInput.Disks[i].Format = ""
createInput.Disks[i].Backend = ""
@@ -240,15 +237,11 @@ func (self *SGuest) createConvertedServer(ctx context.Context, userCred mcclient
createInput.Networks[i].Network = ""
createInput.Networks[i].Wire = ""
if data.Networks != nil {
if data.Networks[i].Network != "" {
createInput.Networks[i].Network = data.Networks[i].Network
}
if data.Networks[i].Address != "" {
createInput.Networks[i].Address = data.Networks[i].Address
}
if data.Networks[i].Schedtags != nil {
createInput.Networks[i].Schedtags = data.Networks[i].Schedtags
}
createInput.Networks[i].Address = data.Networks[i].Address
createInput.Networks[i].Network = data.Networks[i].Network
}
}