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

Merge pull request #6080 from ioito/automated-cherry-pick-of-#6079-upstream-release-3.2

Browse Source 
Automated cherry pick of #6079: fix: gcp fake region status
This commit is contained in:
Zexi Li
2020-04-27 17:17:46 +08:00
committed by GitHub
parent 1212dad5b3 06d47bba43
commit 95aa4a91fe
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/google/region.go
+21 -1
View File
@@ -81,7 +81,7 @@ func (region *SRegion) GetProvider() string {
}
func (region *SRegion) GetStatus() string {
if region.Status == "UP" {
if region.Status == "UP" || utils.IsInStringArray(region.Name, MultiRegions) || utils.IsInStringArray(region.Name, DualRegions) {
return api.CLOUD_REGION_STATUS_INSERVER
}
return api.CLOUD_REGION_STATUS_OUTOFSERVICE
@@ -733,6 +733,10 @@ func (region *SRegion) GetCapabilities() []string {
}
func (region *SRegion) GetIDBInstances() ([]cloudprovider.ICloudDBInstance, error) {
if utils.IsInStringArray(region.Name, MultiRegions) || utils.IsInStringArray(region.Name, DualRegions) {
return []cloudprovider.ICloudDBInstance{}, nil
}
instances, err := region.GetDBInstances(0, "")
if err != nil {
return nil, errors.Wrap(err, "GetDBInstances")
@@ -746,6 +750,10 @@ func (region *SRegion) GetIDBInstances() ([]cloudprovider.ICloudDBInstance, erro
}
func (region *SRegion) GetIDBInstanceById(instanceId string) (cloudprovider.ICloudDBInstance, error) {
if utils.IsInStringArray(region.Name, MultiRegions) || utils.IsInStringArray(region.Name, DualRegions) {
return nil, cloudprovider.ErrNotFound
}
instance, err := region.GetDBInstance(instanceId)
if err != nil {
return nil, errors.Wrapf(err, "GetDBInstance(%s)", instanceId)
@@ -754,6 +762,10 @@ func (region *SRegion) GetIDBInstanceById(instanceId string) (cloudprovider.IClo
}
func (region *SRegion) GetIDBInstanceBackups() ([]cloudprovider.ICloudDBInstanceBackup, error) {
if utils.IsInStringArray(region.Name, MultiRegions) || utils.IsInStringArray(region.Name, DualRegions) {
return []cloudprovider.ICloudDBInstanceBackup{}, nil
}
instances, err := region.GetDBInstances(0, "")
if err != nil {
return nil, errors.Wrap(err, "GetDBInstances")
@@ -774,6 +786,10 @@ func (region *SRegion) GetIDBInstanceBackups() ([]cloudprovider.ICloudDBInstance
}
func (region *SRegion) GetIDBInstanceBackupById(backupId string) (cloudprovider.ICloudDBInstanceBackup, error) {
if utils.IsInStringArray(region.Name, MultiRegions) || utils.IsInStringArray(region.Name, DualRegions) {
return nil, cloudprovider.ErrNotFound
}
backup, err := region.GetDBInstanceBackup(backupId)
if err != nil {
return nil, errors.Wrapf(err, "GetDBInstanceBackup(%s)", backupId)
@@ -782,6 +798,10 @@ func (region *SRegion) GetIDBInstanceBackupById(backupId string) (cloudprovider.
}
func (region *SRegion) CreateIDBInstance(desc *cloudprovider.SManagedDBInstanceCreateConfig) (cloudprovider.ICloudDBInstance, error) {
if utils.IsInStringArray(region.Name, MultiRegions) || utils.IsInStringArray(region.Name, DualRegions) {
return nil, cloudprovider.ErrNotSupported
}
rds, err := region.CreateDBInstance(desc)
if err != nil {
return nil, errors.Wrap(err, "CreateDBInstance")