opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

storage fix

Browse Source
This commit is contained in:
TangBin
2019-03-21 19:56:34 +08:00
parent 37cc23a28f
commit b046c7cf31
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/storage_const.go
+7 -3
View File
@@ -44,8 +44,11 @@ const (
STORAGE_OPENSTACK_ISCSI = "iscsi"
// Ucloud storage type
STORAGE_UCLOUD_SATA = "SATA" // 普通盘
STORAGE_UCLOUD_SSD = "SSD" // SSD盘
STORAGE_UCLOUD_CLOUD_NORMAL = "CLOUD_NORMAL" // 普通云盘
STORAGE_UCLOUD_CLOUD_SSD = "CLOUD_SSD" // SSD云盘
STORAGE_UCLOUD_LOCAL_NORMAL = "LOCAL_NORMAL" // 普通本地盘
STORAGE_UCLOUD_LOCAL_SSD = "LOCAL_SSD" // SSD本地盘
STORAGE_UCLOUD_EXCLUSIVE_LOCAL_DISK = "EXCLUSIVE_LOCAL_DISK" // 独享本地盘
)
const (
@@ -75,7 +78,8 @@ var (
STORAGE_GP2_SSD, STORAGE_IO1_SSD, STORAGE_ST1_HDD, STORAGE_SC1_HDD, STORAGE_STANDARD_HDD,
STORAGE_LOCAL_BASIC, STORAGE_LOCAL_SSD, STORAGE_CLOUD_BASIC, STORAGE_CLOUD_PREMIUM,
STORAGE_HUAWEI_SSD, STORAGE_HUAWEI_SAS, STORAGE_HUAWEI_SATA,
STORAGE_OPENSTACK_ISCSI, STORAGE_UCLOUD_SATA, STORAGE_UCLOUD_SSD,
STORAGE_OPENSTACK_ISCSI, STORAGE_UCLOUD_CLOUD_NORMAL, STORAGE_UCLOUD_CLOUD_SSD,
STORAGE_UCLOUD_LOCAL_NORMAL, STORAGE_UCLOUD_LOCAL_SSD, STORAGE_UCLOUD_EXCLUSIVE_LOCAL_DISK,
}
STORAGE_LIMITED_TYPES = []string{STORAGE_LOCAL, STORAGE_BAREMETAL, STORAGE_NAS, STORAGE_RBD, STORAGE_NFS}
pkg/compute/models/storages.go
+5 -2
View File
@@ -65,8 +65,11 @@ const (
STORAGE_OPENSTACK_ISCSI = api.STORAGE_OPENSTACK_ISCSI
// Ucloud storage type
STORAGE_UCLOUD_SATA = api.STORAGE_UCLOUD_SATA // 普通盘
STORAGE_UCLOUD_SSD = api.STORAGE_UCLOUD_SSD // SSD盘
STORAGE_UCLOUD_CLOUD_NORMAL = api.STORAGE_UCLOUD_CLOUD_NORMAL
STORAGE_UCLOUD_CLOUD_SSD = api.STORAGE_UCLOUD_CLOUD_SSD
STORAGE_UCLOUD_LOCAL_NORMAL = api.STORAGE_UCLOUD_LOCAL_NORMAL
STORAGE_UCLOUD_LOCAL_SSD = api.STORAGE_UCLOUD_LOCAL_SSD
STORAGE_UCLOUD_EXCLUSIVE_LOCAL_DISK = api.STORAGE_UCLOUD_EXCLUSIVE_LOCAL_DISK
)
const (
pkg/util/ucloud/storage.go
+3 -3
View File
@@ -59,12 +59,12 @@ func (self *SStorage) GetIDisks() ([]cloudprovider.ICloudDisk, error) {
filtedDisks := make([]SDisk, 0)
for _, disk := range disks {
// ssd 盘
if self.storageType == models.STORAGE_UCLOUD_SSD && strings.Contains(disk.DiskType, models.STORAGE_UCLOUD_SSD) {
if self.storageType == models.STORAGE_UCLOUD_CLOUD_SSD && strings.Contains(disk.DiskType, "SSD") {
filtedDisks = append(filtedDisks, disk)
}
// 普通盘
if self.storageType == models.STORAGE_UCLOUD_SATA && !strings.Contains(disk.DiskType, models.STORAGE_UCLOUD_SSD) {
if self.storageType == models.STORAGE_UCLOUD_CLOUD_NORMAL && strings.Contains(disk.DiskType, "SSD") {
filtedDisks = append(filtedDisks, disk)
}
}
@@ -82,7 +82,7 @@ func (self *SStorage) GetStorageType() string {
}
func (self *SStorage) GetMediumType() string {
if self.storageType == models.STORAGE_UCLOUD_SSD {
if self.storageType == models.STORAGE_UCLOUD_CLOUD_SSD {
return models.DISK_TYPE_SSD
} else {
return models.DISK_TYPE_ROTATE
pkg/util/ucloud/zone.go
+2 -2
View File
@@ -11,8 +11,8 @@ import (
// https://docs.ucloud.cn/api/udisk-api/create_udisk
// UDisk 类型: DataDisk（普通数据盘），SSDDataDisk（SSD数据盘），默认值（DataDisk）
var StorageTypes = []string{
models.STORAGE_UCLOUD_SATA,
models.STORAGE_UCLOUD_SSD,
models.STORAGE_UCLOUD_CLOUD_NORMAL,
models.STORAGE_UCLOUD_CLOUD_SSD,
}
type SZone struct {