Reactive Test
diff --git a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
index b81b08a..2ef3eb3 100644
--- a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
+++ b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
@@ -13,22 +13,18 @@
main.ONOS2.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.properties")
main.ONOS3.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.properties")
main.ONOS4.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.properties")
-
+ main.ONOS1.stop_all()
+ main.ONOS2.stop_all()
+ main.ONOS3.stop_all()
+ main.ONOS4.stop_all()
main.Zookeeper1.start()
main.Zookeeper2.start()
main.Zookeeper3.start()
main.Zookeeper4.start()
- main.RamCloud1.stop_coor()
- main.RamCloud1.stop_serv()
- main.RamCloud2.stop_serv()
- main.RamCloud3.stop_serv()
- main.RamCloud4.stop_serv()
- time.sleep(10)
main.RamCloud1.del_db()
main.RamCloud2.del_db()
main.RamCloud3.del_db()
main.RamCloud4.del_db()
- time.sleep(10)
main.log.report("Pulling latest code from github to all nodes")
for i in range(2):
uptodate = main.ONOS1.git_pull()
@@ -58,17 +54,10 @@
# main.ONOS2.get_version()
# main.ONOS3.get_version()
# main.ONOS4.get_version()
- main.RamCloud1.start_coor()
- time.sleep(1)
- main.RamCloud1.start_serv()
- main.RamCloud2.start_serv()
- main.RamCloud3.start_serv()
- main.RamCloud4.start_serv()
- main.ONOS1.start()
- time.sleep(5)
- main.ONOS2.start()
- main.ONOS3.start()
- main.ONOS4.start()
+ main.ONOS1.start_all()
+ main.ONOS2.start_all()
+ main.ONOS3.start_all()
+ main.ONOS4.start_all()
main.ONOS2.start_rest()
time.sleep(10)
test= main.ONOS2.rest_status()
@@ -448,7 +437,7 @@
url = main.params['RESTCALL']['restURL']
t_topowait = 5
- t_restwait = 10
+ t_restwait = 5
main.log.report( "Wait time from topo change to ping set to " + str(t_topowait))
main.log.report( "Wait time from ping to rest call set to " + str(t_restwait))
#print "host=" + host + "; RestIP=" + RestIP1 + "; RestPort=" + str(RestPort)