loxi-prep: subtype flow_mod classes
diff --git a/tests/detailed_contr_sw_messages.py b/tests/detailed_contr_sw_messages.py
index 65e7201..a32251d 100644
--- a/tests/detailed_contr_sw_messages.py
+++ b/tests/detailed_contr_sw_messages.py
@@ -52,8 +52,7 @@
match3.wildcards = ofp.OFPFW_ALL-ofp.OFPFW_IN_PORT
match3.in_port = of_ports[0]
- msg3 = ofp.message.flow_mod()
- msg3.command = ofp.OFPFC_ADD
+ msg3 = ofp.message.flow_add()
msg3.match = match3
msg3.flags |= ofp.OFPFF_CHECK_OVERLAP
msg3.cookie = random.randint(0,9007199254740992)
@@ -173,9 +172,8 @@
match = parse.packet_to_flow_match(pkt)
match.in_port = of_ports[0]
- request = ofp.message.flow_mod()
+ request = ofp.message.flow_add()
request.match = match
- request.command = ofp.OFPFC_ADD
request.flags = request.flags|ofp.OFPFF_EMERG
request.hard_timeout =9
request.idle_timeout =9
@@ -220,8 +218,7 @@
#Generate a flow-mod,command OFPC_MODIFY
- request = ofp.message.flow_mod()
- request.command = ofp.OFPFC_MODIFY
+ request = ofp.message.flow_modify()
request.match.wildcards = ofp.OFPFW_ALL-ofp.OFPFW_IN_PORT
request.match.in_port = of_ports[0]
request.cookie = random.randint(0,9007199254740992)
@@ -337,10 +334,9 @@
logging.info("Expecting switch to ignore the command , without generating errors")
# Issue a delete command
- msg = ofp.message.flow_mod()
+ msg = ofp.message.flow_delete()
msg.match.wildcards = ofp.OFPFW_ALL
msg.out_port = ofp.OFPP_NONE
- msg.command = ofp.OFPFC_DELETE
msg.buffer_id = 0xffffffff
# Verify no message or error is generated by polling the the control plane
@@ -389,7 +385,7 @@
'Received flow removed message for the flow with flow_rem flag not set')
# Insert another flow F' with OFPFF_SEND_FLOW_REM flag set.
- msg9 = ofp.message.flow_mod()
+ msg9 = ofp.message.flow_add()
msg9.match.wildcards = ofp.OFPFW_ALL
msg9.cookie = random.randint(0,9007199254740992)
msg9.buffer_id = 0xffffffff
@@ -432,9 +428,8 @@
pkt = simple_tcp_packet()
match = parse.packet_to_flow_match(pkt)
match.in_port = of_ports[0]
- request = ofp.message.flow_mod()
+ request = ofp.message.flow_add()
request.match = match
- request.command = ofp.OFPFC_ADD
request.flags = request.flags|ofp.OFPFF_EMERG|ofp.OFPFF_SEND_FLOW_REM
act = ofp.action.output()
act.port = of_ports[1]
@@ -564,9 +559,8 @@
verify_tablestats(self,expect_active=1)
#Send delete command matching the flow-1 but with contraint out_port = of_port[2]
- msg7 = ofp.message.flow_mod()
+ msg7 = ofp.message.flow_delete()
msg7.out_port = of_ports[2]
- msg7.command = ofp.OFPFC_DELETE
msg7.buffer_id = 0xffffffff
msg7.match = match
@@ -580,9 +574,8 @@
logging.info("Expecting switch to delete the flow")
#Send Delete command with contraint out_port = of_ports[1]
- msg7 = ofp.message.flow_mod()
+ msg7 = ofp.message.flow_delete()
msg7.out_port = of_ports[1]
- msg7.command = ofp.OFPFC_DELETE
msg7.buffer_id = 0xffffffff
msg7.match = match
@@ -612,7 +605,7 @@
logging.info("Expecting the flow entry to delete with given idle_timeout")
#Insert a flow entry with idle_timeout=1.Send_Flow_Rem flag set
- msg9 = ofp.message.flow_mod()
+ msg9 = ofp.message.flow_add()
msg9.match.wildcards = ofp.OFPFW_ALL
msg9.cookie = random.randint(0,9007199254740992)
msg9.buffer_id = 0xffffffff
@@ -694,7 +687,7 @@
logging.info("Expecting the flow entry to delete with given hard_timeout")
# Insert a flow entry with hardtimeout=1 and send_flow_removed flag set
- msg9 = ofp.message.flow_mod()
+ msg9 = ofp.message.flow_add()
msg9.match.wildcards = ofp.OFPFW_ALL
msg9.cookie = random.randint(0,9007199254740992)
msg9.buffer_id = 0xffffffff
@@ -745,9 +738,8 @@
self.assertTrue(match3 is not None, "Could not generate flow match from pkt")
match3.wildcards = ofp.OFPFW_ALL-ofp.OFPFW_IN_PORT
match3.in_port = of_ports[0]
- msg3 = ofp.message.flow_mod()
+ msg3 = ofp.message.flow_add()
msg3.out_port = of_ports[2] # ignored by flow add,flow modify
- msg3.command = ofp.OFPFC_ADD
msg3.cookie = random.randint(0,9007199254740992)
msg3.buffer_id = 0xffffffff
msg3.hard_timeout = 1