From 39d86735f579a5c5b8a70169137e14d7e8260613 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Wed, 2 Dec 2020 20:24:59 +0800 Subject: [PATCH] fix(region): avoid qcloud sync local disk error --- pkg/multicloud/qcloud/instance.go | 4 ++-- pkg/multicloud/qcloud/localstorage.go | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/multicloud/qcloud/instance.go b/pkg/multicloud/qcloud/instance.go index 0a06dd7809..532766ea8e 100644 --- a/pkg/multicloud/qcloud/instance.go +++ b/pkg/multicloud/qcloud/instance.go @@ -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, diff --git a/pkg/multicloud/qcloud/localstorage.go b/pkg/multicloud/qcloud/localstorage.go index ab47f7cbf4..a00a0387da 100644 --- a/pkg/multicloud/qcloud/localstorage.go +++ b/pkg/multicloud/qcloud/localstorage.go @@ -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