loxi-prep: remove action_ prefix from callers
diff --git a/tests/actions.py b/tests/actions.py
index 522918a..ac4bc17 100644
--- a/tests/actions.py
+++ b/tests/actions.py
@@ -142,7 +142,7 @@
#Create a packet
pkt = simple_tcp_packet()
match = parse.packet_to_flow_match(pkt)
- act = ofp.action.action_output()
+ act = ofp.action.output()
#Delete all flows
delete_all_flows(self.controller)
@@ -193,7 +193,7 @@
#Create packet
pkt = simple_tcp_packet()
match = parse.packet_to_flow_match(pkt)
- act = ofp.action.action_output()
+ act = ofp.action.output()
for ingress_port in of_ports:
#Delete all flows
@@ -245,7 +245,7 @@
#Clear switch state
pkt = simple_tcp_packet()
match = parse.packet_to_flow_match(pkt)
- act = ofp.action.action_output()
+ act = ofp.action.output()
for ingress_port in of_ports:
#Delete the flows
@@ -293,7 +293,7 @@
#Create a packet
pkt = simple_tcp_packet()
match = parse.packet_to_flow_match(pkt)
- act = ofp.action.action_output()
+ act = ofp.action.output()
#Delete all flows
delete_all_flows(self.controller)
@@ -343,7 +343,7 @@
#Create a packet
pkt = simple_tcp_packet()
match = parse.packet_to_flow_match(pkt)
- act = ofp.action.action_output()
+ act = ofp.action.output()
#Delete the flows
delete_all_flows(self.controller)
@@ -397,7 +397,7 @@
pkt_out =ofp.message.packet_out();
pkt_out.data = str(pkt)
pkt_out.in_port = of_ports[0]
- act = ofp.action.action_output()
+ act = ofp.action.output()
act.port = ofp.OFPP_TABLE
pkt_out.actions.add(act)
self.controller.message_send(pkt_out)
@@ -440,7 +440,7 @@
pkt = simple_tcp_packet(pktlen=len_wo_vid)
exp_pkt = simple_tcp_packet(pktlen=len_w_vid, dl_vlan_enable=True,
dl_vlan=new_vid,dl_vlan_pcp=0)
- vid_act = ofp.action.action_set_vlan_vid()
+ vid_act = ofp.action.set_vlan_vid()
vid_act.vlan_vid = new_vid
#Insert flow with action -- set vid , Send packet matching the flow, Verify recieved packet is expected packet
@@ -477,7 +477,7 @@
new_vid = 3
pkt = simple_tcp_packet(dl_vlan_enable=True, dl_vlan=old_vid)
exp_pkt = simple_tcp_packet(dl_vlan_enable=True, dl_vlan=new_vid)
- vid_act = ofp.action.action_set_vlan_vid()
+ vid_act = ofp.action.set_vlan_vid()
vid_act.vlan_vid = new_vid
#Insert flow with action -- set vid , Send packet matching the flow.Verify recieved packet is expected packet.
@@ -515,7 +515,7 @@
pktlen = 64 if config["minsize"] < 64 else config["minsize"]
pkt = simple_tcp_packet(pktlen=pktlen)
exp_pkt = simple_tcp_packet(dl_vlan_enable=True, dl_vlan=vlan_id,dl_vlan_pcp=vlan_pcp, pktlen=pktlen + 4)
- act = ofp.action.action_set_vlan_pcp()
+ act = ofp.action.set_vlan_pcp()
act.vlan_pcp = vlan_pcp
#Insert flow with action -- set vLAN priority, Send packet matching the flow, Verify recieved packet is expected packet
@@ -554,7 +554,7 @@
new_vlan_pcp = 3
pkt = simple_tcp_packet(dl_vlan_enable=True, dl_vlan=vid, dl_vlan_pcp=old_vlan_pcp)
exp_pkt = simple_tcp_packet(dl_vlan_enable=True, dl_vlan=vid, dl_vlan_pcp=new_vlan_pcp)
- vid_act = ofp.action.action_set_vlan_pcp()
+ vid_act = ofp.action.set_vlan_pcp()
vid_act.vlan_pcp = new_vlan_pcp
#Insert flow with action -- set vLAN priority, Send tagged packet matching the flow, Verify recieved packet is expected packet