From b9a788018460e811717552c19281a0a4e8533b4e Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 9 Jan 2019 18:33:54 +0800 Subject: [PATCH] server-list add disks info and isolated_device info --- pkg/compute/models/guests.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 8f3e7f02f5..423d8f86e0 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -1201,6 +1201,9 @@ func (self *SGuest) moreExtraInfo(extra *jsonutils.JSONDict) *jsonutils.JSONDict } }*/ + extra.Add(self.getDisksInfoDetails(), "disks_info") + extra.Add(jsonutils.NewString(self.getIsolatedDeviceDetails()), "isolated_devices") + host := self.GetHost() if host != nil { info := host.getCloudProviderInfo() @@ -1225,7 +1228,6 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token extra.Add(jsonutils.NewString(self.getNetworksDetails()), "networks") extra.Add(jsonutils.NewString(self.getDisksDetails()), "disks") - extra.Add(self.getDisksInfoDetails(), "disks_info") extra.Add(jsonutils.NewInt(int64(self.getDiskSize())), "disk") cdrom := self.getCdrom() if cdrom != nil { @@ -1241,7 +1243,6 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token extra.Add(jsonutils.NewString(strings.Join(self.getIPs(), ",")), "ips") extra.Add(jsonutils.NewString(self.getSecurityGroupsRules()), "security_rules") - extra.Add(jsonutils.NewString(self.getIsolatedDeviceDetails()), "isolated_devices") osName := self.GetOS() if len(osName) > 0 { extra.Add(jsonutils.NewString(osName), "os_name")