aboutsummaryrefslogtreecommitdiffstats
path: root/test/ete/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'test/ete/scripts')
-rwxr-xr-xtest/ete/scripts/deploy-onap.sh2
-rwxr-xr-xtest/ete/scripts/teardown-onap.sh34
2 files changed, 20 insertions, 16 deletions
diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh
index 2fd05562a..6c8d05d41 100755
--- a/test/ete/scripts/deploy-onap.sh
+++ b/test/ete/scripts/deploy-onap.sh
@@ -19,6 +19,8 @@ fi
source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
+SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f
+export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p)
DEMO_DIR=${ONAP_WORKDIR}/demo
if [ "$#" -ge 2 ]; then
diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh
index 61e643b64..4dad43e8f 100755
--- a/test/ete/scripts/teardown-onap.sh
+++ b/test/ete/scripts/teardown-onap.sh
@@ -14,14 +14,14 @@ while getopts ":rqn:" o; do
if [ $answer = "y" ] || [ $answer = "Y" ] || [ $answer = "yes" ] || [ $answer = "Yes"]; then
echo "This may delete the work of other colleages within the same enviroment"
read -p "Are you certain this is what you want? (type y to confirm):" answer2
-
+
if [ $answer2 = "y" ] || [ $answer2 = "Y" ] || [ $answer2 = "yes" ] || [ $answer2 = "Yes"]; then
full_deletion=true
- else
+ else
echo "Ending program"
exit 1
fi
- else
+ else
echo "Ending program"
exit 1
fi
@@ -46,19 +46,19 @@ fi
source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh
-if [ "$full_deletion" = true ];then
+if [ "$full_deletion" = true ];then
echo "Commencing delete, press CRTL-C to stop"
sleep 10
# delete all instances
- openstack server delete $(openstack server list -c ID -f value)
+ openstack server delete $(openstack server list -c ID -f value --project $OS_PROJECT_ID)
sleep 1
# miscellaneous cleanup
- openstack floating ip delete $(openstack floating ip list -c ID -f value)
+ openstack floating ip delete $(openstack floating ip list -c ID -f value --project $OS_PROJECT_ID)
sleep 1
- ROUTERS=$(openstack router list -c ID -f value)
+ ROUTERS=$(openstack router list -c ID -f value --project $OS_PROJECT_ID)
echo $ROUTERS
for ROUTER in $ROUTERS; do
echo $ROUTER;
@@ -69,11 +69,11 @@ if [ "$full_deletion" = true ];then
openstack router delete $ROUTER
done
- openstack port delete $(openstack port list -f value -c ID)
- openstack volume delete $(openstack volume list -f value -c ID)
+ openstack port delete $(openstack port list -f value -c ID --project $OS_PROJECT_ID)
+ openstack volume delete $(openstack volume list -f value -c ID --project $OS_PROJECT_ID)
# delete all except "default" security group
- SECURITY_GROUPS=$(openstack security group list -c ID -f value | grep -v default)
+ SECURITY_GROUPS=$(openstack security group list -c ID -f value --project $OS_PROJECT_ID | grep -v default)
openstack security group delete $SECURITY_GROUPS
sleep 1
@@ -92,19 +92,21 @@ if [ "$full_deletion" = true ];then
echo "No existing stacks to delete."
fi
-else
- #Restrained teardown
+else
+ #Restrained teardown
echo "Restrained teardown"
-
+
STACK=$install_name
- if [ ! -z "${STACK}" ]; then
+ STATUS=$(openstack stack check $STACK)
+
+ if [ "Stack not found: $install_name" != "$STATUS" ]; then
openstack stack delete $STACK
-
+
until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do
sleep 2
done
else
echo "No existing stack with the name $install_name."
fi
-fi \ No newline at end of file
+fi