[k8scluster] update testscripts

cloud-barista · Sep 20, 2024 · d215e08 · d215e08
2 parents 171f4d6 + fbee033
commit d215e08
Show file tree

Hide file tree

Showing 8 changed files with 320 additions and 182 deletions.
diff --git a/src/testclient/scripts/13.k8scluster/create-k8scluster.sh b/src/testclient/scripts/13.k8scluster/create-k8scluster.sh
@@ -18,7 +18,7 @@ else
         RootDiskSize="${DISK_SIZE[$INDEX,$REGION]}"
 fi
 
-K8SNODEGROUPNAME="ng${INDEX}${REGION}${K8SCLUSTERID_ADD}"
+K8SNODEGROUPNAME="ng${INDEX}${REGION}"
 
 if [ "${CSP}" == "azure" ]; then
     NODEIMAGEID="" # In azure, image designation is not supported
@@ -75,7 +75,7 @@ else # Type-II CSP
                 "k8sNodeGroupList": [ {
                         "name": "${K8SNODEGROUPNAME}",
 			"imageId": "${NODEIMAGEID}",
-                        "specId": "${CONN_CONFIG[$INDEX,$REGION]}-${POSTFIX}",
+			"specId": "${CONN_CONFIG[$INDEX,$REGION]}-${POSTFIX}",
                         "rootDiskType": "${RootDiskType}",
                         "rootDiskSize": "${RootDiskSize}",
                         "sshKeyId": "${CONN_CONFIG[$INDEX,$REGION]}-${POSTFIX}",

diff --git a/src/testclient/scripts/13.k8scluster/status-k8scluster.sh b/src/testclient/scripts/13.k8scluster/status-k8scluster.sh
@@ -24,7 +24,7 @@ echo -e "${BOLD}"
 echo -e "${NC} ${BLUE} ${BOLD}"
 curl -H "${AUTH}" -sX GET http://$TumblebugServer/tumblebug/ns/$NSID/k8scluster/${K8SCLUSTERID}?option=${GetK8sClusterOption} |
     jq '.status | .K8SCLUSTER | sort_by(.id)' |
-    jq -r '(["NodeGroup-ID","Status","ImageId","SpecId","RootDiskType","RootDiskSize","SshKeyId", "OnAutoScaling", "DesiredNodeSize", "MinNodeSize", "MaxNodeSize"] | (., map(length*"-"))), (.[] | [.id, .status, .imageId, .specId, .rootDiskType, .rootDiskSize, .sshKeyId, .onAutoScaling, .desiredNodeSize, .minNodeSize, .maxNodeSize]) | @tsv' |
+    jq -r '(["NodeGroup-ID","Status","cspImageName","cspSpecName","RootDiskType","RootDiskSize","SshKeyId", "OnAutoScaling", "DesiredNodeSize", "MinNodeSize", "MaxNodeSize"] | (., map(length*"-"))), (.[] | [.id, .status, .cspImageName, .cspSpecName, .rootDiskType, .rootDiskSize, .sshKeyId, .onAutoScaling, .desiredNodeSize, .minNodeSize, .maxNodeSize]) | @tsv' |
     column -t
 echo -e "${NC}"