Choose ONOS nodes so that only one partition looses a majority
- Fix counter check to only look at the counters used by the test
- Add the gen-partition file to the repo and make the test copy it to
the right place in ONOS
- clear buffer in clidriver after secureCopy
- Change individual ping timeout for ping functions in mininet driver
- increase links timeout in mininet driver due to occasional failures
- Kill iperf if it timesout to allow continued use of mininet
- Clear buffer at the end of many onos driver functions
Change-Id: I3c9235d1c6082f0ef86266405ed99c07e1b27fb5
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index d726f2e..fd05a41 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -405,7 +405,7 @@
main.log.info( self.name + ": \n---\n" + response )
return main.FALSE
- def pingallHosts( self, hostList ):
+ def pingallHosts( self, hostList, wait=1 ):
"""
Ping all specified IPv4 hosts
@@ -417,8 +417,8 @@
Returns main.FALSE if one or more of hosts specified
cannot reach each other"""
-
- cmd = " ping -c 1 -i 1 -W 8 "
+ wait = int( wait )
+ cmd = " ping -c 1 -i 1 -W " + str( wait ) + " "
try:
main.log.info( "Testing reachability between specified hosts" )
@@ -437,7 +437,7 @@
for temp in pingList:
# Current host pings all other hosts specified
pingCmd = str( host ) + cmd + str( temp )
- self.handle.sendline( pingCmd )
+ self.handle.sendline( pingCmd, timeout=wait + 1 )
self.handle.expect( "mininet>" )
response = self.handle.before
if re.search( ',\s0\%\spacket\sloss', response ):
@@ -463,19 +463,20 @@
main.cleanup()
main.exit()
- def pingIpv6Hosts(self, hostList, prefix='1000::'):
+ def pingIpv6Hosts( self, hostList, prefix='1000::', wait=1 ):
"""
- IPv6 ping all hosts in hostList. If no prefix passed this will use
- default prefix of 1000::
+ IPv6 ping all hosts in hostList. If no prefix passed this will use
+ default prefix of 1000::
- Returns main.TRUE if all hosts specified can reach each other
+ Returns main.TRUE if all hosts specified can reach each other
- Returns main.FALSE if one or more of hosts specified cannot reach each other
+ Returns main.FALSE if one or more of hosts specified cannot reach each other
"""
try:
main.log.info( "Testing reachability between specified IPv6 hosts" )
isReachable = main.TRUE
- cmd = " ping6 -c 1 -i 1 -W 8 "
+ wait = int( wait )
+ cmd = " ping6 -c 1 -i 1 -W " + str( wait ) + " "
pingResponse = "IPv6 Pingall output:\n"
failedPings = 0
for host in hostList:
@@ -489,7 +490,7 @@
for temp in pingList:
# Current host pings all other hosts specified
pingCmd = str( host ) + cmd + prefix + str( temp[1:] )
- self.handle.sendline( pingCmd )
+ self.handle.sendline( pingCmd, timeout=wait + 1 )
self.handle.expect( "mininet>" )
response = self.handle.before
if re.search( ',\s0\%\spacket\sloss', response ):
@@ -518,15 +519,19 @@
def pingHost( self, **pingParams ):
"""
- Ping from one mininet host to another
- Currently the only supported Params: SRC and TARGET"""
- args = utilities.parse_args( [ "SRC", "TARGET" ], **pingParams )
+ Ping from one mininet host to another
+ Currently the only supported Params: SRC, TARGET, and WAIT
+ """
+ args = utilities.parse_args( [ "SRC", "TARGET", 'WAIT' ], **pingParams )
+ wait = args['WAIT']
+ wait = int( wait if wait else 1 )
command = args[ "SRC" ] + " ping " + \
- args[ "TARGET" ] + " -c 1 -i 1 -W 8"
+ args[ "TARGET" ] + " -c 1 -i 1 -W " + str( wait ) + " "
try:
main.log.info( "Sending: " + command )
self.handle.sendline( command )
- i = self.handle.expect( [ command, pexpect.TIMEOUT ] )
+ i = self.handle.expect( [ command, pexpect.TIMEOUT ],
+ timeout=wait + 1 )
if i == 1:
main.log.error(
self.name +
@@ -561,17 +566,20 @@
def ping6pair( self, **pingParams ):
"""
IPv6 Ping between a pair of mininet hosts
- Currently the only supported Params are: SRC , TARGET
+ Currently the only supported Params are: SRC, TARGET, and WAIT
FLOWLABEL and -I (src interface) will be added later after running some tests.
Example: main.Mininet1.ping6pair( src="h1", target="1000::2" )
"""
- args = utilities.parse_args( [ "SRC", "TARGET" ], **pingParams )
- command = args[ "SRC" ] + " ping6 " + \
- args[ "TARGET" ] + " -c 1 -i 1 -W 8"
+ args = utilities.parse_args( [ "SRC", "TARGET", 'WAIT' ], **pingParams )
+ wait = args['WAIT']
+ wait = int( wait if wait else 1 )
+ command = args[ "SRC" ] + " ping " + \
+ args[ "TARGET" ] + " -c 1 -i 1 -W " + str( wait ) + " "
try:
main.log.info( "Sending: " + command )
self.handle.sendline( command )
- i = self.handle.expect( [ command, pexpect.TIMEOUT ] )
+ i = self.handle.expect( [ command, pexpect.TIMEOUT ],
+ timeout=wait + 1 )
if i == 1:
main.log.error(
self.name +
@@ -1039,7 +1047,7 @@
main.log.info( self.name + ": List network links" )
try:
response = self.execute( cmd='links', prompt='mininet>',
- timeout=10 )
+ timeout=20 )
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -1104,12 +1112,15 @@
else:
main.log.error( self.name + ": iperf test failed" )
return main.FALSE
-
except pexpect.TIMEOUT:
- main.log.error( self.name + ": TIMEOUT exception found")
- main.log.error( self.name + ": Exception: Cannot connect to iperf on port 5001" )
+ main.log.error( self.name + ": TIMEOUT exception found" )
+ main.log.error( self.name + " response: " +
+ repr ( self.handle.before ) )
+ # NOTE: Send ctrl-c to make sure iperf is done
+ self.handle.sendline( "\x03" )
+ self.handle.expect( "Interrupt" )
+ self.handle.expect( "mininet>" )
return main.FALSE
-
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index c261872..2fae817 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -192,6 +192,7 @@
self.handle.sendline( "onos-package" )
self.handle.expect( "onos-package" )
self.handle.expect( "tar.gz", opTimeout )
+ self.handle.expect( "\$" )
handle = str( self.handle.before )
main.log.info( "onos-package command returned: " +
handle )
@@ -221,6 +222,7 @@
"BUILD FAILED" ],
timeout=120 )
handle = str( self.handle.before )
+ self.handle.expect( "\$" )
main.log.info( "onos-build command returned: " +
handle )
@@ -752,12 +754,11 @@
# Expect the cellname in the ONOSCELL variable.
# Note that this variable name is subject to change
# and that this driver will have to change accordingly
- self.handle.expect(str(cellname))
+ self.handle.expect( str( cellname ) )
handleBefore = self.handle.before
handleAfter = self.handle.after
# Get the rest of the handle
- self.handle.sendline("")
- self.handle.expect("\$")
+ self.handle.expect( "\$" )
handleMore = self.handle.before
cell_result = handleBefore + handleAfter + handleMore
@@ -768,7 +769,6 @@
main.cleanup()
main.exit()
return main.TRUE
-
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -793,19 +793,11 @@
self.handle.expect( "\$" )
handleBefore = self.handle.before
handleAfter = self.handle.after
- # Get the rest of the handle
- self.handle.sendline( "" )
- self.handle.expect( "\$" )
- handleMore = self.handle.before
-
main.log.info( "Verify cell returned: " + handleBefore +
- handleAfter + handleMore )
-
+ handleAfter )
return main.TRUE
except pexpect.ExceptionPexpect as e:
- main.log.error( self.name + ": Pexpect exception found of type " +
- str( type( e ) ) )
- main.log.error ( e.get_trace() )
+ main.log.exception( self.name + ": Pexpect exception found: " )
main.log.error( self.name + ": " + self.handle.before )
main.cleanup()
main.exit()
@@ -851,9 +843,7 @@
return main.TRUE
except pexpect.ExceptionPexpect as e:
- main.log.error( self.name + ": Pexpect exception found of type " +
- str( type( e ) ) )
- main.log.error ( e.get_trace() )
+ main.log.exception( self.name + ": Pexpect exception found: " )
main.log.error( self.name + ": " + self.handle.before )
main.cleanup()
main.exit()
@@ -904,23 +894,12 @@
self.handle.expect( "\$" )
handleBefore = self.handle.before
- print "handle_before = ", self.handle.before
- # handleAfter = str( self.handle.after )
-
- # self.handle.sendline( "" )
- # self.handle.expect( "\$" )
- # handleMore = str( self.handle.before )
-
main.log.info( "Command sent successfully" )
-
# Obtain return handle that consists of result from
# the onos command. The string may need to be
# configured further.
- # returnString = handleBefore + handleAfter
returnString = handleBefore
- print "return_string = ", returnString
return returnString
-
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -954,26 +933,28 @@
"onos\sstart/running,\sprocess",
"ONOS\sis\salready\sinstalled",
pexpect.TIMEOUT ], timeout=60 )
-
if i == 0:
main.log.warn( "Network is unreachable" )
+ self.handle.expect( "\$" )
return main.FALSE
elif i == 1:
main.log.info(
"ONOS was installed on " +
node +
" and started" )
+ self.handle.expect( "\$" )
return main.TRUE
elif i == 2:
main.log.info( "ONOS is already installed on " + node )
+ self.handle.expect( "\$" )
return main.TRUE
elif i == 3:
main.log.info(
"Installation of ONOS on " +
node +
" timed out" )
+ self.handle.expect( "\$" )
return main.FALSE
-
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -999,7 +980,7 @@
"start/running",
"Unknown\sinstance",
pexpect.TIMEOUT ], timeout=120 )
-
+ self.handle.expect( "\$" )
if i == 0:
main.log.info( "Service is already running" )
return main.TRUE
@@ -1035,7 +1016,7 @@
"Could not resolve hostname",
"Unknown\sinstance",
pexpect.TIMEOUT ], timeout=60 )
-
+ self.handle.expect( "\$" )
if i == 0:
main.log.info( "ONOS service stopped" )
return main.TRUE
@@ -1049,7 +1030,6 @@
else:
main.log.error( "ONOS service failed to stop" )
return main.FALSE
-
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -1070,13 +1050,10 @@
self.handle.sendline( "" )
self.handle.expect( "\$", timeout=60 )
self.handle.sendline( "onos-uninstall " + str( nodeIp ) )
- self.handle.expect( "\$" )
-
+ self.handle.expect( "\$", timeout=60 )
main.log.info( "ONOS " + nodeIp + " was uninstalled" )
-
# onos-uninstall command does not return any text
return main.TRUE
-
except pexpect.TIMEOUT:
main.log.exception( self.name + ": Timeout in onosUninstall" )
return main.FALSE
@@ -1186,10 +1163,7 @@
timeout=120 )
if i == 1:
return main.FALSE
- #self.handle.sendline( "" )
- #self.handle.expect( "\$" )
return main.TRUE
-
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -1237,7 +1211,7 @@
main.cleanup()
main.exit()
- def isup(self, node = "", timeout = 120):
+ def isup( self, node="", timeout=120 ):
"""
Run's onos-wait-for-start which only returns once ONOS is at run
level 100(ready for use)
@@ -1245,8 +1219,8 @@
Returns: main.TRUE if ONOS is running and main.FALSE on timeout
"""
try:
- self.handle.sendline("onos-wait-for-start " + node )
- self.handle.expect("onos-wait-for-start")
+ self.handle.sendline( "onos-wait-for-start " + node )
+ self.handle.expect( "onos-wait-for-start" )
# NOTE: this timeout is arbitrary"
i = self.handle.expect(["\$", pexpect.TIMEOUT], timeout)
if i == 0: