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

fix: 避免创建时localstorage为空导致校验失败

Browse Source
This commit is contained in:
Qu Xuan
2019-12-30 15:32:16 +08:00
parent 53972dc1ec
commit 5adb63b93f
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/qcloud/zone.go
+13
View File
@@ -21,6 +21,7 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/utils"
api "yunion.io/x/onecloud/pkg/apis/compute"
@@ -175,6 +176,12 @@ func (self *SZone) GetIStorages() ([]cloudprovider.ICloudStorage, error) {
}
func (self *SZone) getLocalStorageByCategory(category string) (*SLocalStorage, error) {
if len(self.localstorages) == 0 {
err := self.fetchStorages()
if err != nil {
return nil, errors.Wrap(err, "fetchStorages")
}
}
if utils.IsInStringArray(strings.ToUpper(category), self.localstorages) {
return &SLocalStorage{zone: self, storageType: strings.ToUpper(category)}, nil
}
@@ -182,6 +189,12 @@ func (self *SZone) getLocalStorageByCategory(category string) (*SLocalStorage, e
}
func (self *SZone) validateStorageType(category string) error {
if len(self.localstorages) == 0 || len(self.cloudstorages) == 0 {
err := self.fetchStorages()
if err != nil {
return errors.Wrap(err, "fetchStorages")
}
}
if utils.IsInStringArray(strings.ToUpper(category), self.localstorages) || utils.IsInStringArray(strings.ToUpper(category), self.cloudstorages) {
return nil
}