Update test scripts with new spctl usage

test/vm-cb-user-validation-cli/common/7.key-delete.sh

@@ -13,7 +13,10 @@ SETUP_PATH=$CBSPIDER_ROOT/test/vm-cb-user-validation-cli/common
 source $SETUP_PATH/setup.env $1
 
 echo "============== before delete KeyPair: '${KEYPAIR_NAME}'"
-$CLIPATH/spctl  keypair delete --cname "${CONN_CONFIG}" -n "${KEYPAIR_NAME}" 2> /dev/null
+$CLIPATH/spctl  keypair delete -n "${KEYPAIR_NAME}" -d \
+    "{
+      \"ConnectionName\":\"${CONN_CONFIG}\"
+    }"
 echo "============== after delete KeyPair: '${KEYPAIR_NAME}'"
 
 echo -e "\n\n"

test/vm-cb-user-validation-cli/common/7.sg-delete.sh

@@ -14,7 +14,10 @@ source $SETUP_PATH/setup.env $1
 
 
 echo "============== before delete SecurityGroup: '${SG_NAME}'"
-$CLIPATH/spctl  security delete --cname "${CONN_CONFIG}" -n "${SG_NAME}" 2> /dev/null
+$CLIPATH/spctl  securitygroup delete -n "${SG_NAME}" -d \
+    "{
+      \"ConnectionName\":\"${CONN_CONFIG}\"
+    }"
 echo "============== after delete SecurityGroup: '${SG_NAME}'"
 
 echo -e "\n\n"

test/vm-cb-user-validation-cli/common/7.vm-terminate.sh

@@ -14,7 +14,10 @@ source $SETUP_PATH/setup.env $1
 
 VM_NAME=${VM_NAME}-$2
 echo "============== before terminate VM: '${VM_NAME}'"
-$CLIPATH/spctl  --cname "${CONN_CONFIG}" vm terminate -n "${VM_NAME}" 2> /dev/null
+$CLIPATH/spctl vm terminate -n "${VM_NAME}" -d \
+    "{
+      \"ConnectionName\":\"${CONN_CONFIG}\"
+    }"
 echo "============== after terminate VM: '${VM_NAME}'"
 
 echo -e "\n\n"

test/vm-cb-user-validation-cli/common/7.vpc-delete.sh

@@ -13,7 +13,10 @@ SETUP_PATH=$CBSPIDER_ROOT/test/vm-cb-user-validation-cli/common
 source $SETUP_PATH/setup.env $1
 
 echo "============== before delete VPC/Subnet: '${VPC_NAME}'"
-$CLIPATH/spctl  vpc delete --cname "${CONN_CONFIG}" -n "${VPC_NAME}" 2> /dev/null
+$CLIPATH/spctl  vpc delete -n "${VPC_NAME}" -d \
+    "{
+      \"ConnectionName\":\"${CONN_CONFIG}\"
+    }"
 echo "============== after delete VPC/Subnet: '${VPC_NAME}'"
 
 echo -e "\n\n"

test/vm-cb-user-validation-cli/common/8.clear-resources.sh

@@ -13,19 +13,28 @@ SETUP_PATH=$CBSPIDER_ROOT/test/vm-cb-user-validation-cli/common
 source $SETUP_PATH/setup.env $1
 
 echo "============== before delete KeyPair: '${KEYPAIR_NAME}'"
-$CLIPATH/spctl  keypair delete --cname "${CONN_CONFIG}" -n "${KEYPAIR_NAME}" 2> /dev/null
+$CLIPATH/spctl  keypair delete -n "${KEYPAIR_NAME}" -d \
+    "{
+      \"ConnectionName\":\"${CONN_CONFIG}\"
+    }"
 echo "============== after delete KeyPair: '${KEYPAIR_NAME}'"
 
 echo -e "\n\n"
 
 echo "============== before delete SecurityGroup: '${SG_NAME}'"
-$CLIPATH/spctl  security delete --cname "${CONN_CONFIG}" -n "${SG_NAME}" 2> /dev/null
+$CLIPATH/spctl  securitygroup delete -n "${SG_NAME}" -d \
+    "{
+      \"ConnectionName\":\"${CONN_CONFIG}\"
+    }"
 echo "============== after delete SecurityGroup: '${SG_NAME}'"
 
 echo -e "\n\n"
 
 echo "============== before delete VPC/Subnet: '${VPC_NAME}'"
-$CLIPATH/spctl  vpc delete --cname "${CONN_CONFIG}" -n "${VPC_NAME}" 2> /dev/null
+$CLIPATH/spctl  vpc delete -n "${VPC_NAME}" -d \
+    "{
+      \"ConnectionName\":\"${CONN_CONFIG}\"
+    }"
 echo "============== after delete VPC/Subnet: '${VPC_NAME}'"
 
 echo -e "\n\n"

test/vm-cb-user-validation-cli/common/ktcloudvpc/setup.env

@@ -1,4 +1,4 @@
-SUBNET_CIDR=10.25.100.0/24
+SUBNET_CIDR=10.25.102.0/24
 CONN_CONFIG=ktcloudvpc-mokdong1-config
 IMAGE_NAME=92e2be77-35e3-4f4c-96a3-2628475bb9e4
 SPEC_NAME=4x8.itl