From 6a7e1ccaf4077c23b25395e9427113ac3830e3dd Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Thu, 2 Apr 2020 17:26:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=8E=E4=B8=BA=E4=BA=91rds=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=87=AA=E8=BA=AB=E7=9A=84=E5=AD=98=E5=82=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/apis/compute/dbinstance_const.go | 8 ++++---- pkg/multicloud/huawei/dbinstance.go | 21 +-------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/pkg/apis/compute/dbinstance_const.go b/pkg/apis/compute/dbinstance_const.go index 52c46e0c31..49b7b90589 100644 --- a/pkg/apis/compute/dbinstance_const.go +++ b/pkg/apis/compute/dbinstance_const.go @@ -108,10 +108,10 @@ const ( ALIYUN_DBINSTANCE_STORAGE_TYPE_CLOUD_SSD = "cloud_ssd" //SSD云盘 //华为云存储类型 - HUAWEI_DBINSTANCE_STORAGE_TYPE_SSD = "SSD" //超高IO云硬盘 - HUAWEI_DBINSTANCE_STORAGE_TYPE_SAS = "SAS" //高IO云硬盘 - HUAWEI_DBINSTANCE_STORAGE_TYPE_SATA = "SATA" //普通IO云硬盘 - + HUAWEI_DBINSTANCE_STORAGE_TYPE_ULTRAHIGH = "ULTRAHIGH" //超高IO云硬盘 + HUAWEI_DBINSTANCE_STORAGE_TYPE_ULTRAHIGHPRO = "ULTRAHIGHPRO" + HUAWEI_DBINSTANCE_STORAGE_TYPE_COMMON = "COMMON" + HUAWEI_DBINSTANCE_STORAGE_TYPE_HIGH = "HIGH" ) var ( diff --git a/pkg/multicloud/huawei/dbinstance.go b/pkg/multicloud/huawei/dbinstance.go index 5dfa07b419..0fcd4b1b48 100644 --- a/pkg/multicloud/huawei/dbinstance.go +++ b/pkg/multicloud/huawei/dbinstance.go @@ -192,14 +192,6 @@ func (rds *SDBInstance) GetExpiredAt() time.Time { } func (rds *SDBInstance) GetStorageType() string { - switch rds.Volume.Type { - case "COMMON": - return api.STORAGE_HUAWEI_SATA - case "HIGH": - return api.STORAGE_HUAWEI_SAS - case "ULTRAHIGH": - return api.STORAGE_HUAWEI_SSD - } return rds.Volume.Type } @@ -419,17 +411,6 @@ func (region *SRegion) CreateIDBInstance(desc *cloudprovider.SManagedDBInstanceC for _, zone := range zones { zoneIds = append(zoneIds, zone.GetId()) } - storageType := "" - switch desc.StorageType { - case api.STORAGE_HUAWEI_SAS: - storageType = "HIGH" - case api.STORAGE_HUAWEI_SSD: - storageType = "ULTRAHIGH" - case api.STORAGE_HUAWEI_SATA: - storageType = "COMMON" - default: - return nil, fmt.Errorf("Unknown storage type %s", desc.StorageType) - } params := map[string]interface{}{ "region": region.ID, @@ -440,7 +421,7 @@ func (region *SRegion) CreateIDBInstance(desc *cloudprovider.SManagedDBInstanceC }, "password": desc.Password, "volume": map[string]interface{}{ - "type": storageType, + "type": desc.StorageType, "size": desc.DiskSizeGB, }, "vpc_id": desc.VpcId,