diff options
Diffstat (limited to 'test/ete')
| -rwxr-xr-x | test/ete/labs/gwu/apt-proxy.sh | 2 | ||||
| -rw-r--r-- | test/ete/labs/gwu/onap-openstack-template.env | 2 | ||||
| -rwxr-xr-x | test/ete/labs/huawei/apt-proxy.sh | 2 | ||||
| -rw-r--r-- | test/ete/labs/huawei/onap-openstack-template.env | 2 | ||||
| -rwxr-xr-x | test/ete/labs/tlab/apt-proxy.sh | 2 | ||||
| -rw-r--r-- | test/ete/labs/tlab/onap-openstack-template.env | 2 | ||||
| -rwxr-xr-x | test/ete/labs/windriver/apt-proxy.sh | 2 | ||||
| -rw-r--r-- | test/ete/labs/windriver/onap-openstack-template.env | 2 | ||||
| -rwxr-xr-x | test/ete/scripts/deploy-onap.sh | 5 | ||||
| -rwxr-xr-x | test/ete/scripts/teardown-onap.sh | 127 |
10 files changed, 105 insertions, 43 deletions
diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh index 74a180bd0..b2d5d1f01 100755 --- a/test/ete/labs/gwu/apt-proxy.sh +++ b/test/ete/labs/gwu/apt-proxy.sh @@ -1,5 +1,5 @@ #!/bin/bash -sed -i '/#!\/bin\/bash/a\ +sed -i '/^ #!\/bin\/bash/a\ # sleep up to 3 minutes to avoid disk contention\ sleep $((RANDOM / 200))\ mkdir -p /etc/docker\ diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index 516312ba9..3071356e6 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -84,7 +84,7 @@ parameters: sdnc_ip_addr: 172.16.7.1 vid_ip_addr: 172.16.8.1 clamp_ip_addr: 172.16.12.1 - openo_ip_addr: 172.16.14.1 + multiserv_ip_addr: 172.16.14.1 music_ip_addr: 172.16.15.1 oof_ip_addr: 172.16.16.1 aaf_ip_addr: 172.16.13.1 diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh index 6fec3d03e..1e2ccd6c2 100755 --- a/test/ete/labs/huawei/apt-proxy.sh +++ b/test/ete/labs/huawei/apt-proxy.sh @@ -1,5 +1,5 @@ #!/bin/bash -sed -i '/#!\/bin\/bash/a\ +sed -i '/^ #!\/bin\/bash/a\ mkdir -p /etc/docker\ cat > /etc/docker/daemon.json <<EOF\ {\ diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env index ee4f229d1..c682dc5cf 100644 --- a/test/ete/labs/huawei/onap-openstack-template.env +++ b/test/ete/labs/huawei/onap-openstack-template.env @@ -84,7 +84,7 @@ parameters: sdnc_ip_addr: 172.16.7.1 vid_ip_addr: 172.16.8.1 clamp_ip_addr: 172.16.12.1 - openo_ip_addr: 172.16.14.1 + multiserv_ip_addr: 172.16.14.1 music_ip_addr: 172.16.15.1 oof_ip_addr: 172.16.16.1 aaf_ip_addr: 172.16.13.1 diff --git a/test/ete/labs/tlab/apt-proxy.sh b/test/ete/labs/tlab/apt-proxy.sh index 3cf547452..9203844fc 100755 --- a/test/ete/labs/tlab/apt-proxy.sh +++ b/test/ete/labs/tlab/apt-proxy.sh @@ -1,5 +1,5 @@ #!/bin/bash -sed -i '/#!\/bin\/bash/a\ +sed -i '/^ #!\/bin\/bash/a\ mkdir -p /etc/docker\ cat > /etc/docker/daemon.json <<EOF\ {\ diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index 6f5b9607d..feded7faf 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -85,7 +85,7 @@ parameters: sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 clamp_ip_addr: 10.0.12.1 - openo_ip_addr: 10.0.14.1 + multiserv_ip_addr: 10.0.14.1 music_ip_addr: 10.0.15.1 oof_ip_addr: 10.0.16.1 aaf_ip_addr: 10.0.13.1 diff --git a/test/ete/labs/windriver/apt-proxy.sh b/test/ete/labs/windriver/apt-proxy.sh index 365b5d015..13c8221b4 100755 --- a/test/ete/labs/windriver/apt-proxy.sh +++ b/test/ete/labs/windriver/apt-proxy.sh @@ -1,5 +1,5 @@ #!/bin/bash -sed -i '/#!\/bin\/bash/a\ +sed -i '/^ #!\/bin\/bash/a\ mkdir -p /etc/docker\ cat > /etc/docker/daemon.json <<EOF\ {\ diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 1e333cc7f..b18bd62c1 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -84,7 +84,7 @@ parameters: sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 clamp_ip_addr: 10.0.12.1 - openo_ip_addr: 10.0.14.1 + multiserv_ip_addr: 10.0.14.1 music_ip_addr: 10.0.15.1 oof_ip_addr: 10.0.16.1 aaf_ip_addr: 10.0.13.1 diff --git a/test/ete/scripts/deploy-onap.sh b/test/ete/scripts/deploy-onap.sh index 182e398ca..2fd05562a 100755 --- a/test/ete/scripts/deploy-onap.sh +++ b/test/ete/scripts/deploy-onap.sh @@ -28,6 +28,7 @@ fi SENTINEL='Docker versions and branches' mkdir -p ${LAB_DIR}/target +rsync -avt $DEMO_DIR/heat/ONAP/ ${LAB_DIR}/target/ YAML_FILE=${LAB_DIR}/target/onap_openstack.yaml ENV_FILE=${LAB_DIR}/target/onap_openstack.env YAML_SRC=${DEMO_DIR}/heat/ONAP/onap_openstack.yaml @@ -61,10 +62,10 @@ fi # tear down old deployment -$WORKSPACE/test/ete/scripts/teardown-onap.sh +$WORKSPACE/test/ete/scripts/teardown-onap.sh -q # create new stack -STACK="ete-$(uuidgen | cut -c-8)" +STACK="onap-heat-$(uuidgen | cut -c-4)" echo "New Stack Name: ${STACK}" if ! openstack stack create -t ${YAML_FILE} -e ${ENV_FILE} $STACK; then exit 1 diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh index 9080e20ac..61e643b64 100755 --- a/test/ete/scripts/teardown-onap.sh +++ b/test/ete/scripts/teardown-onap.sh @@ -1,49 +1,110 @@ #!/bin/bash -x +full_deletion=false + +usage() { echo "Usage: $0 [-n <string>] [-r]" 1>&2; exit 1; } + +while getopts ":rqn:" o; do + case "${o}" in + + r) + echo "The following command will delete all information relating to onap within your enviroment" + read -p "Are you certain this is what you want? (type y to confirm):" answer + + 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 + echo "Ending program" + exit 1 + fi + else + echo "Ending program" + exit 1 + fi + ;; + q) + full_deletion=true + ;; + n) + install_name=${OPTARG} + ;; + + *) + usage + ;; + esac +done +shift $((OPTIND-1)) + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh -# delete all instances -openstack server delete $(openstack server list -c ID -f value) -sleep 1 - -# miscellaneous cleanup -openstack floating ip delete $(openstack floating ip list -c ID -f value) -sleep 1 - -ROUTERS=$(openstack router list -c ID -f value) -echo $ROUTERS -for ROUTER in $ROUTERS; do - echo $ROUTER; - PORTS=$(openstack router show $ROUTER -c "interfaces_info" -f "value" | jq -r '.[].port_id') - for PORT in $PORTS; do - openstack router remove port $ROUTER $PORT +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) + sleep 1 + + # miscellaneous cleanup + openstack floating ip delete $(openstack floating ip list -c ID -f value) + sleep 1 + + ROUTERS=$(openstack router list -c ID -f value) + echo $ROUTERS + for ROUTER in $ROUTERS; do + echo $ROUTER; + PORTS=$(openstack router show $ROUTER -c "interfaces_info" -f "value" | jq -r '.[].port_id') + for PORT in $PORTS; do + openstack router remove port $ROUTER $PORT + done + openstack router delete $ROUTER done - 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) + openstack volume delete $(openstack volume list -f value -c ID) + + # delete all except "default" security group + SECURITY_GROUPS=$(openstack security group list -c ID -f value | grep -v default) + openstack security group delete $SECURITY_GROUPS + sleep 1 -# delete all except "default" security group -SECURITY_GROUPS=$(openstack security group list -c ID -f value | grep -v default) -openstack security group delete $SECURITY_GROUPS -sleep 1 + # Delete all existing stacks + STACKS=$(openstack stack list -c "Stack Name" -f value) -# Delete all existing stacks -STACKS=$(openstack stack list -c "Stack Name" -f value) + if [ ! -z "${STACKS}" ]; then + openstack stack delete -y $STACKS + for STACK in ${STACKS}; do + until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do + sleep 2 + done + done + else + echo "No existing stacks to delete." + fi + +else + #Restrained teardown + echo "Restrained teardown" + + STACK=$install_name -if [ ! -z "${STACKS}" ]; then - openstack stack delete -y $STACKS - for STACK in ${STACKS}; do + if [ ! -z "${STACK}" ]; then + openstack stack delete $STACK + until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do - sleep 2 + sleep 2 done - done -else - echo "No existing stacks to delete." -fi + else + echo "No existing stack with the name $install_name." + fi +fi
\ No newline at end of file |