Fix create-ns.sh error (#1108)

cloud-barista · May 12, 2022 · b036959 · b036959
1 parent 559eeda
commit b036959
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/scripts/initMultiCloudEnv.sh b/scripts/initMultiCloudEnv.sh
@@ -32,7 +32,7 @@ $CBTUMBLEBUG_ROOT/src/testclient/scripts/2.configureTumblebug/load-common-resour
 
 echo -e "${BOLD}"
 while true; do
-    read -p 'Create default namespace (ns01). Do you want to proceed ? (y/n) : ' CHECKPROCEED
+    read -p 'Create default namespace (ns01) for test. Do you want to proceed ? (y/n) : ' CHECKPROCEED
     echo -e "${NC}"
     case $CHECKPROCEED in
     [Yy]*)
@@ -51,4 +51,4 @@ while true; do
     esac
 done
 
-$CBTUMBLEBUG_ROOT/src/testclient/scripts/2.configureTumblebug/create-ns.sh -n tb
+$CBTUMBLEBUG_ROOT/src/testclient/scripts/2.configureTumblebug/create-ns.sh -x ns01
diff --git a/src/testclient/scripts/2.configureTumblebug/create-ns.sh b/src/testclient/scripts/2.configureTumblebug/create-ns.sh
@@ -4,13 +4,15 @@ echo "####################################################################"
 echo "## 2. Namespace: Create (-x option for NameSpace Name)"
 echo "####################################################################"
 
-SCRIPT_DIR=`dirname ${BASH_SOURCE[0]-$0}`
-cd $SCRIPT_DIR
-
 source ../init.sh
 
+
+if [ ! -z "$OPTION01" ]; then
+	NSID=$OPTION01
+fi
+
 if [ -z "$NSID" ]; then
-	NSID=${OPTION01:-ns01}
+	NSID="ns01"
 fi
 
 resp=$(

diff --git a/src/testclient/scripts/sequentialFullTest/create-mcir-ns-cloud.sh b/src/testclient/scripts/sequentialFullTest/create-mcir-ns-cloud.sh
@@ -11,7 +11,7 @@ function test_sequence() {
 	local CMDPATH=$6
 
 	../1.configureSpider/register-cloud.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
-	../2.configureTumblebug/create-ns.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
+	../2.configureTumblebug/create-ns.sh -n $POSTFIX -f $TestSetFile
 	../3.vNet/create-vNet.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
 	dozing 10
 	if [ "${CSP}" == "gcp" ]; then
@@ -48,7 +48,7 @@ function test_sequence_allcsp_mcir() {
 	local CMDPATH=$5
 
 	../1.configureSpider/register-cloud.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
-	../2.configureTumblebug/create-ns.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
+	../2.configureTumblebug/create-ns.sh -n $POSTFIX -f $TestSetFile
 	../3.vNet/create-vNet.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
 	dozing 10
 	if [ "${CSP}" == "gcp" ]; then

diff --git a/src/testclient/scripts/sequentialFullTest/create-mcis-for-df.sh b/src/testclient/scripts/sequentialFullTest/create-mcis-for-df.sh
@@ -10,7 +10,7 @@ function test_sequence()
 	local CMDPATH=$5
 
 	../1.configureSpider/register-cloud.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
-	../2.configureTumblebug/create-ns.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
+	../2.configureTumblebug/create-ns.sh -n $POSTFIX -f $TestSetFile
 	../3.vNet/create-vNet.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
 	dozing 10
 	if [ "${CSP}" == "gcp" ]; then

diff --git a/src/testclient/scripts/sequentialFullTest/create-mcis-for-ws.sh b/src/testclient/scripts/sequentialFullTest/create-mcis-for-ws.sh
@@ -9,7 +9,7 @@ function test_sequence() {
 	local CMDPATH=$5
 
 	../1.configureSpider/register-cloud.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
-	../2.configureTumblebug/create-ns.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
+	../2.configureTumblebug/create-ns.sh -n $POSTFIX -f $TestSetFile
 	../3.vNet/create-vNet.sh -c $CSP -r $REGION -n $POSTFIX -f $TestSetFile
 	dozing 10
 	if [ "${CSP}" == "gcp" ]; then