diff --git a/scripts/initMultiCloudEnv.sh b/scripts/initMultiCloudEnv.sh new file mode 100755 index 00000000..83921481 --- /dev/null +++ b/scripts/initMultiCloudEnv.sh @@ -0,0 +1,54 @@ +#!/bin/bash + +if [ -z "$CBTUMBLEBUG_ROOT" ]; then + SCRIPT_DIR=`dirname ${BASH_SOURCE[0]-$0}` + export CBTUMBLEBUG_ROOT=`cd $SCRIPT_DIR && cd .. && pwd` +fi + +$CBTUMBLEBUG_ROOT/src/testclient/scripts/1.configureSpider/register-cloud-interactive.sh -n tb + +echo -e "${BOLD}" +while true; do + read -p 'Load common Specs and Images. Do you want to proceed ? (y/n) : ' CHECKPROCEED + echo -e "${NC}" + case $CHECKPROCEED in + [Yy]*) + break + ;; + [Nn]*) + echo + echo "Cancel [$0 $@]" + echo "See you soon. :)" + echo + exit 1 + ;; + *) + echo "Please answer yes or no." + ;; + esac +done + +$CBTUMBLEBUG_ROOT/src/testclient/scripts/2.configureTumblebug/load-common-resource.sh -n tb + +echo -e "${BOLD}" +while true; do + read -p 'Create default namespace (ns01). Do you want to proceed ? (y/n) : ' CHECKPROCEED + echo -e "${NC}" + case $CHECKPROCEED in + [Yy]*) + break + ;; + [Nn]*) + echo + echo "Cancel [$0 $@]" + echo "See you soon. :)" + echo + exit 1 + ;; + *) + echo "Please answer yes or no." + ;; + esac +done + +$CBTUMBLEBUG_ROOT/src/testclient/scripts/2.configureTumblebug/create-ns.sh -n tb diff --git a/scripts/registerCloudInfo.sh b/scripts/registerCloudInfo.sh deleted file mode 100755 index 7818d872..00000000 --- a/scripts/registerCloudInfo.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ -z "$CBTUMBLEBUG_ROOT" ]; then - SCRIPT_DIR=`dirname ${BASH_SOURCE[0]-$0}` - export CBTUMBLEBUG_ROOT=`cd $SCRIPT_DIR && cd .. && pwd` -fi - -$CBTUMBLEBUG_ROOT/src/testclient/scripts/1.configureSpider/register-cloud-interactive.sh -n tb diff --git a/src/testclient/scripts/2.configureTumblebug/create-ns.sh b/src/testclient/scripts/2.configureTumblebug/create-ns.sh index 14b0db82..c193f1d3 100755 --- a/src/testclient/scripts/2.configureTumblebug/create-ns.sh +++ b/src/testclient/scripts/2.configureTumblebug/create-ns.sh @@ -4,10 +4,13 @@ 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 "$NSID" ]; then - NSID=${OPTION01:-tb01} + NSID=${OPTION01:-ns01} fi resp=$( diff --git a/src/testclient/scripts/2.configureTumblebug/delete-ns.sh b/src/testclient/scripts/2.configureTumblebug/delete-ns.sh index aa3e1e15..0c5f1e39 100755 --- a/src/testclient/scripts/2.configureTumblebug/delete-ns.sh +++ b/src/testclient/scripts/2.configureTumblebug/delete-ns.sh @@ -6,7 +6,7 @@ echo "####################################################################" source ../init.sh -NSID=${OPTION01:-tb01} +NSID=${OPTION01:-ns01} curl -H "${AUTH}" -sX DELETE http://$TumblebugServer/tumblebug/ns/$NSID | jq '' echo "" diff --git a/src/testclient/scripts/2.configureTumblebug/get-config.sh b/src/testclient/scripts/2.configureTumblebug/get-config.sh index 16d8f558..25943a04 100755 --- a/src/testclient/scripts/2.configureTumblebug/get-config.sh +++ b/src/testclient/scripts/2.configureTumblebug/get-config.sh @@ -8,7 +8,7 @@ source ../init.sh - VAR=${OPTION01:-tb01} + VAR=${OPTION01:-ns01} curl -H "${AUTH}" -sX GET http://$TumblebugServer/tumblebug/config/$VAR | jq '' echo "" diff --git a/src/testclient/scripts/2.configureTumblebug/get-ns.sh b/src/testclient/scripts/2.configureTumblebug/get-ns.sh index 5da3e808..7c0820c0 100755 --- a/src/testclient/scripts/2.configureTumblebug/get-ns.sh +++ b/src/testclient/scripts/2.configureTumblebug/get-ns.sh @@ -6,7 +6,7 @@ echo "####################################################################" source ../init.sh -NSID=${OPTION01:-tb01} +NSID=${OPTION01:-ns01} curl -H "${AUTH}" -sX GET http://$TumblebugServer/tumblebug/ns/$NSID | jq '' echo "" diff --git a/src/testclient/scripts/2.configureTumblebug/load-common-resource.sh b/src/testclient/scripts/2.configureTumblebug/load-common-resource.sh new file mode 100755 index 00000000..222e214c --- /dev/null +++ b/src/testclient/scripts/2.configureTumblebug/load-common-resource.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +echo "####################################################################" +echo "## Load common Image and Spec from asset files" +echo "## (assets/cloudspec.csv, assets/cloudimage.csv)" +echo "####################################################################" + +SCRIPT_DIR=`dirname ${BASH_SOURCE[0]-$0}` +cd $SCRIPT_DIR + +source ../init.sh + +curl -H "${AUTH}" -sX GET http://$TumblebugServer/tumblebug/loadCommonResource | jq '' +echo ""