Merge "Extend the timeout limit for the isUp() function."
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 4b28e8e..e0a1a6a 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1004,7 +1004,7 @@
"start/running",
"\$",
"Unknown\sinstance",
- pexpect.TIMEOUT ], timeout=120 )
+ pexpect.TIMEOUT ], timeout=180 )
if i == 0:
self.handle.expect( "\$" )
main.log.info( "Service is already running" )
@@ -1046,7 +1046,7 @@
"Could not resolve hostname",
"Unknown\sinstance",
"\$",
- pexpect.TIMEOUT ], timeout=60 )
+ pexpect.TIMEOUT ], timeout=180 )
if i == 0:
self.handle.expect( "\$" )
main.log.info( "ONOS service stopped" )
@@ -1084,9 +1084,9 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$", timeout=60 )
+ self.handle.expect( "\$", timeout=180 )
self.handle.sendline( "onos-uninstall " + str( nodeIp ) )
- self.handle.expect( "\$", timeout=60 )
+ self.handle.expect( "\$", timeout=180 )
main.log.info( "ONOS " + nodeIp + " was uninstalled" )
# onos-uninstall command does not return any text
return main.TRUE
@@ -1116,7 +1116,7 @@
i = self.handle.expect( [
"Killing\sONOS",
"ONOS\sprocess\sis\snot\srunning",
- pexpect.TIMEOUT ], timeout=20 )
+ pexpect.TIMEOUT ], timeout=60 )
if i == 0:
main.log.info( "ONOS instance " + str( nodeIp ) +
" was killed and stopped" )
@@ -1152,7 +1152,7 @@
"\$",
"No\sroute\sto\shost",
"password:",
- pexpect.TIMEOUT ], timeout=20 )
+ pexpect.TIMEOUT ], timeout=60 )
if i == 0:
main.log.info(
@@ -1251,7 +1251,7 @@
main.cleanup()
main.exit()
- def isup( self, node="", timeout=120 ):
+ def isup( self, node="", timeout=240 ):
"""
Run's onos-wait-for-start which only returns once ONOS is at run
level 100(ready for use)