Some changes for deldb
diff --git a/TestON/tests/ONOSSanity4/ONOSSanity4.py b/TestON/tests/ONOSSanity4/ONOSSanity4.py
index df460c3..6bd2367 100644
--- a/TestON/tests/ONOSSanity4/ONOSSanity4.py
+++ b/TestON/tests/ONOSSanity4/ONOSSanity4.py
@@ -51,10 +51,19 @@
main.ONOS4.git_compile()
main.ONOS1.print_version()
main.step("Start up ZK, RC, and ONOS")
+ main.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
+ main.RC1.del_db()
+ main.RC2.del_db()
+ main.RC3.del_db()
+ main.RC4.del_db()
main.ONOS1.start_all()
main.ONOS2.start_all()
main.ONOS3.start_all()
main.ONOS4.start_all()
+
#main.step("Start Up Mininet")
main.step("Start up Rest Server")
main.ONOS1.start_rest()
@@ -140,8 +149,16 @@
for i in range(25):
if i<3:
main.Mininet1.assign_sw_controller(sw=str(i+1),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'])
-
+ elif i<5:
+ main.Mininet1.assign_sw_controller(sw=str(i+1),ip1=main.params['CTRL']['ip2'],port1=main.params['CTRL']['port2'])
+ elif i<16:
+ main.Mininet1.assign_sw_controller(sw=str(i+1),ip1=main.params['CTRL']['ip3'],port1=main.params['CTRL']['port3'])
+ else:
+ main.Mininet1.assign_sw_controller(sw=str(i+1),ip1=main.params['CTRL']['ip4'],port1=main.params['CTRL']['port4'])
main.step("Verify Master controllers of each switch")
+ for i in range(25):
+ if i<3:
+
#************************************************************************************************************************************
diff --git a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
index 0b73201..90fd3a8 100644
--- a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
+++ b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
@@ -12,6 +12,10 @@
The test will only pass if ONOS is running properly, and has a full view of all topology elements.
'''
import time
+
+
+
+
main.ONOS1.stop()
main.ONOS2.stop()
main.ONOS3.stop()
@@ -21,14 +25,21 @@
main.RamCloud2.stop_serv()
main.RamCloud3.stop_serv()
main.RamCloud4.stop_serv()
- main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS1.handle.sendline("y")
- main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS2.handle.sendline("y")
- main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS3.handle.sendline("y")
- main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS4.handle.sendline("y")
+ main.Zookeeper1.stop()
+ main.Zookeeper2.stop()
+ main.Zookeeper3.stop()
+ main.Zookeeper4.stop()
+
+ main.Zookeeper1.start()
+ main.Zookeeper2.start()
+ main.Zookeeper3.start()
+ main.Zookeeper4.start()
+ main.RamCloud1.del_db()
+ main.RamCloud2.del_db()
+ main.RamCloud3.del_db()
+ main.RamCloud4.del_db()
+
+
time.sleep(10)
main.RamCloud1.start_coor()
main.RamCloud1.start_serv()
@@ -427,3 +438,19 @@
result = result & main.Mininet4.pingKill()
utilities.assert_equals(expect=main.TRUE,actual=result)
+ def CASE66(self, main):
+ main.log.report("Checking ONOS logs for exceptions")
+ check1 = main.ONOS1.check_exceptions()
+ main.log.report("Exceptions in ONOS1 logs: \n" + check1)
+ check2 = main.ONOS2.check_exceptions()
+ main.log.report("Exceptions in ONOS2 logs: \n" + check2)
+ check3 = main.ONOS3.check_exceptions()
+ 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
+ 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")
+
+
diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
index a05c954..ce4dde8 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
@@ -590,11 +590,22 @@
main.log.report("\tPING TEST FAIL")
utilities.assert_equals(expect=main.TRUE,actual=result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
+
def CASE66(self, main):
main.log.report("Checking ONOS logs for exceptions")
- main.log.report("Exceptions in ONOS1 logs: \n" + main.ONOS1.check_exceptions())
- main.log.report("Exceptions in ONOS2 logs: \n" + main.ONOS2.check_exceptions())
- main.log.report("Exceptions in ONOS3 logs: \n" + main.ONOS3.check_exceptions())
- main.log.report("Exceptions in ONOS4 logs: \n" + main.ONOS4.check_exceptions())
- utilities.assert_equals(expect=main.TRUE,actual=main.TRUE,onpass="Exception check pass",onfail="Exception check fail")
+ count = 0
+ check1 = main.ONOS1.check_exceptions()
+ main.log.report("Exceptions in ONOS1 logs: \n" + check1)
+ check2 = main.ONOS2.check_exceptions()
+ main.log.report("Exceptions in ONOS2 logs: \n" + check2)
+ check3 = main.ONOS3.check_exceptions()
+ 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
+ if (check1 or check2 or check3 or check4):
+ result = main.TRUE
+ 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")
+
diff --git a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params
index f04ef3a..04a4142 100644
--- a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params
+++ b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params
@@ -1,5 +1,5 @@
<PARAMS>
- <testcases>1,2,3,4</testcases>
+ <testcases>1,2,3,4,66</testcases>
<Iterations>2</Iterations>
<WaitTime>50</WaitTime>
<TargetTime>50</TargetTime>
diff --git a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
index 07fd8ff..53bc154 100644
--- a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
+++ b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
@@ -21,15 +21,13 @@
main.RamCloud2.stop_serv()
main.RamCloud3.stop_serv()
main.RamCloud4.stop_serv()
- main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS1.handle.sendline("y")
- main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS2.handle.sendline("y")
- main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS3.handle.sendline("y")
- main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS4.handle.sendline("y")
+ time.sleep(4)
+ main.RamCloud1.del_db()
+ main.RamCloud2.del_db()
+ main.RamCloud3.del_db()
+ main.RamCloud4.del_db()
time.sleep(10)
+
main.RamCloud1.start_coor()
time.sleep(10)
main.RamCloud1.start_serv()
@@ -275,3 +273,19 @@
utilities.assert_equals(expect=main.TRUE,actual=test)
+ def CASE66(self, main):
+ main.log.report("Checking ONOS logs for exceptions")
+ check1 = main.ONOS1.check_exceptions()
+ main.log.report("Exceptions in ONOS1 logs: \n" + check1)
+ check2 = main.ONOS2.check_exceptions()
+ main.log.report("Exceptions in ONOS2 logs: \n" + check2)
+ check3 = main.ONOS3.check_exceptions()
+ 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
+ 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")
+
+
diff --git a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params
index 3f0c13a..5471d4e 100644
--- a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params
+++ b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.params
@@ -1,5 +1,5 @@
<PARAMS>
- <testcases>1,2,21,31,4,41,5,6,7,4,5,6,7</testcases>
+ <testcases>1,2,21,31,4,41,5,6,7,4,5,6,7,66</testcases>
<FLOWDEF>~/flowdef_files/Center_Triangle/flowdef_20.txt</FLOWDEF>
<CASE1>
<destination>h6</destination>
diff --git a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
index 8f64372..a5af4a4 100644
--- a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
+++ b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
@@ -28,14 +28,11 @@
main.Zookeeper2.start()
main.Zookeeper3.start()
main.Zookeeper4.start()
- main.ONOS1.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS1.handle.sendline("y")
- main.ONOS2.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS2.handle.sendline("y")
- main.ONOS3.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS3.handle.sendline("y")
- main.ONOS4.handle.sendline("~/ONOS/onos.sh rc deldb")
- main.ONOS4.handle.sendline("y")
+ time.sleep(3)
+ main.RamCloud1.del_db()
+ main.RamCloud2.del_db()
+ main.RamCloud3.del_db()
+ main.RamCloud4.del_db()
for i in range(2):
uptodate = main.ONOS1.git_pull()
main.ONOS2.git_pull()
@@ -591,3 +588,20 @@
main.log.report("\tPING TEST FAIL")
utilities.assert_equals(expect=main.TRUE,actual=result,onpass="NO PACKET LOSS, HOST IS REACHABLE",onfail="PACKET LOST, HOST IS NOT REACHABLE")
+
+ def CASE66(self, main):
+ main.log.report("Checking ONOS logs for exceptions")
+ check1 = main.ONOS1.check_exceptions()
+ main.log.report("Exceptions in ONOS1 logs: \n" + check1)
+ check2 = main.ONOS2.check_exceptions()
+ main.log.report("Exceptions in ONOS2 logs: \n" + check2)
+ check3 = main.ONOS3.check_exceptions()
+ 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
+ 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")
+
+