opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-24 23:41:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): aliyun zone name fix

Browse Source
This commit is contained in:
TangBin
2020-11-24 09:30:21 +08:00
parent bb091a3cb8
commit 85324cadf3
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/aliyun/region.go
+1 -8
View File
@@ -230,14 +230,7 @@ func (self *SRegion) GetId() string {
func (self *SRegion) GetName() string {
if self.GetCloudEnv() == ALIYUN_FINANCE_CLOUDENV && !strings.Contains(self.LocalName, "金融") {
i := strings.Index(self.LocalName, "可用")
var localname string
if i >= 0 {
localname = self.LocalName[0:i] + "金融云 " + self.LocalName[i:]
} else {
localname = self.LocalName + " 金融云"
}
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_ALIYUN_CN, 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)
}
pkg/multicloud/aliyun/zone.go
+9 -1
View File
@@ -141,7 +141,15 @@ func (self *SZone) GetId() string {
func (self *SZone) GetName() string {
if self.region.GetCloudEnv() == ALIYUN_FINANCE_CLOUDENV && !strings.Contains(self.LocalName, "金融") {
return fmt.Sprintf("%s %s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName, "金融云")
i := strings.Index(self.LocalName, "可用")
var localname string
if i >= 0 {
localname = self.LocalName[0:i] + "金融云 " + self.LocalName[i:]
} else {
localname = self.LocalName + " 金融云"
}
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_ALIYUN_CN, localname)
} else {
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_ALIYUN_CN, self.LocalName)
}