From 5b9c7ba9f2da6ed89e1497b7f64db6dcceaa14a3 Mon Sep 17 00:00:00 2001 From: Qu Xuan Date: Fri, 28 Feb 2020 11:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0azure=20region=20city?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/apis/compute/cloudregions_const.go | 4 +++- pkg/multicloud/azure/geographicinfo.go | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/apis/compute/cloudregions_const.go b/pkg/apis/compute/cloudregions_const.go index d3b4e38bf7..751d0b0802 100644 --- a/pkg/apis/compute/cloudregions_const.go +++ b/pkg/apis/compute/cloudregions_const.go @@ -81,6 +81,7 @@ const ( // 挪威 CITY_STAVANGER = "Stavanger" //斯塔万格 + CITY_OSLO = "Oslo" // 奥斯陆 // 马来西亚 CITY_KUALA_LUMPUR = "Kuala Lumpur" //吉隆坡 @@ -119,7 +120,8 @@ const ( CITY_DUBAI = "Dubai" //迪拜 // 德国 - CITY_FRANKFURT = "Frankfurt" //法兰克福 + CITY_FRANKFURT = "Frankfurt" // 法兰克福 + CITY_DELMENHORST = "Delmenhorst" // 代尔门霍斯特 // 韩国 CITY_SEOUL = "Seoul" //首尔 diff --git a/pkg/multicloud/azure/geographicinfo.go b/pkg/multicloud/azure/geographicinfo.go index 8a62e9633a..34ae4272ad 100644 --- a/pkg/multicloud/azure/geographicinfo.go +++ b/pkg/multicloud/azure/geographicinfo.go @@ -54,9 +54,12 @@ var AzureGeographicInfo = map[string]cloudprovider.SGeographicInfo{ "southindia": {City: api.CITY_KANCHIPURAM, CountryCode: api.COUNTRY_CODE_IN}, //印度 甘吉布勒姆 "uaenorth": {City: api.CITY_DUBAI, CountryCode: api.COUNTRY_CODE_AE}, "uaecentral": {City: api.CITY_DUBAI, CountryCode: api.COUNTRY_CODE_AE}, - "switzerlandwest": {City: api.CITY_GENEVA, CountryCode: api.COUNTRY_CODE_CH}, // 日内瓦 - "switzerlandnorth": {City: api.CITY_ZURICH, CountryCode: api.COUNTRY_CODE_CH}, // 苏黎世 - "norwaywest": {City: api.CITY_STAVANGER, CountryCode: api.COUNTRY_CODE_NO}, // 斯塔万格 + "switzerlandwest": {City: api.CITY_GENEVA, CountryCode: api.COUNTRY_CODE_CH}, // 日内瓦 + "switzerlandnorth": {City: api.CITY_ZURICH, CountryCode: api.COUNTRY_CODE_CH}, // 苏黎世 + "norwaywest": {City: api.CITY_STAVANGER, CountryCode: api.COUNTRY_CODE_NO}, // 斯塔万格 + "norwayeast": {City: api.CITY_OSLO, CountryCode: api.COUNTRY_CODE_NO}, // 奥斯陆 + "germanywestcentral": {City: api.CITY_FRANKFURT, CountryCode: api.COUNTRY_CODE_DE}, // 法兰克福 + "germanynorth": {City: api.CITY_DELMENHORST, CountryCode: api.COUNTRY_CODE_DE}, // 代尔门霍斯特 "chinaeast": {City: api.CITY_SHANG_HAI, CountryCode: api.COUNTRY_CODE_CN}, "chinaeast2": {City: api.CITY_SHANG_HAI, CountryCode: api.COUNTRY_CODE_CN},