raise an AssertionError if do_barrier fails
This removes a lot of boilerplate code.
diff --git a/tests/pktact.py b/tests/pktact.py
index 3c9b04c..17b555f 100644
--- a/tests/pktact.py
+++ b/tests/pktact.py
@@ -125,7 +125,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " +
str(ingress_port))
@@ -189,7 +189,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " +
str(ingress_port))
@@ -276,7 +276,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
# Get current stats for selected egress queue
@@ -405,7 +405,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
# Get current stats for selected egress queue
@@ -525,7 +525,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " +
str(ingress_port))
@@ -579,7 +579,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
self.dataplane.send(ingress_port, str(pkt))
@@ -631,7 +631,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
self.dataplane.send(ingress_port, str(pkt))
@@ -674,7 +674,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
self.dataplane.send(ingress_port, str(pkt))
@@ -722,7 +722,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
self.dataplane.send(ingress_port, str(pkt))
@@ -765,7 +765,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
self.dataplane.send(ingress_port, str(pkt))
@@ -813,7 +813,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
self.dataplane.send(ingress_port, str(pkt))
@@ -870,7 +870,7 @@
logging.info("Inserting flow")
self.controller.message_send(request)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
logging.info("No flood port is " + str(no_flood_port))
@@ -883,7 +883,7 @@
rv = port_config_set(self.controller, no_flood_port,
0, ofp.OFPPC_NO_FLOOD)
self.assertEqual(rv, 0, "Failed to reset port config")
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
# Check that packets are now flooded to no_flood_port
logging.info("Sending packet to dp port " + str(ingress_port))
@@ -952,7 +952,7 @@
def _ClearTable(self):
delete_all_flows(self.controller)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
def runTest(self):
@@ -1030,7 +1030,7 @@
msg.out_port = ofp.OFPP_NONE
logging.debug("Remove flow with priority " + str(prio))
self.controller.message_send(msg)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
else:
raise Exception("Not initialized")
@@ -1777,7 +1777,7 @@
# Install the first set of flows
for f_idx in range(flow_count):
self.controller.message_send(flows[0][f_idx])
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Installed %d flows" % flow_count)
@@ -1797,8 +1797,7 @@
for f_idx in range(flow_count):
self.controller.message_send(flows[t_idx][f_idx])
updates += 1
- self.assertEqual(do_barrier(self.controller), 0,
- "Barrier failed")
+ do_barrier(self.controller)
end = time.time()
divisor = end - start or (end - start + 1)
@@ -1949,7 +1948,7 @@
# This flow should not match, but it has a higher priority.
addFlow(matching=False, priority=1, output_port=ofp.OFPP_IN_PORT)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " + str(ingress_port))
self.dataplane.send(ingress_port, str(pkt))
@@ -2086,7 +2085,7 @@
request2.actions.add(act)
self.controller.message_send(request2)
- self.assertEqual(do_barrier(self.controller), 0, "Barrier failed")
+ do_barrier(self.controller)
logging.info("Sending packet to dp port " +
str(ingress_port))