Staging CB-Tumblebug v0.8.7

cloud-barista · Apr 17, 2024 · 4ac5a59 · 4ac5a59
2 parents aca47c9 + 3eb8b2c
commit 4ac5a59
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 39 deletions.
diff --git a/assets/cloudlocation.csv b/assets/cloudlocation.csv
@@ -145,7 +145,6 @@ ktcloud,kr-central-a,Cheon-an A - South Korea,36.812483,127.107005
 ktcloud,kr-central-b,Cheon-an B - South Korea,36.832583,127.157205
 ktcloud,kor-seoul-m,Seoul M- South Korea,37.566535,126.977969
 ktcloud,kor-seoul-m2,Seoul M2 - South Korea,37.466535,126.877969
-ktcloud,kr-kimhae,Kimhae - South Korea,35.228545,128.889352
 ktcloudvpc,us,LA - US,34.054234,-118.243685
 ibm,us-south,Dallas (US South),32.776664,-96.796988
 ibm,br-sao,Sao Paulo (Brazil),-23.55052,-46.633309

diff --git a/assets/cloudspec.csv b/assets/cloudspec.csv
@@ -555,11 +555,11 @@ TENCENT,tencent-eu-moscow,S2.MEDIUM4,0.06,59.98,,,,,,,,,,default,default
 TENCENT,tencent-na-ashburn,S2.MEDIUM4,0.09,59.98,,,,,,,,,,default,default
 TENCENT,tencent-na-siliconvalley,SA2.MEDIUM4,0.04,59.98,,,,,,,,,,default,default
 TENCENT,tencent-na-toronto,S2.MEDIUM4,0.09,59.98,,,,,,,,,,default,default
-NCP,ncp-korea1,SPSVRSTAND000073,,,,,,,,,,,,default,default
-NCP,ncp-us-western,SPSVRSTAND000073,,,,,,,,,,,,default,default
-NCP,ncp-germany,SPSVRSTAND000073,,,,,,,,,,,,default,default
-NCP,ncp-singapore,SPSVRSTAND000073,,,,,,,,,,,,default,default
-NCP,ncp-japan,SPSVRSTAND000073,,,,,,,,,,,,default,default
+NCP,ncp-kr-kr-1,SPSVRSTAND000073,,,,,,,,,,,,default,default
+NCP,ncp-uswn-uswn-1,SPSVRSTAND000073,,,,,,,,,,,,default,default
+NCP,ncp-den-den-1,SPSVRSTAND000073,,,,,,,,,,,,default,default
+NCP,ncp-sgn-sgn-1,SPSVRSTAND000073,,,,,,,,,,,,default,default
+NCP,ncp-jpn-jpn-1,SPSVRSTAND000073,,,,,,,,,,,,default,default
 NCPVPC,ncpvpc-kr,SVR.VSVR.HICPU.C002.M004.NET.SSD.B050.G002,,,,,,,,,,,,default,default
 NCPVPC,ncpvpc-sgn,SVR.VSVR.HICPU.C002.M004.NET.SSD.B050.G002,,,,,,,,,,,,default,default
 NCPVPC,ncpvpc-jpn,SVR.VSVR.HICPU.C002.M004.NET.SSD.B050.G002,,,,,,,,,,,,default,default
@@ -570,5 +570,4 @@ KTCLOUD,ktcloud-kor-central-a,d3530ad2-462b-43ad-97d5-e1087b952b7d!_disk20GB,,,,
 KTCLOUD,ktcloud-kor-central-b,385df834-6cf7-485b-bca8-de4d4f59b0b0,,,,,,,,,,,,default,default
 KTCLOUD,ktcloud-kor-seoul-m,385df834-6cf7-485b-bca8-de4d4f59b0b0,,,,,,,,,,,,default,default
 KTCLOUD,ktcloud-kor-seoul-m2,753c80b0-b03f-4a91-98a7-6b11233f85a8,,,,,,,,,,,,default,default
-KTCLOUD,ktcloud-kr-kimhae,385df834-6cf7-485b-bca8-de4d4f59b0b0,,,,,,,,,,,,default,default
 KTCLOUDVPC,ktcloudvpc-kr-dx-m1,4x16.itl,,,,,,,,,,,,default,default
diff --git a/scripts/misc/update-cloudinfo.py b/scripts/misc/update-cloudinfo.py
@@ -40,7 +40,7 @@
     'ibm': 'ibm-us-east',
     'alibaba': 'alibaba-us-east-1',
     'tencent': 'tencent-ap-singapore',
-    'ncp': 'ncp-korea1',
+    'ncp': 'ncp-kr-kr-1',
     'ncpvpc': 'ncpvpc-kr',
     'ktcloud': 'ktcloud-kor-central-a',
     'ktcloudvpc': 'ktcloudvpc-kr-dx-m1',

diff --git a/scripts/runMapUI.sh b/scripts/runMapUI.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 CONTAINER_NAME_READ="CB-MapUI"
-CONTAINER_VERSION="0.8.6"
+CONTAINER_VERSION="0.8.7"
 CONTAINER_PORT="-p 1324:1324"
 CONTAINER_DATA_PATH=""
 

diff --git a/src/core/mcir/common.go b/src/core/mcir/common.go
@@ -1596,7 +1596,7 @@ func LoadCommonResource() (common.IdList, error) {
 
 				} else {
 					errRegisterSpec = fmt.Errorf("Not Found spec from the fetched spec list: %s", searchKey)
-					log.Info().Msgf(errRegisterSpec.Error())
+					log.Trace().Msgf(errRegisterSpec.Error())
 					// _, errRegisterSpec = RegisterSpecWithCspSpecName(common.SystemCommonNs, &specReqTmp, true)
 					// if errRegisterSpec != nil {
 					// 	log.Error().Err(errRegisterSpec).Msg("RegisterSpec WithCspSpecName failed")

diff --git a/src/testclient/scripts/conf.env b/src/testclient/scripts/conf.env
@@ -2054,12 +2054,12 @@ CommonDiskSize[$IX]=default
 IY=$NcpKorea1
 # Location: NCP Korea
 RegionLocation[$IX,$IY]="Korea"
-RegionName[$IX,$IY]=ncp-korea1
+RegionName[$IX,$IY]=ncp-kr-kr-1
 RegionKey01[$IX,$IY]=Region
 RegionVal01[$IX,$IY]=KR
 RegionKey02[$IX,$IY]=Zone
 RegionVal02[$IX,$IY]=KR-1
-CONN_CONFIG[$IX,$IY]=ncp-korea1
+CONN_CONFIG[$IX,$IY]=ncp-kr-kr-1
 IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]}
 IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
 SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}
@@ -2070,12 +2070,12 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
 IY=$NcpUsWestern
 # Location: NCP US West
 RegionLocation[$IX,$IY]="US West"
-RegionName[$IX,$IY]=ncp-us-western
+RegionName[$IX,$IY]=ncp-uswn-uswn-1
 RegionKey01[$IX,$IY]=Region
 RegionVal01[$IX,$IY]=USWN
 RegionKey02[$IX,$IY]=Zone
 RegionVal02[$IX,$IY]=USWN-1
-CONN_CONFIG[$IX,$IY]=ncp-us-western
+CONN_CONFIG[$IX,$IY]=ncp-uswn-uswn-1
 IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]}
 IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
 SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}
@@ -2087,12 +2087,12 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
 IY=$NcpGermany
 # Location: NCP Germany
 RegionLocation[$IX,$IY]="Germany"
-RegionName[$IX,$IY]=ncp-germany
+RegionName[$IX,$IY]=ncp-den-den-1
 RegionKey01[$IX,$IY]=Region
 RegionVal01[$IX,$IY]=DEN
 RegionKey02[$IX,$IY]=Zone
 RegionVal02[$IX,$IY]=DEN-1
-CONN_CONFIG[$IX,$IY]=ncp-germany
+CONN_CONFIG[$IX,$IY]=ncp-den-den-1
 IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]}
 IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
 SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}
@@ -2104,12 +2104,12 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
 IY=$NcpSingapore
 # Location: NCP Singapore
 RegionLocation[$IX,$IY]="Singapore"
-RegionName[$IX,$IY]=ncp-singapore
+RegionName[$IX,$IY]=ncp-sgn-sgn-1
 RegionKey01[$IX,$IY]=Region
 RegionVal01[$IX,$IY]=SGN
 RegionKey02[$IX,$IY]=Zone
 RegionVal02[$IX,$IY]=SGN-1
-CONN_CONFIG[$IX,$IY]=ncp-singapore
+CONN_CONFIG[$IX,$IY]=ncp-sgn-sgn-1
 IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]}
 IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
 SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}
@@ -2121,12 +2121,12 @@ DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
 IY=$NcpJapan
 # Location: NCP Japan
 RegionLocation[$IX,$IY]="Japan"
-RegionName[$IX,$IY]=ncp-japan
+RegionName[$IX,$IY]=ncp-jpn-jpn-1
 RegionKey01[$IX,$IY]=Region
 RegionVal01[$IX,$IY]=JPN
 RegionKey02[$IX,$IY]=Zone
 RegionVal02[$IX,$IY]=JPN-1
-CONN_CONFIG[$IX,$IY]=ncp-japan
+CONN_CONFIG[$IX,$IY]=ncp-jpn-jpn-1
 IMAGE_NAME[$IX,$IY]=${CommonImageUbuntu1804[$IX]}
 IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
 SPEC_NAME[$IX,$IY]=${CommonSpecSmall[$IX]}
@@ -2771,23 +2771,6 @@ SPEC_NAME[$IX,$IY]=753c80b0-b03f-4a91-98a7-6b11233f85a8 # 1vCore 1GB
 DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
 DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
 
-# region05
-IY=$KTcloudKRKimhae
-# Location: Kimhae - South Korea
-RegionLocation[$IX,$IY]="Kimhae - South Korea"
-RegionName[$IX,$IY]=ktcloud-kr-kimhae
-RegionKey01[$IX,$IY]=Region
-RegionVal01[$IX,$IY]=kr-kimhae
-RegionKey02[$IX,$IY]=Zone
-RegionVal02[$IX,$IY]=dfd6f03d-dae5-458e-a2ea-cb6a55d0d994
-CONN_CONFIG[$IX,$IY]=ktcloud-kr-kimhae
-IMAGE_NAME[$IX,$IY]=45e20478-6c24-4c32-a5e5-2ba2d464a8d1
-IMAGE_TYPE[$IX,$IY]=${CommonImageType[$IX]}
-SPEC_NAME[$IX,$IY]=385df834-6cf7-485b-bca8-de4d4f59b0b0 # 1vCore 1GB
-DISK_TYPE[$IX,$IY]=${CommonDiskType[$IX]}
-DISK_SIZE[$IX,$IY]=${CommonDiskSize[$IX]}
-
-
 
 
 

diff --git a/src/testclient/scripts/testSet.env b/src/testclient/scripts/testSet.env
@@ -288,14 +288,13 @@ TencentApHongKong=$((++IY))		    	# Location: Hong Kong
 # KT cloud (Total: 6 Regions / Recommend: n Regions)
 NumRegion[$IndexKTcloud]=1
 
-TotalNumRegion[$IndexKTcloud]=5
+TotalNumRegion[$IndexKTcloud]=4
 
 IY=0
 KTcloudKRcentralA=$((++IY))			# Location: Cheon-an, South Korea
 KTcloudKRcentralB=$((++IY))			# Location: Cheon-an, South Korea
 KTcloudKRSeoulM=$((++IY))			# Location: Seoul, South Korea
 KTcloudKRSeoulM2=$((++IY))			# Location: Seoul, South Korea
-KTcloudKRKimhae=$((++IY))			# Location: Kimhae, South Korea
 
 
 # KT cloud VPC (Total: ? Regions / Recommend: ? Regions)