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

Merge pull request #5218 from rainzm/automated-cherry-pick-of-#5217-upstream-release-3.1

Browse Source 
Automated cherry pick of #5217: fix: Storage filter not work for Esxi
This commit is contained in:
Zexi Li
2020-02-21 16:44:38 +08:00
committed by GitHub
parent d41c3bfea7 c727334bc4
commit b29d6d4f4e
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/esxi.go
+2
View File
@@ -54,6 +54,8 @@ func (self *SESXiGuestDriver) DoScheduleMemoryFilter() bool { return true }
func (self *SESXiGuestDriver) DoScheduleSKUFilter() bool { return false }
func (self *SESXiGuestDriver) DoScheduleStorageFilter() bool { return true }
func (self *SESXiGuestDriver) GetHypervisor() string {
return api.HYPERVISOR_ESXI
}
pkg/multicloud/esxi/host.go
+9 -5
View File
@@ -565,12 +565,16 @@ func (self *SHost) getStorages() []*SHostStorageAdapterInfo {
}
func (self *SHost) GetStorageSizeMB() int {
size := 0
storages := self.GetStorageInfo()
for i := 0; i < len(storages); i += 1 {
size += storages[i].Size
storages, err := self.GetIStorages()
if err != nil {
log.Errorf("SHost.GetStorageSizeMB: SHost.GetIStorages: %s", err)
return 0
}
return size
var size int64
for _, stor := range storages {
size += stor.GetCapacityMB()
}
return int(size)
}
func (self *SHost) GetStorageType() string {