diff --git a/assets/cloudconnection.csv b/assets/cloudconnection.csv index 6494287d..3835f37b 100644 --- a/assets/cloudconnection.csv +++ b/assets/cloudconnection.csv @@ -118,8 +118,8 @@ NCP,ncp-us-western,ncp-us-western,USWN,US West,ncp-driver-v1.0.so,ncp-driver01 NCP,ncp-germany,ncp-germany,DEN,Germany,ncp-driver-v1.0.so,ncp-driver01 NCP,ncp-singapore,ncp-singapore,SGN,Singapore,ncp-driver-v1.0.so,ncp-driver01 NCP,ncp-japan,ncp-japan,JPN,Japan,ncp-driver-v1.0.so,ncp-driver01 -NCPVPC,ncpvpc-kr1,ncpvpc-kr1,KR,Korea 1,ncpvpc-driver-v1.0.so,ncpvpc-driver01 -NCPVPC,ncpvpc-singapore,ncpvpc-singapore,SGN,Singapore 4,ncpvpc-driver-v1.0.so,ncpvpc-driver01 +NCPVPC,ncpvpc-kr-1,ncpvpc-kr-1,KR,Korea 1,ncpvpc-driver-v1.0.so,ncpvpc-driver01 +NCPVPC,ncpvpc-sgn-4,ncpvpc-sgn-4,SGN,Singapore 4,ncpvpc-driver-v1.0.so,ncpvpc-driver01 CLOUDIT,cloudit-region01,cloudit-region01,default,Korea Seoul (Internal),cloudit-driver-v1.0.so,cloudit-driver01 TENCENT,tencent-ap-singapore,tencent-ap-singapore,ap-singapore,Singapore,tencent-driver-v1.0.so,tencent-driver01 TENCENT,tencent-ap-jakarta,tencent-ap-jakarta,ap-jakarta,Jakarta,tencent-driver-v1.0.so,tencent-driver01 diff --git a/assets/cloudimage.csv b/assets/cloudimage.csv index 6081ff8b..4e4a469f 100644 --- a/assets/cloudimage.csv +++ b/assets/cloudimage.csv @@ -118,8 +118,8 @@ NCP,ncp-us-western,SPSW0LINUX000130,Ubuntu 18.04 NCP,ncp-germany,SPSW0LINUX000130,Ubuntu 18.04 NCP,ncp-singapore,SPSW0LINUX000130,Ubuntu 18.04 NCP,ncp-japan,SPSW0LINUX000130,Ubuntu 18.04 -NCPVPC,ncpvpc-kr1,SW.VSVR.OS.LNX64.UBNTU.SVR1804.B050,Ubuntu 18.04 -NCPVPC,ncpvpc-singapore,SW.VSVR.OS.LNX64.UBNTU.SVR1804.B050,Ubuntu 18.04 +NCPVPC,ncpvpc-kr-1,SW.VSVR.OS.LNX64.UBNTU.SVR1804.B050,Ubuntu 18.04 +NCPVPC,ncpvpc-sgn-4,SW.VSVR.OS.LNX64.UBNTU.SVR1804.B050,Ubuntu 18.04 CLOUDIT,cloudit-region01,ee441331-0872-49c3-886c-1873a6e32e09,Ubuntu 18.04 TENCENT,tencent-ap-singapore,img-pi0ii46r,Ubuntu 18.04 TENCENT,tencent-ap-jakarta,img-pi0ii46r,Ubuntu 18.04 diff --git a/src/testclient/scripts/conf.env b/src/testclient/scripts/conf.env index 4d5151d9..e3e8c8aa 100644 --- a/src/testclient/scripts/conf.env +++ b/src/testclient/scripts/conf.env @@ -2001,12 +2001,12 @@ CommonDiskSize[$IX]=default IY=$NcpVpcKorea1 # Location: NCPVPC Korea 1 RegionLocation[$IX,$IY]="Korea 1" -RegionName[$IX,$IY]=ncpvpc-kr1 +RegionName[$IX,$IY]=ncpvpc-kr-1 RegionKey01[$IX,$IY]=Region RegionVal01[$IX,$IY]=KR RegionKey02[$IX,$IY]=Zone RegionVal02[$IX,$IY]=KR-1 -CONN_CONFIG[$IX,$IY]=ncpvpc-kr1 +CONN_CONFIG[$IX,$IY]=ncpvpc-kr-1 IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]} @@ -2017,12 +2017,12 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} # IY=$NcpVpcKorea2 # # Location: NCPVPC Korea 2 # RegionLocation[$IX,$IY]="Korea 2" -# RegionName[$IX,$IY]=ncpvpc-kr2 +# RegionName[$IX,$IY]=ncpvpc-kr-2 # RegionKey01[$IX,$IY]=Region # RegionVal01[$IX,$IY]=KR # RegionKey02[$IX,$IY]=Zone # RegionVal02[$IX,$IY]=KR-2 -# CONN_CONFIG[$IX,$IY]=ncpvpc-kr2 +# CONN_CONFIG[$IX,$IY]=ncpvpc-kr-2 # IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]} # IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} # SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]} @@ -2033,12 +2033,12 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} IY=$NcpVpcSingapore4 # Location: NCPVPC Singapore 4 RegionLocation[$IX,$IY]="Singapore 4" -RegionName[$IX,$IY]=ncpvpc-singapore +RegionName[$IX,$IY]=ncpvpc-sgn-4 RegionKey01[$IX,$IY]=Region RegionVal01[$IX,$IY]=SGN RegionKey02[$IX,$IY]=Zone RegionVal02[$IX,$IY]=SGN-4 -CONN_CONFIG[$IX,$IY]=ncpvpc-singapore +CONN_CONFIG[$IX,$IY]=ncpvpc-sgn-4 IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]} IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]} @@ -2049,12 +2049,12 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]} # IY=$NcpVpcSingapore5 # # Location: NCPVPC Singapore 5 # RegionLocation[$IX,$IY]="Singapore 5" -# RegionName[$IX,$IY]=ncpvpc-singapore +# RegionName[$IX,$IY]=ncpvpc-sgn-5 # RegionKey01[$IX,$IY]=Region # RegionVal01[$IX,$IY]=SGN # RegionKey02[$IX,$IY]=Zone # RegionVal02[$IX,$IY]=SGN-5 -# CONN_CONFIG[$IX,$IY]=ncpvpc-singapore +# CONN_CONFIG[$IX,$IY]=ncpvpc-sgn-5 # IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]} # IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]} # SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}