From 413d292c22c8695415eca96ebb2aa59672388b96 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Fri, 12 Jun 2020 16:01:46 +0800 Subject: [PATCH] fix host set reserved resource func name --- pkg/apis/compute/host.go | 2 ++ pkg/compute/models/hosts.go | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/apis/compute/host.go b/pkg/apis/compute/host.go index e5e1f567d2..8b6e68326b 100644 --- a/pkg/apis/compute/host.go +++ b/pkg/apis/compute/host.go @@ -168,6 +168,8 @@ type HostDetails struct { // reserved resource for isolated device ReservedResourceForGpu IsolatedDeviceReservedResourceInput `json:"reserved_resource_for_gpu"` + // isolated device count + IsolatedDeviceCount int // 标签 Metadata map[string]string `json:"metadata"` diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 95625d817f..20a32853b4 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -2605,17 +2605,18 @@ func (self *SHost) getMoreDetails(ctx context.Context, out api.HostDetails, show out.AllowHealthCheck = true } - if rs := self.GetReservedResourceForIsolatedDevice(); rs != nil { + if count, rs := self.GetReservedResourceForIsolatedDevice(); rs != nil { out.ReservedResourceForGpu = *rs + out.IsolatedDeviceCount = count } return out } -func (self *SHost) GetReservedResourceForIsolatedDevice() *api.IsolatedDeviceReservedResourceInput { +func (self *SHost) GetReservedResourceForIsolatedDevice() (int, *api.IsolatedDeviceReservedResourceInput) { if devs := IsolatedDeviceManager.FindByHost(self.Id); len(devs) == 0 { - return nil + return -1, nil } else { - return self.GetDevsReservedResource(devs) + return len(devs), self.GetDevsReservedResource(devs) } } @@ -5205,7 +5206,7 @@ func (host *SHost) AllowPerformSetReservedResourceForIsolatedDevice( return db.IsDomainAllowPerform(userCred, host, "set-reserved-resource-for-isolated-device") } -func (host *SHost) PerfromSetReservedResourceForIsolatedDevice( +func (host *SHost) PerformSetReservedResourceForIsolatedDevice( ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, input api.IsolatedDeviceReservedResourceInput, ) (jsonutils.JSONObject, error) {