Updated mininet driver and CHOtest to use the new IPv6 pingall function
Change-Id: Ib9f2119f833e2bf4a93fb75ec962e2ef65233f47
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 1e22267..b7e54f4 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -281,7 +281,7 @@
topoDict = self.numSwitchesNlinks( *topoArgList )
return topoDict
- def pingall( self, timeout=300, shortCircuit=False, acceptableFailed=0 ):
+ def pingall( self, protocol="IPv4", timeout=300, shortCircuit=False, acceptableFailed=0 ):
"""
Verifies the reachability of the hosts using pingall command.
Optional parameter timeout allows you to specify how long to
@@ -306,7 +306,10 @@
response = ""
failedPings = 0
returnValue = main.TRUE
- self.handle.sendline( "pingall" )
+ cmd = "pingall"
+ if protocol == "IPv6":
+ cmd = "py net.pingAll6()"
+ self.handle.sendline( cmd )
startTime = time.time()
while True:
i = self.handle.expect( [ "mininet>", "X",
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(