opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 02:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix host set reserved resource func name

Browse Source
This commit is contained in:
wanyaoqi
2020-06-12 16:10:05 +08:00
parent f4b7044767
commit 413d292c22
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/host.go
+2
View File
@@ -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"`
pkg/compute/models/hosts.go
+6 -5
View File
@@ -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) {