commit f07c44ab87eefbb1e4c6ca26f4d4a38fe7c699c0
author GlennRC <glenn@onlab.us> Fri Sep 18 13:33:46 2015 -0700
committer Glenn Contreras <glenn@onlab.us> Fri Sep 18 20:44:40 2015 +0000
tree 9d574811c62a33b4df7b201769dfce09a78b4cd9
parent ba6098223ce623afb6165e363c038da470c91d17

Updated mininet driver and CHOtest to use the new IPv6 pingall function

Change-Id: Ib9f2119f833e2bf4a93fb75ec962e2ef65233f47

TestON/tests/CHOtest/CHOtest.py

diff --git a/TestON/tests/CHOtest/CHOtest.py b/TestON/tests/CHOtest/CHOtest.py
index 779f8e9..e521536 100644
--- a/TestON/tests/CHOtest/CHOtest.py
+++ b/TestON/tests/CHOtest/CHOtest.py
@@ -510,6 +510,9 @@
         ping_result = main.FALSE
         time1 = time.time()
         ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again...")
+            ping_result = main.Mininet1.pingall( timeout=main.pingTimeout)
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -566,6 +569,9 @@
         ping_result = main.FALSE
         time1 = time.time()
         ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again...")
+            ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -622,6 +628,9 @@
         ping_result = main.FALSE
         time1 = time.time()
         ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again...")
+            ping_result = main.Mininet1.pingall( timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -662,7 +671,10 @@
         main.step( "Verify IPv6 Pingall" )
         ping_result = main.FALSE
         time1 = time.time()
-        ping_result = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+        ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout)
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again..")
+            ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -728,7 +740,10 @@
         main.step( "Verify IPv6 Pingall" )
         ping_result = main.FALSE
         time1 = time.time()
-        ping_result = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+        ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout)
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again..")
+            ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(
@@ -794,7 +809,10 @@
         main.step( "Verify IPv6 Pingall" )
         ping_result = main.FALSE
         time1 = time.time()
-        ping_result = main.Mininet1.pingIpv6Hosts( hostList, prefix='1000::' )
+        ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout)
+        if not ping_result:
+            main.log.warn("First pingall failed. Trying again..")
+            ping_result = main.Mininet1.pingall( protocol="IPv6", timeout=main.pingTimeout )
         time2 = time.time()
         timeDiff = round( ( time2 - time1 ), 2 )
         main.log.report(