From 7360c544ff89816fad59fedb8e1c7ab05d1bc52d Mon Sep 17 00:00:00 2001 From: TangBin Date: Fri, 13 Nov 2020 11:56:32 +0800 Subject: [PATCH 1/2] aliyun finance cloud region add suffix --- pkg/multicloud/aliyun/region.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/multicloud/aliyun/region.go b/pkg/multicloud/aliyun/region.go index e465231eb7..43a1dcb830 100644 --- a/pkg/multicloud/aliyun/region.go +++ b/pkg/multicloud/aliyun/region.go @@ -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 { From 576120f153703a7fc74ee063a3732482beb88dc0 Mon Sep 17 00:00:00 2001 From: TangBin Date: Fri, 13 Nov 2020 14:43:41 +0800 Subject: [PATCH 2/2] aliyun finance cloud zone add suffix --- pkg/multicloud/aliyun/zone.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/multicloud/aliyun/zone.go b/pkg/multicloud/aliyun/zone.go index 9aea632176..a320b9d511 100644 --- a/pkg/multicloud/aliyun/zone.go +++ b/pkg/multicloud/aliyun/zone.go @@ -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 {