Merge into master from pull request #85:
Fix load.FlowRemovedLoad test. (https://github.com/floodlight/oftest/pull/85)
diff --git a/src/python/oftest/testutils.py b/src/python/oftest/testutils.py
index 7a096d9..743e4e7 100644
--- a/src/python/oftest/testutils.py
+++ b/src/python/oftest/testutils.py
@@ -25,10 +25,11 @@
MINSIZE = 0
-def delete_all_flows(ctrl):
+def delete_all_flows(ctrl, send_barrier=True):
"""
Delete all flows on the switch
@param ctrl The controller object for the test
+ @param send_barrier Whether or not to send a barrier message
"""
logging.info("Deleting all flows")
@@ -43,7 +44,8 @@
msg.out_port = ofp.OFPP_ANY
msg.out_group = ofp.OFPG_ANY
ctrl.message_send(msg)
- do_barrier(ctrl)
+ if send_barrier:
+ do_barrier(ctrl)
return 0 # for backwards compatibility
def delete_all_groups(ctrl):
diff --git a/tests/load.py b/tests/load.py
index 7f9e005..7f9bcb1 100644
--- a/tests/load.py
+++ b/tests/load.py
@@ -287,7 +287,7 @@
self.checkBarrier()
# Trigger a flood of flow-removed messages
- delete_all_flows(self.controller)
+ delete_all_flows(self.controller, send_barrier=False)
count = 0
while True: