Device Discovery changes
diff --git a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
index 90fd3a8..b4b73f4 100644
--- a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
+++ b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
@@ -34,6 +34,7 @@
main.Zookeeper2.start()
main.Zookeeper3.start()
main.Zookeeper4.start()
+ time.sleep(4)
main.RamCloud1.del_db()
main.RamCloud2.del_db()
main.RamCloud3.del_db()
@@ -440,6 +441,7 @@
def CASE66(self, main):
main.log.report("Checking ONOS logs for exceptions")
+ count = 0
check1 = main.ONOS1.check_exceptions()
main.log.report("Exceptions in ONOS1 logs: \n" + check1)
check2 = main.ONOS2.check_exceptions()
@@ -448,9 +450,10 @@
main.log.report("Exceptions in ONOS3 logs: \n" + check3)
check4 = main.ONOS4.check_exceptions()
main.log.report("Exceptions in ONOS4 logs: \n" + check4)
- result = main.FALSE
+ result = main.TRUE
if (check1 or check2 or check3 or check4):
- result = main.TRUE
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="No Exceptions found in the logs",onfail="Exceptions found")
+ result = main.FALSE
+ count = len(check1.splitlines()) + len(check2.splitlines()) + len(check3.splitlines()) + len(check4.splitlines())
+ utilities.assert_equals(expect=main.TRUE,actual=result,onpass="No Exceptions found in the logs",onfail=str(count) + " Exceptions were found in the logs")