From 82833e4e3bdcca3bac4de128c8afd746ef57f895 Mon Sep 17 00:00:00 2001
From: Andres Buraschi <andres.buraschi@intel.com>
Date: Mon, 31 Mar 2014 16:06:20 -0300
Subject: [PATCH] Improvements in neutron_test sanity tests script

Neutron test 'sanity' script was fixed and cleanup functionality was added, to
allow a complete test cycle for create/update/delete methods.

Change-Id: I4f611f68c100356a672dac0851d7339736c73f71
Closes-Bug: #1274945
---
 neutron_test.sh | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/neutron_test.sh b/neutron_test.sh
index 53aee7cf4..f2dae36a6 100755
--- a/neutron_test.sh
+++ b/neutron_test.sh
@@ -4,20 +4,34 @@ function die() {
     local exitcode=$?
     set +o xtrace
     echo $@
+    cleanup
     exit $exitcode
 }
 
+net_name=mynet1
+subnet_name=mysubnet1
+port_name=myport1
+function cleanup() {
+    echo Removing test port, subnet and net...
+    neutron port-delete $port_name
+    neutron subnet-delete $subnet_name
+    neutron net-delete $net_name
+}
+
 noauth_tenant_id=me
-if [ $1 == 'noauth' ]; then
+if [ "$1" == "noauth" ]; then
     NOAUTH="--tenant_id $noauth_tenant_id"
 else
     NOAUTH=
 fi
 
+echo "NOTE: User should be admin in order to perform all operations."
+sleep 3
+
 FORMAT=" --request-format xml"
 
 # test the CRUD of network
-network=mynet1
+network=$net_name
 neutron net-create $FORMAT $NOAUTH $network || die "fail to create network $network"
 temp=`neutron net-list $FORMAT -- --name $network --fields id | wc -l`
 echo $temp
@@ -36,8 +50,8 @@ neutron  net-update $FORMAT $network_id --admin_state_up True  ||  die "fail to
 neutron net-list $FORMAT -c id -- --id fakeid  || die "fail to list networks with column selection on empty list"
 
 # test the CRUD of subnet
-subnet=mysubnet1
-cidr=10.0.1.3/24
+subnet=$subnet_name
+cidr=10.0.1.0/24
 neutron subnet-create $FORMAT $NOAUTH $network $cidr --name $subnet  || die "fail to create subnet $subnet"
 tempsubnet=`neutron subnet-list $FORMAT -- --name $subnet --fields id | wc -l`
 echo $tempsubnet
@@ -49,11 +63,11 @@ echo "ID of subnet with name $subnet is $subnet_id"
 neutron subnet-show $FORMAT $subnet ||  die "fail to show subnet $subnet"
 neutron subnet-show $FORMAT $subnet_id ||  die "fail to show subnet $subnet_id"
 
-neutron  subnet-update $FORMAT $subnet --dns_namesevers host1  ||  die "fail to update subnet $subnet"
-neutron  subnet-update $FORMAT $subnet_id --dns_namesevers host2  ||  die "fail to update subnet $subnet_id"
+neutron  subnet-update $FORMAT $subnet --dns_nameservers list=true 1.1.1.11 1.1.1.12  ||  die "fail to update subnet $subnet"
+neutron  subnet-update $FORMAT $subnet_id --dns_nameservers list=true 2.2.2.21 2.2.2.22  ||  die "fail to update subnet $subnet_id"
 
 # test the crud of ports
-port=myport1
+port=$port_name
 neutron port-create $FORMAT $NOAUTH $network --name $port  || die "fail to create port $port"
 tempport=`neutron port-list $FORMAT -- --name $port --fields id | wc -l`
 echo $tempport
@@ -126,3 +140,7 @@ else
     fi
     neutron quota-list $FORMAT || die "fail to update quota for self"
 fi
+
+cleanup
+echo "Success! :)"
+