diff --git a/pkg/apis/compute/cloudregions_const.go b/pkg/apis/compute/cloudregions_const.go index 90319f16b3..276f44ad65 100644 --- a/pkg/apis/compute/cloudregions_const.go +++ b/pkg/apis/compute/cloudregions_const.go @@ -177,6 +177,9 @@ const ( // 尼日利亚 CITY_LAGOS = "Lagos" //拉哥斯 + // 巴林王国 (中东国家) + CITY_BAHRAIN = "Bahrain" // 巴林 + // 越南 CITY_HO_CHI_MINH = "Ho Chi Minh" //??? @@ -207,4 +210,5 @@ const ( COUNTRY_CODE_NO = "NO" //挪威 COUNTRY_CODE_MX = "MX" //墨西哥 COUNTRY_CODE_CL = "CL" //智利 + COUNTRY_CODE_BH = "BH" //巴林 ) diff --git a/pkg/multicloud/aws/latitude_and_longitude.go b/pkg/multicloud/aws/latitude_and_longitude.go index 20051c11a9..7b63487e62 100644 --- a/pkg/multicloud/aws/latitude_and_longitude.go +++ b/pkg/multicloud/aws/latitude_and_longitude.go @@ -43,4 +43,7 @@ var LatitudeAndLongitude = map[string]cloudprovider.SGeographicInfo{ "eu-north-1": {Latitude: 59.1946, Longitude: 18.47, City: api.CITY_STOCKHOLM, CountryCode: api.COUNTRY_CODE_SE}, "sa-east-1": {Latitude: -23.5505199, Longitude: -46.63330939999999, City: api.CITY_SAO_PAULO, CountryCode: api.COUNTRY_CODE_BR}, "us-gov-west-1": {Latitude: 37.09024, Longitude: -95.712891, City: api.CITY_US_GOV_WEST, CountryCode: api.COUNTRY_CODE_US}, + + "af-south-1": {Latitude: -33.9152209, Longitude: 18.3758904, City: api.CITY_CAPE_TOWN, CountryCode: api.COUNTRY_CODE_ZA}, + "me-south-1": {Latitude: 25.9408826, Longitude: 50.4474957, City: api.CITY_BAHRAIN, CountryCode: api.COUNTRY_CODE_BH}, } diff --git a/pkg/multicloud/aws/region.go b/pkg/multicloud/aws/region.go index 0a63f03b19..688489265f 100644 --- a/pkg/multicloud/aws/region.go +++ b/pkg/multicloud/aws/region.go @@ -66,12 +66,15 @@ var RegionLocations = map[string]string{ "eu-central-1": "欧洲(法兰克福)", "eu-west-1": "欧洲(爱尔兰)", "eu-west-2": "欧洲(伦敦)", + "eu-south-1": "欧洲(米兰)", "eu-west-3": "欧洲(巴黎)", "eu-north-1": "欧洲(斯德哥尔摩)", "me-south-1": "中东(巴林)", "sa-east-1": "南美洲(圣保罗)", "us-gov-west-1": "AWS GovCloud(美国西部)", "us-gov-east-1": "AWS GovCloud(美国东部)", + + "af-south-1": "非洲(开普敦)", } var RegionLocationsEN = map[string]string{ @@ -79,9 +82,10 @@ var RegionLocationsEN = map[string]string{ "us-east-2": "US East (Ohio)", "us-west-1": "US West (N. California)", "us-west-2": "US West (Oregon)", - "af-south-1": "Cape Town", + "af-south-1": "Africa (Cape Town)", "ap-east-1": "Asia Pacific (Hong Kong)", "ap-south-1": "Asia Pacific (Mumbai)", + "ap-northeast-3": "Asia Pacific (Osaka)", "ap-northeast-2": "Asia Pacific (Seoul)", "ap-southeast-1": "Asia Pacific (Singapore)", "ap-southeast-2": "Asia Pacific (Sydney)",