[ONOS-7937] Add option to skip alarm logging in cleanAndExit
Change-Id: Ibee1688e8ac426798c21f0c347af7d4e8c2ca6cf
(cherry picked from commit 7880b371b7ada1dfc1ef5ae2beee1e2b57070895)
diff --git a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
index d7872fd..fe633f1 100644
--- a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
+++ b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
@@ -146,6 +146,9 @@
onpass="Post Success",
onfail="Post Failed " + str( Poststatus ) + str( result ) )
+ if not Poststatus:
+ main.cleanAndExit( alarm=False )
+
main.step( "Get Data via HTTP" )
Getstatus, result = ctrl.REST.send( ctrlip, port, network.id, path + 'networks/',
'GET', None, None )
diff --git a/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py b/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py
index bc4f3c3..c9b6ab1 100644
--- a/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py
+++ b/TestON/tests/PLAT/PLATdockertest/PLATdockertest.py
@@ -112,7 +112,7 @@
main.cleanAndExit()
if imageTagCounter > len( imageTagList ):
main.log.info( "All images have been tested" )
- main.cleanAndExit()
+ main.cleanAndExit( alarm=False )
def CASE5( self, main ):
"""
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py b/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py
index 81d2d96..fe3b1e2 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction/dependencies/Functions.py
@@ -151,7 +151,7 @@
onfail="Ping test results are Not expected" )
if not result:
- main.cleanAndExit()
+ main.cleanAndExit( alarm=False )
def pingHostToHost( main,
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py
index 8edc284..f280d44 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunctionCluster/dependencies/Functions.py
@@ -145,7 +145,7 @@
onfail="Ping test results are Not expected" )
if not result:
- main.cleanAndExit()
+ main.cleanAndExit( alarm=False )
def pingHostToHost( main, hosts=[ "h64514", "h64515", "h64516" ],
diff --git a/TestON/tests/dependencies/ONOSSetup.py b/TestON/tests/dependencies/ONOSSetup.py
index a3f0e2b..cf1e14e 100644
--- a/TestON/tests/dependencies/ONOSSetup.py
+++ b/TestON/tests/dependencies/ONOSSetup.py
@@ -440,8 +440,7 @@
ctrl.name,
ctrl.CLI.sendline( "scr:list | grep -v ACTIVE" ) ) )
main.log.error( "Failed to start ONOS, stopping test" )
- main.log.alarm( "Failed to start ONOS: not all nodes are in READY state" )
- main.cleanAndExit()
+ main.cleanAndExit( msg="Failed to start ONOS: not all nodes are in READY state" )
return main.TRUE
def checkOnosApps( self, cluster, apps ):