Cleaning up the code
diff --git a/ofdpa/bugsKnown.py b/ofdpa/bugsKnown.py
index 13f000f..0f81ce8 100755
--- a/ofdpa/bugsKnown.py
+++ b/ofdpa/bugsKnown.py
@@ -317,6 +317,7 @@
#add MPLS L3 VPN group
mpls_label_gid = encode_mpls_label_group_id(OFDPA_MPLS_GROUP_SUBTYPE_L3_VPN_LABEL, index=port)
ecmp_msg=add_l3_ecmp_group(self.controller, vlan_id, [mpls_label_gid])
+ Groups._put(ecmp_msg.group_id)
do_barrier(self.controller)
#add routing flow
dst_ip = 0x0
@@ -472,4 +473,4 @@
verify_packet_in(self, vlan_pkt, of_port, ofp.OFPR_NO_MATCH)
- verify_no_other_packets(self)
\ No newline at end of file
+ verify_no_other_packets(self)
diff --git a/ofdpa/flows.py b/ofdpa/flows.py
index ad6a190..52d4376 100755
--- a/ofdpa/flows.py
+++ b/ofdpa/flows.py
@@ -58,14 +58,10 @@
logging.info("PacketInMiss test, port %d", of_port)
self.dataplane.send(of_port, vlan_pkt)
- verify_no_packet_in(self, vlan_pkt, of_port, ofp.OFPR_ACTION)
-
- logging.info("Inserting packet in flow to controller")
- self.controller.message_send(request)
+ verify_no_packet_in(self, vlan_pkt, of_port)
+ delete_all_flows(self.controller)
do_barrier(self.controller)
- delete_all_flows(self.controller)
-
match = ofp.match()
match.oxm_list.append(ofp.oxm.eth_type(0x0800))
match.oxm_list.append(ofp.oxm.ip_proto(17))
@@ -83,6 +79,7 @@
priority=1)
logging.info("Inserting packet in flow to controller")
self.controller.message_send(request)
+ do_barrier(self.controller)
for of_port in config["port_map"].keys():
logging.info("PacketInMiss test, port %d", of_port)
@@ -210,6 +207,7 @@
Groups.put(L2gid)
msg = add_l2_flood_group(self.controller, ports, vlan_id, vlan_id)
+ Groups.put(msg.group_id)
add_bridge_flow(self.controller, None, vlan_id, msg.group_id, True)
do_barrier(self.controller)