Merge "[ONOS-7103][ONOS-7339]: Additions and Refractoring to the Docker test."
diff --git a/TestON/tests/HA/HAscaling/HAscaling.py b/TestON/tests/HA/HAscaling/HAscaling.py
index e87275d..93e65c9 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.py
+++ b/TestON/tests/HA/HAscaling/HAscaling.py
@@ -173,7 +173,7 @@
else:
equal = False
main.Cluster.setRunningNode( int( re.search( "\d+", scale ).group( 0 ) ) )
- main.log.info( "Scaling to {} nodes".format( main.Cluster.numCtrls ) )
+ main.step( "Scaling to {} nodes".format( main.Cluster.numCtrls ) )
genResult = main.Server.generateFile( main.Cluster.numCtrls, equal=equal )
utilities.assert_equals( expect=main.TRUE, actual=genResult,
onpass="New cluster metadata file generated",
diff --git a/TestON/tests/dependencies/Cluster.py b/TestON/tests/dependencies/Cluster.py
index 6ea93e3..26981b9 100644
--- a/TestON/tests/dependencies/Cluster.py
+++ b/TestON/tests/dependencies/Cluster.py
@@ -239,15 +239,10 @@
ctrl = self.controllers[ i ]
onosIsUp = onosIsUp and onosUp[ i ]
if onosUp[ i ] == main.TRUE:
- main.log.report( ctrl.name + " is up and ready" )
+ main.log.info( ctrl.name + " is up and ready" )
else:
- main.log.report( ctrl.name + " may not be up, stop and " +
- "start ONOS again " )
- stopResult = stopResult and main.ONOSbench.onosStop( ctrl.ipAddress )
- startResult = startResult and main.ONOSbench.onosStart( ctrl.ipAddress )
- if not startResult or stopResult:
- main.log.report( ctrl.name + " did not start correctly." )
- return onosIsUp and stopResult and startResult
+ main.log.warn( ctrl.name + " may not be up." )
+ return onosIsUp
def kill( self, killMax, stopOnos ):
"""