Merge "Add methods to get an existing stack"

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

diff --git a/yardstick/benchmark/scenarios/networking/ping6_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_setup.bash
index 267fb3e..592ced3 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping6_setup.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_setup.bash
@@ -11,8 +11,17 @@
 
 
 # download and create image
-source /opt/admin-openrc.sh
-wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-22-20150521.x86_64.qcow2 >/dev/null 2>&1
+openrc=$1
+external_network=$2
+echo "openrc=$openrc"
+echo "external_network=$external_network"
+echo "nameserver 8.8.4.4" >> /etc/resolv.conf
+source $openrc
+
+fedora_img="Fedora-Cloud-Base-22-20150521.x86_64.qcow2"
+if [ ! -f "$fedora_img" ]; then
+    wget https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/${fedora_img} >/dev/null 2>&1
+fi
 
 glance image-create --name 'Fedora22' --disk-format qcow2 \
 --container-format bare --file ./Fedora-Cloud-Base-22-20150521.x86_64.qcow2
@@ -33,8 +42,8 @@ neutron subnet-create --name ipv4-int-subnet1 \
 neutron router-interface-add ipv4-router ipv4-int-subnet1
 
 #  Associate the net04_ext to the Neutron routers
-neutron router-gateway-set ipv6-router ext-net
-neutron router-gateway-set ipv4-router ext-net
+neutron router-gateway-set ipv6-router $external_network
+neutron router-gateway-set ipv4-router $external_network
 
 # Create two subnets, one IPv4 subnet ipv4-int-subnet2 and
 # one IPv6 subnet ipv6-int-subnet2 in ipv6-int-network2, and associate both subnets to ipv6-router
@@ -81,8 +90,8 @@ nova boot --image Fedora22  --flavor m1.small \
 sleep 60
 
 nova list
-# disable eth0-VM1, eth0-VM2 port-security
-for port in eth0-VM1 eth0-VM2
+# disable eth0-VM1, eth0-VM2, eth0-vRouter, eth1-vRouter port-security
+for port in eth0-VM1 eth0-VM2 eth0-vRouter eth1-vRouter
 do
     neutron port-update --no-security-groups $port
     neutron port-update $port --port-security-enabled=False