X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fscenarios%2Fnetworking%2Fping6_benchmark.bash;h=a50e01f655db3044f82ec152ac575d3fddc3583f;hb=661d78e5ad9a831a4e6c36287d17ff6829b062d0;hp=6df354a1bfd6eb5340cf6a859a3e4080a93fe3e8;hpb=ea99867bd2a0618aff12ed977330d69467544dfd;p=yardstick.git

diff --git a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
index 6df354a1b..a50e01f65 100644
--- a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
@@ -10,11 +10,29 @@
 ##############################################################################
 
 # Run a single ping6 command towards a ipv6 router
-
 set -e
+openrc=$1
+source $openrc
+shift
+ping6_options=$*
+chmod 600 vRouterKey
 
 # TODO find host
-sudo ip netns exec qdhcp-$(neutron net-list | grep -w ipv4-int-network1 | awk '{print $2}') bash
-# TODO find VM ip
-ssh -i vRouterkey fedora@20.0.0.4
-ping6 -c 1 2001:db8:0:1::1 | grep ttl | awk -F [=\ ] '{printf $10}'
+vm1_ip=$(nova list|grep VM1 | awk -F [=] '{print $2}' | awk '{print $1}')
+# echo "vm1_ip=$vm1_ip"
+wait_vm_ok() {
+    retry=0
+    until timeout 100s sudo ip netns exec qdhcp-$(neutron net-list | grep -w ipv4-int-network1 | awk '{print $2}') ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i vRouterKey fedora@$vm1_ip "exit" >/dev/null 2>&1
+    do
+        sleep 10
+        let retry+=1
+        if [ $retry -ge 40 ];
+        then
+            echo "vm ssh  start timeout !!!"
+            exit 0
+        fi
+    done
+}
+wait_vm_ok
+sleep 360
+sudo ip netns exec qdhcp-$(neutron net-list | grep -w ipv4-int-network1 | awk '{print $2}') ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i vRouterKey fedora@$vm1_ip "ping6 $ping6_options 2001:db8:0:1::1 | grep rtt | awk -F [\/\ ] '{printf \$8}'"