From adaf389bf81c818e65d30940e2b74f5a87c95bbb Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Tue, 23 Mar 2021 17:42:33 +0800 Subject: [PATCH] fix: remove qcloud region and zone prefix --- pkg/multicloud/qcloud/region.go | 4 ++-- pkg/multicloud/qcloud/zone.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/multicloud/qcloud/region.go b/pkg/multicloud/qcloud/region.go index ef62f30d5b..486d6bab5e 100644 --- a/pkg/multicloud/qcloud/region.go +++ b/pkg/multicloud/qcloud/region.go @@ -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 diff --git a/pkg/multicloud/qcloud/zone.go b/pkg/multicloud/qcloud/zone.go index 6aaafe0b18..49e13521ad 100644 --- a/pkg/multicloud/qcloud/zone.go +++ b/pkg/multicloud/qcloud/zone.go @@ -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