X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fscenarios%2Fnetworking%2Fping6_setup.bash;h=fb6da4fdbd57c0fa4d697b7d2acfabe5b5100d6a;hb=f889d6136e7a23d3db678c53ed0da3eea421cd68;hp=b2f324f763322e6557db294b67a2af3499cffc62;hpb=83fc1c299e38ecc303aeeca5116871a57fef69da;p=yardstick.git

diff --git a/yardstick/benchmark/scenarios/networking/ping6_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_setup.bash
index b2f324f76..fb6da4fdb 100644
--- a/yardstick/benchmark/scenarios/networking/ping6_setup.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_setup.bash
@@ -11,7 +11,11 @@
 
 
 # download and create image
-source /opt/admin-openrc.sh
+openrc=$1
+external_network=$2
+echo "openrc=$openrc"
+echo "external_network=$external_network"
+source $openrc
 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
 
 glance image-create --name 'Fedora22' --disk-format qcow2 \
@@ -33,8 +37,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
@@ -78,4 +82,13 @@ nova boot --image Fedora22  --flavor m1.small \
 --nic port-id=$(neutron port-list | grep -w eth0-VM2 | awk '{print $2}') \
 --key-name vRouterKey VM2
 
+sleep 60
+
 nova list
+# 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
+    neutron port-show $port | grep port_security_enabled
+done