From fdcb0148c3f08ce0c2b0f285e2284d2b46970186 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 22 Oct 2018 19:49:59 +0800 Subject: [PATCH] fix: server list and details no is_gpu field --- pkg/compute/models/guests.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index 9c952822f5..c3b42f105e 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -914,6 +914,12 @@ func (self *SGuest) GetCustomizeColumns(ctx context.Context, userCred mcclient.T extra.Add(jsonutils.NewString(timeutils.FullIsoTime(pendingDeletedAt)), "auto_delete_at") } + isGpu := jsonutils.JSONFalse + if self.isGpu() { + isGpu = jsonutils.JSONTrue + } + extra.Add(isGpu, "is_gpu") + return self.moreExtraInfo(extra) } @@ -965,6 +971,13 @@ func (self *SGuest) GetExtraDetails(ctx context.Context, userCred mcclient.Token } extra.Add(jsonutils.NewString(self.getAdminSecurityRules()), "admin_security_rules") } + + isGpu := jsonutils.JSONFalse + if self.isGpu() { + isGpu = jsonutils.JSONTrue + } + extra.Add(isGpu, "is_gpu") + return self.moreExtraInfo(extra) } @@ -1166,6 +1179,10 @@ func (self *SGuest) getAdminSecurityRules() string { } } +func (self *SGuest) isGpu() bool { + return len(self.GetIsolatedDevices()) != 0 +} + func (self *SGuest) GetIsolatedDevices() []SIsolatedDevice { return IsolatedDeviceManager.findAttachedDevicesOfGuest(self) }