Fix the Tencent VM Control error and apply it in Server

cloud-barista · Jul 1, 2022 · 0f6adc8 · 0f6adc8
1 parent 357ec79
commit 0f6adc8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/api-runtime/common-runtime/CCMCommon.go b/api-runtime/common-runtime/CCMCommon.go
@@ -4100,10 +4100,13 @@ func DeleteResource(connectionName string, rsType string, nameID string, force s
 				err = fmt.Errorf("Not Found %s", driverIId.SystemId)
 			}
 			if err != nil {
-				cblog.Error(err)
 				if checkNotFoundError(err) { // VM can be deleted after terminate.
 					break
 				}
+				if status == cres.Failed { // tencent returns Failed with "Not Found Status error msg" in Korean
+					break
+				}
+				cblog.Error(err)
 				if force != "true" {
 					callInfo.ErrorMSG = err.Error()
 					callogger.Info(call.String(callInfo))

diff --git a/api-runtime/rest-runtime/admin-web/AdminWeb-CCM.go b/api-runtime/rest-runtime/admin-web/AdminWeb-CCM.go
@@ -1482,7 +1482,7 @@ func VM(c echo.Context) error {
 		vmUser = "cb-user"
 	case "TENCENT":
 		imageName = "img-pi0ii46r"
-		specName = "S3.MEDIUM8"
+		specName = "S5.MEDIUM8"
 		subnetName = "subnet-01"
 		sgName = `["sg-01"]`
 		vmUser = "cb-user"

diff --git a/test/functional-test-cli/common/tencent/setup.env b/test/functional-test-cli/common/tencent/setup.env
@@ -1,4 +1,4 @@
 CONN_CONFIG=tencent-beijing3-config
 IMAGE_NAME=img-pi0ii46r
 #SPEC_NAME=S3.SMALL1 # sold out, April. 28, 2022
-SPEC_NAME=S3.MEDIUM8
+SPEC_NAME=S5.MEDIUM8