Bugfix: network_utilization: parse error

[yardstick.git] / yardstick / benchmark / scenarios / networking / ping6_teardown.bash

diff --git a/yardstick/benchmark/scenarios/networking/ping6_teardown.bash b/yardstick/benchmark/scenarios/networking/ping6_teardown.bash
index 7ab1455..2fe3ef2 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping6_teardown.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_teardown.bash
@@ -8,6 +8,11 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+openrc=$1
+echo "openrc=$openrc"
+source $openrc
+external_network=$2
+echo "external_network=$external_network"
 # delete VM
 nova delete VM1
 nova delete VM2
@@ -35,8 +40,8 @@ neutron subnet-delete --name ipv6-int-subnet2
 neutron subnet-delete --name ipv4-int-subnet2
 
 #clear gateway
-neutron router-gateway-clear ipv4-router net04_ext
-neutron router-gateway-clear ipv6-router net04_ext
+neutron router-gateway-clear ipv4-router $external_network
+neutron router-gateway-clear ipv6-router $external_network
 
 #delete ipv4 router interface
 neutron router-interface-delete ipv4-router ipv4-int-subnet1
@@ -50,9 +55,5 @@ neutron net-delete ipv4-int-network1
 neutron router-delete ipv4-router
 neutron router-delete ipv6-router
 
-# delete ext net
-neutron subnet-delete net04_ext__subnet
-neutron net-delete net04_ext
-
 # delete glance image
-glance --os-image-api-version 1 image-delete Fedora22
\ No newline at end of file
+glance --os-image-api-version 1 image-delete Fedora22