let the timeout value configurable
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 097a303..93badda 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -167,7 +167,8 @@
main.cleanup()
main.exit()
- def startOnosCli( self, ONOSIp, karafTimeout="" ):
+ def startOnosCli( self, ONOSIp, karafTimeout="",
+ commandlineTimeout=10, onosStartTimeout=60 ):
"""
karafTimeout is an optional arugument. karafTimeout value passed
by user would be used to set the current karaf shell idle timeout.
@@ -185,7 +186,7 @@
try:
self.handle.sendline( "" )
x = self.handle.expect( [
- "\$", "onos>" ], timeout=10 )
+ "\$", "onos>" ], commandlineTimeout)
if x == 1:
main.log.info( "ONOS cli is already running" )
@@ -195,7 +196,7 @@
self.handle.sendline( "onos -w " + str( ONOSIp ) )
i = self.handle.expect( [
"onos>",
- pexpect.TIMEOUT ], timeout=60 )
+ pexpect.TIMEOUT ], onosStartTimeout )
if i == 0:
main.log.info( str( ONOSIp ) + " CLI Started successfully" )
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 7d6587c..ffed668 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -92,7 +92,7 @@
response = main.FALSE
return response
- def onosPackage( self ):
+ def onosPackage( self, opTimeout=30 ):
"""
Produce a self-contained tar.gz file that can be deployed
and executed on any platform with Java 7 JRE.
@@ -100,7 +100,7 @@
try:
self.handle.sendline( "onos-package" )
self.handle.expect( "onos-package" )
- self.handle.expect( "tar.gz", timeout=30 )
+ self.handle.expect( "tar.gz", opTimeout )
handle = str( self.handle.before )
main.log.info( "onos-package command returned: " +
handle )
@@ -147,7 +147,7 @@
main.cleanup()
main.exit()
- def cleanInstall( self ):
+ def cleanInstall( self, mciTimeout=600 ):
"""
Runs mvn clean install in the root of the ONOS directory.
This will clean all ONOS artifacts then compile each module
@@ -173,7 +173,7 @@
'BUILD\sFAILURE',
'BUILD\sSUCCESS',
'ONOS\$',
- pexpect.TIMEOUT ], timeout=600 )
+ pexpect.TIMEOUT ], mciTimeout )
if i == 0:
main.log.error( self.name + ":There is insufficient memory \
for the Java Runtime Environment to continue." )
@@ -1045,7 +1045,7 @@
main.cleanup()
main.exit()
- def isup( self, node="" ):
+ def isup( self, node="", onosWaitStartTimeout=120 ):
"""
Run's onos-wait-for-start which only returns once ONOS is at run
level 100( ready for use )
@@ -1056,7 +1056,8 @@
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=120 )
+ i = self.handle.expect( [ "\$", pexpect.TIMEOUT ],
+ onosWaitStartTimeout )
if i == 0:
main.log.info( self.name + ": " + node + " is up" )
return main.TRUE
diff --git a/TestON/tests/SdnIpTest/SdnIpTest.py b/TestON/tests/SdnIpTest/SdnIpTest.py
index b95bfe0..f4e6f07 100644
--- a/TestON/tests/SdnIpTest/SdnIpTest.py
+++ b/TestON/tests/SdnIpTest/SdnIpTest.py
@@ -48,13 +48,13 @@
# else:
# main.log.warn( "Did not pull new code so skipping mvn " +
# "clean install" )
- cleanInstallResult = main.ONOSbench.cleanInstall()
+ cleanInstallResult = main.ONOSbench.cleanInstall( mciTimeout= 1000 )
main.ONOSbench.getVersion( report=True )
#cellResult = main.ONOSbench.setCell( cellName )
#verifyResult = main.ONOSbench.verifyCell()
main.step( "Creating ONOS package" )
- packageResult = main.ONOSbench.onosPackage()
+ packageResult = main.ONOSbench.onosPackage( opTimeout=500 )
main.step( "Installing ONOS package" )
onos1InstallResult = main.ONOSbench.onosInstall( options="-f",
@@ -63,13 +63,14 @@
main.step( "Checking if ONOS is up yet" )
#time.sleep( 300 )
for i in range( 2 ):
- onos1Isup = main.ONOSbench.isup( ONOS1Ip )
+ onos1Isup = main.ONOSbench.isup( ONOS1Ip, onosWaitStartTimeout=420 )
if onos1Isup:
break
if not onos1Isup:
main.log.report( "ONOS1 didn't start!" )
- cliResult = main.ONOScli.startOnosCli( ONOS1Ip )
+ cliResult = main.ONOScli.startOnosCli( ONOS1Ip,
+ commandlineTimeout=100, onosStartTimeout=600)
case1Result = ( cleanInstallResult and packageResult and
cellResult and verifyResult and