opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5291 from ioito/automated-cherry-pick-of-#5290-upstream-release-3.1

Browse Source 
Automated cherry pick of #5290: 添加azure region city信息
This commit is contained in:
yunion-ci-robot
2020-02-28 13:17:19 +08:00
committed by GitHub
parent 2f47d93215 5b9c7ba9f2
commit 24da237790
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/compute/cloudregions_const.go
+3 -1
View File
@@ -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" //首尔
pkg/multicloud/azure/geographicinfo.go
+6 -3
View File
@@ -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},