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

fix(region): avoid qcloud sync local disk error

Browse Source
This commit is contained in:
Qu Xuan
2020-12-02 20:24:59 +08:00
parent 7a2f64cc7d
commit 39d86735f5
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/qcloud/instance.go
+2 -2
View File
@@ -238,7 +238,7 @@ func (self *SInstance) getVpc() (*SVpc, error) {
func (self *SInstance) GetIDisks() ([]cloudprovider.ICloudDisk, error) {
idisks := make([]cloudprovider.ICloudDisk, 0)
if utils.IsInStringArray(self.SystemDisk.DiskType, self.host.zone.localstorages) {
if utils.IsInStringArray(strings.ToUpper(self.SystemDisk.DiskType), QCLOUD_LOCAL_STORAGE_TYPES) {
storage := SLocalStorage{zone: self.host.zone, storageType: self.SystemDisk.DiskType}
disk := SLocalDisk{
storage: &storage,
@@ -251,7 +251,7 @@ func (self *SInstance) GetIDisks() ([]cloudprovider.ICloudDisk, error) {
}
for i := 0; i < len(self.DataDisks); i++ {
if utils.IsInStringArray(self.DataDisks[i].DiskType, self.host.zone.localstorages) {
if utils.IsInStringArray(strings.ToUpper(self.DataDisks[i].DiskType), QCLOUD_LOCAL_STORAGE_TYPES) {
storage := SLocalStorage{zone: self.host.zone, storageType: self.DataDisks[i].DiskType}
disk := SLocalDisk{
storage: &storage,
pkg/multicloud/qcloud/localstorage.go
+7
View File
@@ -24,6 +24,13 @@ import (
"yunion.io/x/onecloud/pkg/cloudprovider"
)
var QCLOUD_LOCAL_STORAGE_TYPES = []string{
"LOCAL_NVME",
"LOCAL_BASIC",
"LOCAL_SSD",
"LOCAL_PRO",
}
type SLocalStorage struct {
zone *SZone
storageType string