Changes made to reflect new driver functions
diff --git a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
index 38a754e..32a6601 100644
--- a/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
+++ b/TestON/tests/RCOnosPerf4nodes/RCOnosPerf4nodes.py
@@ -27,7 +27,7 @@
main.RamCloud3.del_db()
main.RamCloud4.del_db()
main.step("Start tcpdump on mn")
- main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
+ main.Mininet2.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
# main.step("Start tcpdump on mn")
# main.Mininet1.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
main.step("Starting ONOS")
@@ -266,16 +266,16 @@
import time
import os
main.case("Starting long ping... ")
- main.Mininet4.pingLong(src=main.params['PING']['source1'],target=main.params['PING']['target1'])
- main.Mininet4.pingLong(src=main.params['PING']['source2'],target=main.params['PING']['target2'])
- main.Mininet4.pingLong(src=main.params['PING']['source3'],target=main.params['PING']['target3'])
- main.Mininet4.pingLong(src=main.params['PING']['source4'],target=main.params['PING']['target4'])
- main.Mininet4.pingLong(src=main.params['PING']['source5'],target=main.params['PING']['target5'])
- main.Mininet4.pingLong(src=main.params['PING']['source6'],target=main.params['PING']['target6'])
- main.Mininet4.pingLong(src=main.params['PING']['source7'],target=main.params['PING']['target7'])
- main.Mininet4.pingLong(src=main.params['PING']['source8'],target=main.params['PING']['target8'])
- main.Mininet4.pingLong(src=main.params['PING']['source9'],target=main.params['PING']['target9'])
- main.Mininet4.pingLong(src=main.params['PING']['source10'],target=main.params['PING']['target10'])
+ main.Mininet4.pingLong(src=main.params['PING']['source1'],target=main.params['PING']['target1'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source2'],target=main.params['PING']['target2'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source3'],target=main.params['PING']['target3'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source4'],target=main.params['PING']['target4'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source5'],target=main.params['PING']['target5'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source6'],target=main.params['PING']['target6'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source7'],target=main.params['PING']['target7'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source8'],target=main.params['PING']['target8'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source9'],target=main.params['PING']['target9'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source10'],target=main.params['PING']['target10'], pingTime = 100)
main.step("Check that the pings are going")
result = main.Mininet4.pingstatus(src=main.params['PING']['source1'])
result = result & main.Mininet4.pingstatus(src=main.params['PING']['source2'])
@@ -339,16 +339,16 @@
import os
time.sleep(20)
main.case("Starting long ping... ")
- main.Mininet4.pingLong(src=main.params['PING']['source1'],target=main.params['PING']['target1'])
- main.Mininet4.pingLong(src=main.params['PING']['source2'],target=main.params['PING']['target2'])
- main.Mininet4.pingLong(src=main.params['PING']['source3'],target=main.params['PING']['target3'])
- main.Mininet4.pingLong(src=main.params['PING']['source4'],target=main.params['PING']['target4'])
- main.Mininet4.pingLong(src=main.params['PING']['source5'],target=main.params['PING']['target5'])
- main.Mininet4.pingLong(src=main.params['PING']['source6'],target=main.params['PING']['target6'])
- main.Mininet4.pingLong(src=main.params['PING']['source7'],target=main.params['PING']['target7'])
- main.Mininet4.pingLong(src=main.params['PING']['source8'],target=main.params['PING']['target8'])
- main.Mininet4.pingLong(src=main.params['PING']['source9'],target=main.params['PING']['target9'])
- main.Mininet4.pingLong(src=main.params['PING']['source10'],target=main.params['PING']['target10'])
+ main.Mininet4.pingLong(src=main.params['PING']['source1'],target=main.params['PING']['target1'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source2'],target=main.params['PING']['target2'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source3'],target=main.params['PING']['target3'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source4'],target=main.params['PING']['target4'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source5'],target=main.params['PING']['target5'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source6'],target=main.params['PING']['target6'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source7'],target=main.params['PING']['target7'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source8'],target=main.params['PING']['target8'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source9'],target=main.params['PING']['target9'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source10'],target=main.params['PING']['target10'], pingTime = 100)
main.step("Check that the pings are going")
result = main.Mininet4.pingstatus(src=main.params['PING']['source1'])
result = result & main.Mininet4.pingstatus(src=main.params['PING']['source2'])
@@ -396,16 +396,16 @@
time.sleep(20)
main.case("Starting long ping... ")
- main.Mininet4.pingLong(src=main.params['PING']['source1'],target=main.params['PING']['target1'])
- main.Mininet4.pingLong(src=main.params['PING']['source2'],target=main.params['PING']['target2'])
- main.Mininet4.pingLong(src=main.params['PING']['source3'],target=main.params['PING']['target3'])
- main.Mininet4.pingLong(src=main.params['PING']['source4'],target=main.params['PING']['target4'])
- main.Mininet4.pingLong(src=main.params['PING']['source5'],target=main.params['PING']['target5'])
- main.Mininet4.pingLong(src=main.params['PING']['source6'],target=main.params['PING']['target6'])
- main.Mininet4.pingLong(src=main.params['PING']['source7'],target=main.params['PING']['target7'])
- main.Mininet4.pingLong(src=main.params['PING']['source8'],target=main.params['PING']['target8'])
- main.Mininet4.pingLong(src=main.params['PING']['source9'],target=main.params['PING']['target9'])
- main.Mininet4.pingLong(src=main.params['PING']['source10'],target=main.params['PING']['target10'])
+ main.Mininet4.pingLong(src=main.params['PING']['source1'],target=main.params['PING']['target1'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source2'],target=main.params['PING']['target2'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source3'],target=main.params['PING']['target3'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source4'],target=main.params['PING']['target4'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source5'],target=main.params['PING']['target5'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source6'],target=main.params['PING']['target6'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source7'],target=main.params['PING']['target7'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source8'],target=main.params['PING']['target8'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source9'],target=main.params['PING']['target9'], pingTime = 100)
+ main.Mininet4.pingLong(src=main.params['PING']['source10'],target=main.params['PING']['target10'], pingTime = 100)
main.step("Check that the pings are going")
result = main.Mininet4.pingstatus(src=main.params['PING']['source1'])
result = result & main.Mininet4.pingstatus(src=main.params['PING']['source2'])
@@ -471,6 +471,6 @@
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")
- main.Mininet1.stop_tcpdump()
+ main.Mininet2.stop_tcpdump()