Fixing group id issue
diff --git a/ofdpa/bugsKnown.py b/ofdpa/bugsKnown.py
index be045f1..13f000f 100755
--- a/ofdpa/bugsKnown.py
+++ b/ofdpa/bugsKnown.py
@@ -1,5 +1,6 @@
"""
"""
+import Queue
from oftest import config
import logging
@@ -54,7 +55,7 @@
verify_no_packet(self, pkt, ofport)
verify_no_other_packets(self)
-
+@disabled
class Mtu4500(base_tests.SimpleDataPlane):
def runTest(self):
@@ -170,20 +171,110 @@
verify_packet(self, pkt, port2)
verify_packet(self, pkt, port3)
verify_no_other_packets(self)
-@disabled
+
+class LPMDirect(base_tests.SimpleDataPlane):
+ """
+ Insert IP packet
+ Receive MPLS packet
+ """
+ def runTest(self):
+ Groups=Queue.LifoQueue()
+ if len(config["port_map"]) <2:
+ logging.info("Port count less than 2, can't run this case")
+ return
+ intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
+ dst_mac=[0x00, 0x00, 0x00, 0x22, 0x22, 0x00]
+ dip=0xc0a80001
+ index=1
+ ports = config["port_map"].keys()
+ for port in ports:
+ #add l2 interface group
+ vlan_id=port
+ l2_gid, l2_msg = add_one_l2_interface_group(self.controller, port, vlan_id, True, True)
+ dst_mac[5]=vlan_id
+ #add MPLS interface group
+ mpls_gid, mpls_msg = add_mpls_intf_group(self.controller, l2_gid, dst_mac, intf_src_mac, vlan_id, port)
+ #add MPLS L3 VPN group
+ mpls_label_gid, mpls_label_msg = add_mpls_label_group(self.controller, subtype=OFDPA_MPLS_GROUP_SUBTYPE_L3_VPN_LABEL,
+ index=port, ref_gid= mpls_gid, push_mpls_header=True, set_mpls_label=port, set_bos=1, set_ttl=32)
+ #ecmp_msg=add_l3_ecmp_group(self.controller, vlan_id, [mpls_label_gid])
+ Groups._put(l2_gid)
+ Groups._put(mpls_gid)
+ Groups._put(mpls_label_gid)
+ do_barrier(self.controller)
+ #add vlan flow table
+ add_one_vlan_table_flow(self.controller, port, vlan_id, vrf=0, flag=VLAN_TABLE_FLAG_ONLY_TAG)
+ #add termination flow
+ add_termination_flow(self.controller, port, 0x0800, intf_src_mac, vlan_id)
+ #add routing flow
+ dst_ip = dip + (vlan_id<<8)
+ add_unicast_routing_flow(self.controller, 0x0800, dst_ip, 0xffffff00, mpls_label_gid, vrf=2)
+ #add_unicast_routing_flow(self.controller, 0x0800, dst_ip, 0xffffff00, ecmp_msg.group_id)
+ port = ports[0]
+ #add l2 interface group
+ vlan_id=port
+ l2_gid = encode_l2_interface_group_id(vlan_id, port)
+ dst_mac[5]=vlan_id
+ #add MPLS interface group
+ mpls_gid = encode_mpls_interface_group_id(0, port)
+ #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])
+ do_barrier(self.controller)
+ #add routing flow
+ dst_ip = 0x0
+ add_unicast_routing_flow(self.controller, 0x0800, dst_ip, 0x0, mpls_label_gid, vrf=2)
+ #add_unicast_routing_flow(self.controller, 0x0800, dst_ip, 0x0, ecmp_msg.group_id)
+
+ do_barrier(self.controller)
+
+ switch_mac = ':'.join(['%02X' % x for x in intf_src_mac])
+ for in_port in ports:
+ mac_src='00:00:00:22:22:%02X' % in_port
+ ip_src='192.168.%02d.1' % in_port
+ for out_port in ports:
+ if in_port == out_port:
+ continue
+ ip_dst='192.168.%02d.1' % out_port
+ parsed_pkt = simple_tcp_packet(pktlen=100, dl_vlan_enable=True, vlan_vid=in_port,
+ eth_dst=switch_mac, eth_src=mac_src, ip_ttl=64, ip_src=ip_src,
+ ip_dst=ip_dst)
+ pkt=str(parsed_pkt)
+ self.dataplane.send(in_port, pkt)
+ #build expect packet
+ mac_dst='00:00:00:22:22:%02X' % out_port
+ label = (out_port, 0, 1, 32)
+ exp_pkt = mpls_packet(pktlen=104, dl_vlan_enable=True, vlan_vid=out_port, ip_ttl=63, ip_src=ip_src,
+ ip_dst=ip_dst, eth_dst=mac_dst, eth_src=switch_mac, label=[label])
+ pkt=str(exp_pkt)
+ verify_packet(self, pkt, out_port)
+ verify_no_other_packets(self)
+ ip_dst='1.168.%02d.1' % ports[0]
+ parsed_pkt = simple_tcp_packet(pktlen=100, dl_vlan_enable=True, vlan_vid=in_port,
+ eth_dst=switch_mac, eth_src=mac_src, ip_ttl=64, ip_src=ip_src, ip_dst=ip_dst)
+ pkt=str(parsed_pkt)
+ self.dataplane.send(in_port, pkt)
+ #build expect packet
+ mac_dst='00:00:00:22:22:%02X' % ports[0]
+ label = (ports[0], 0, 1, 32)
+ exp_pkt = mpls_packet(pktlen=104, dl_vlan_enable=True, vlan_vid=ports[0], ip_ttl=63, ip_src=ip_src,
+ ip_dst=ip_dst, eth_dst=mac_dst, eth_src=switch_mac, label=[label])
+ pkt=str(exp_pkt)
+ verify_packet(self, pkt, ports[0])
+ verify_no_other_packets(self)
+ delete_all_flows(self.controller)
+ delete_groups(self.controller,Groups)
+
class LPM(base_tests.SimpleDataPlane):
"""
Insert IP packet
Receive MPLS packet
"""
def runTest(self):
- delete_all_flows(self.controller)
- delete_all_groups(self.controller)
-
+ Groups=Queue.LifoQueue()
if len(config["port_map"]) <2:
logging.info("Port count less than 2, can't run this case")
return
-
intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
dst_mac=[0x00, 0x00, 0x00, 0x22, 0x22, 0x00]
dip=0xc0a80001
@@ -200,6 +291,10 @@
mpls_label_gid, mpls_label_msg = add_mpls_label_group(self.controller, subtype=OFDPA_MPLS_GROUP_SUBTYPE_L3_VPN_LABEL,
index=port, ref_gid= mpls_gid, push_mpls_header=True, set_mpls_label=port, set_bos=1, set_ttl=32)
ecmp_msg=add_l3_ecmp_group(self.controller, vlan_id, [mpls_label_gid])
+ Groups._put(l2_gid)
+ Groups._put(mpls_gid)
+ Groups._put(mpls_label_gid)
+ Groups._put(ecmp_msg.group_id)
do_barrier(self.controller)
#add vlan flow table
add_one_vlan_table_flow(self.controller, port, vlan_id, vrf=0, flag=VLAN_TABLE_FLAG_ONLY_TAG)
@@ -264,6 +359,8 @@
pkt=str(exp_pkt)
verify_packet(self, pkt, ports[0])
verify_no_other_packets(self)
+ delete_all_flows(self.controller)
+ delete_groups(self.controller,Groups)
@disabled
class L2FloodTaggedUnknownSrc(base_tests.SimpleDataPlane):
@@ -375,63 +472,4 @@
verify_packet_in(self, vlan_pkt, of_port, ofp.OFPR_NO_MATCH)
- verify_no_other_packets(self)
-
-class _32ECMPL3(base_tests.SimpleDataPlane):
- """
- Port1(vid=in_port, src=00:00:00:22:22:in_port, 192.168.outport.1) ,
- Port2(vid=outport, dst=00:00:00:22:22:outport, 192.168.outport.1)
- """
- def runTest(self):
- delete_all_flows(self.controller)
- delete_all_groups(self.controller)
-
- if len(config["port_map"]) <2:
- logging.info("Port count less than 2, can't run this case")
- return
-
- intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
- dst_mac=[0x00, 0x00, 0x00, 0x22, 0x22, 0x00]
- dip=0xc0a80001
- #Hashes Test Name and uses it as id for installing unique groups
- class_id=abs(hash(inspect.stack()[0][3])) % (256)
- ports = config["port_map"].keys()
- for port in ports:
- vlan_id=port
- id=port+class_id<<8
- #add l2 interface group
- add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
- dst_mac[5]=vlan_id
- l3_msg=add_l3_unicast_group(self.controller, port, vlanid=vlan_id, id=id, src_mac=intf_src_mac, dst_mac=dst_mac)
- ecmp_msg=add_l3_ecmp_group(self.controller, id, [l3_msg.group_id])
- #add vlan flow table
- add_one_vlan_table_flow(self.controller, port, vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG)
- #add termination flow
- add_termination_flow(self.controller, port, 0x0800, intf_src_mac, vlan_id)
- #add unicast routing flow
- dst_ip = dip + (vlan_id<<8)
- add_unicast_routing_flow(self.controller, 0x0800, dst_ip, 0xffffffff, ecmp_msg.group_id)
-
- do_barrier(self.controller)
-
- switch_mac = ':'.join(['%02X' % x for x in intf_src_mac])
- for in_port in ports:
- mac_src='00:00:00:22:22:%02X' % in_port
- ip_src='192.168.%02d.1' % in_port
- for out_port in ports:
- if in_port == out_port:
- continue
- ip_dst='192.168.%02d.1' % out_port
- parsed_pkt = simple_tcp_packet(pktlen=100, dl_vlan_enable=True, vlan_vid=in_port,
- eth_dst=switch_mac, eth_src=mac_src, ip_ttl=64, ip_src=ip_src,
- ip_dst=ip_dst)
- pkt=str(parsed_pkt)
- self.dataplane.send(in_port, pkt)
- #build expected packet
- mac_dst='00:00:00:22:22:%02X' % out_port
- exp_pkt = simple_tcp_packet(pktlen=100, dl_vlan_enable=True, vlan_vid=out_port,
- eth_dst=mac_dst, eth_src=switch_mac, ip_ttl=63,
- ip_src=ip_src, ip_dst=ip_dst)
- pkt=str(exp_pkt)
- verify_packet(self, pkt, out_port)
- verify_no_other_packets(self)
+ verify_no_other_packets(self)
\ No newline at end of file