Merge pull request #10487 from ioito/hotfix/qx-qcloud-prefix

fix: remove qcloud region and zone prefix
This commit is contained in:
Zexi Li
2021-03-24 12:22:18 +08:00
committed by GitHub
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -220,11 +220,11 @@ func (self *SRegion) GetId() string {
}
func (self *SRegion) GetName() string {
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_QCLOUD_CN, self.RegionName)
return self.RegionName
}
func (self *SRegion) GetI18n() cloudprovider.SModelI18nTable {
en := fmt.Sprintf("%s %s", CLOUD_PROVIDER_QCLOUD_EN, self.RegionName)
en := self.RegionName
table := cloudprovider.SModelI18nTable{}
table["name"] = cloudprovider.NewSModelI18nEntry(self.GetName()).CN(self.GetName()).EN(en)
return table
+2 -2
View File
@@ -62,11 +62,11 @@ func (self *SZone) GetId() string {
}
func (self *SZone) GetName() string {
return fmt.Sprintf("%s %s", CLOUD_PROVIDER_QCLOUD_CN, self.ZoneName)
return self.ZoneName
}
func (self *SZone) GetI18n() cloudprovider.SModelI18nTable {
en := fmt.Sprintf("%s %s", CLOUD_PROVIDER_QCLOUD_EN, self.ZoneName)
en := self.ZoneName
table := cloudprovider.SModelI18nTable{}
table["name"] = cloudprovider.NewSModelI18nEntry(self.GetName()).CN(self.GetName()).EN(en)
return table