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

Merge pull request #8783 from tb365/bugfix/tb-aliyunfin-region-name

Browse Source 
aliyun finance cloud region add suffix
This commit is contained in:
Zexi Li
2020-11-15 08:00:20 +08:00
committed by GitHub
parent b81f658d49 576120f153
commit 448ce6379e
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/aliyun/region.go
+6 -2
View File
@@ -211,7 +211,11 @@ func (self *SRegion) GetId() string {
}
func (self *SRegion) GetName() string {
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName)
if self.GetCloudEnv() == ALIYUN_FINANCE_CLOUDENV && !strings.Contains(self.LocalName, "金融") {
return fmt.Sprintf("%s %s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName, "金融云")
} else {
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName)
}
}
func (self *SRegion) GetGlobalId() string {
@@ -227,7 +231,7 @@ func (self *SRegion) GetProvider() string {
}
func (self *SRegion) GetCloudEnv() string {
return ""
return self.client.cloudEnv
}
func (self *SRegion) GetGeographicInfo() cloudprovider.SGeographicInfo {
pkg/multicloud/aliyun/zone.go
+6 -1
View File
@@ -16,6 +16,7 @@ package aliyun
import (
"fmt"
"strings"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -139,7 +140,11 @@ func (self *SZone) GetId() string {
}
func (self *SZone) GetName() string {
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName)
if self.region.GetCloudEnv() == ALIYUN_FINANCE_CLOUDENV && !strings.Contains(self.LocalName, "金融") {
return fmt.Sprintf("%s %s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName, "金融云")
} else {
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName)
}
}
func (self *SZone) GetGlobalId() string {