Fix SAMP tests
Change-Id: I2850ef6c48e4b0806035916766b1d3351bcaaf98
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index ecf1b03..47baeb0 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -2407,7 +2407,7 @@
except Exception:
main.log.exception( "Uncaught exception" )
- def startBasicONOS( self, nodeList, opSleep=60, onosStartupSleep=60 ):
+ def startBasicONOS( self, nodeList, opSleep=60, onosStartupSleep=30 ):
'''
Start onos cluster with defined nodes, but only with drivers app
'''
@@ -2426,9 +2426,17 @@
main.log.info( self.name + ": Creating ONOS package" )
packageResult = self.buckBuild( timeout=opSleep )
+ main.log.info( self.name + ": Uninstalling ONOS" )
+ for nd in nodeList:
+ self.onosUninstall( nodeIp=nd )
+
main.log.info( self.name + ": Installing ONOS package" )
for nd in nodeList:
- self.onosInstall( node=nd )
+ self.onosInstall( node=nd )
+
+ main.log.info( self.name + ": Set up ONOS secure SSH" )
+ for nd in nodeList:
+ self.onosSecureSSH( node=nd )
main.log.info( self.name + ": Starting ONOS service" )
time.sleep( onosStartupSleep )