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): multi cdrom interface not compatible (#15222)

Browse Source 
Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>

Signed-off-by: wanyaoqi <d3lx.yq@gmail.com>
This commit is contained in:
wanyaoqi
2022-10-24 05:42:49 +08:00
committed by GitHub
parent 214b51298c
commit 0d701003e3
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_queries.go
+8 -4
View File
@@ -223,8 +223,10 @@ func (manager *SGuestManager) FetchCustomizeColumns(
if gcds != nil {
for i := range rows {
for _, gcd := range gcds[guestIds[i]] {
t := api.Cdrom{Ordinal: gcd.Ordinal, Detail: gcd.GetDetails()}
rows[i].Cdrom = append(rows[i].Cdrom, t)
if details := gcd.GetDetails(); len(details) > 0 {
t := api.Cdrom{Ordinal: gcd.Ordinal, Detail: details}
rows[i].Cdrom = append(rows[i].Cdrom, t)
}
}
}
}
@@ -234,8 +236,10 @@ func (manager *SGuestManager) FetchCustomizeColumns(
if gfloppys != nil {
for i := range rows {
for _, gfl := range gfloppys[guestIds[i]] {
t := api.Floppy{Ordinal: gfl.Ordinal, Detail: gfl.GetDetails()}
rows[i].Floppy = append(rows[i].Floppy, t)
if details := gfl.GetDetails(); len(details) > 0 {
t := api.Floppy{Ordinal: gfl.Ordinal, Detail: details}
rows[i].Floppy = append(rows[i].Floppy, t)
}
}
}
}
pkg/compute/models/guests.go
+3
View File
@@ -4556,6 +4556,9 @@ func (self *SGuest) GetJsonDescAtHypervisor(ctx context.Context, host *SHost) *a
cdromDesc := cdrom.getJsonDesc()
desc.Cdroms = append(desc.Cdroms, cdromDesc)
}
if len(desc.Cdroms) > 0 {
desc.Cdrom = desc.Cdroms[0]
}
//floppy
floppys, _ := self.getFloppys()