Fix regular expression in connect to look for the $ character instead of the end of line anchor
diff --git a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
index bd0763d..11ea4f6 100644
--- a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
+++ b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
@@ -21,8 +21,6 @@
main.RamCloud2.start_serv()
main.RamCloud3.start_serv()
main.RamCloud4.start_serv()
- time.sleep(20)
- main.ONOS1.drop_keyspace()
main.ONOS1.start()
time.sleep(10)
main.ONOS2.start()
@@ -40,7 +38,7 @@
data = main.Zookeeper1.isup()
utilities.assert_equals(expect=main.TRUE,actual=data,onpass="Zookeeper is up!",onfail="Zookeeper is down...")
main.step("Testing startup RamCloud")
- data = main.RamCloud1.isup()
+ data = main.RamCloud1.server_status()
if data == main.FALSE:
main.RamCloud1.stop_coor()
main.RamCloud1.stop_serv()
@@ -157,10 +155,12 @@
main.case("Taking care of these flows!")
main.step("Cleaning out any leftover flows...")
main.log.info("deleting...")
- main.ONOS1.delete_flow("all")
+ main.ONOS1.rm_flow()
+ # main.ONOS1.delete_flow("all")
main.log.info("adding...")
t1 = time.time()
- main.ONOS1.add_flow(main.params['FLOWDEF'])
+ main.ONOS1.ad_flow()
+ # main.ONOS1.add_flow(main.params['FLOWDEF'])
main.log.info("Checking...")
for i in range(15):
result = main.ONOS1.check_flow()