Getting an stable commit for build i12...
diff --git a/ofdpa/flows.py b/ofdpa/flows.py
index 8957e44..2c0f4e2 100755
--- a/ofdpa/flows.py
+++ b/ofdpa/flows.py
@@ -22,36 +22,6 @@
from oftest.testutils import *
from accton_util import *
-@disabled
-class PacketInSrcMacMiss(base_tests.SimpleDataPlane):
- """
- Test packet in function on a src-mac miss
- Send a packet to each dataplane port and verify that a packet
- in message is received from the controller for each
- #todo verify you stop receiving after adding rule
- """
-
- def runTest(self):
- delete_all_flows(self.controller)
- delete_all_groups(self.controller)
-
- ports = sorted(config["port_map"].keys())
- for port in ports:
- add_one_l2_interface_group(self.controller, port, 1, True, False)
- add_one_vlan_table_flow(self.controller, port, 1, flag=VLAN_TABLE_FLAG_ONLY_TAG)
-
- parsed_vlan_pkt = simple_tcp_packet(pktlen=104,
- vlan_vid=0x1001, dl_vlan_enable=True)
- vlan_pkt = str(parsed_vlan_pkt)
-
- for of_port in config["port_map"].keys():
- logging.info("PacketInMiss test, port %d", of_port)
- self.dataplane.send(of_port, vlan_pkt)
-
- verify_packet_in(self, vlan_pkt, of_port, ofp.OFPR_NO_MATCH)
-
- verify_no_other_packets(self)
-
class PacketInUDP(base_tests.SimpleDataPlane):
"""
Test packet in function for a table-miss flow
@@ -96,54 +66,7 @@
verify_packet_in(self, vlan_pkt, of_port, ofp.OFPR_ACTION)
verify_no_other_packets(self)
-@disabled
-class PacketInIPTable(base_tests.SimpleDataPlane):
- """
- Test packet in function on IPTABLE
- Send a packet to each dataplane port and verify that a packet
- in message is received from the controller for each
- #todo verify you stop receiving after adding rule
- """
- def runTest(self):
- delete_all_flows(self.controller)
- delete_all_groups(self.controller)
-
- intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
- dst_mac=[0x00, 0x00, 0x00, 0x22, 0x22, 0x00]
- dip=0xc0a80001
- ports = sorted(config["port_map"].keys())
- for port in ports:
- #add l2 interface group
- vlan_id=port
- 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=vlan_id, src_mac=intf_src_mac, dst_mac=dst_mac)
- #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, 0xfffffff0, l3_msg.group_id, send_ctrl=True)
-
- 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)
- verify_packet_in(self, pkt, in_port, ofp.OFPR_ACTION)
- #verify_no_other_packets(self)
@disabled
class ArpNL2(base_tests.SimpleDataPlane):
@@ -325,38 +248,6 @@
verify_packets(self, pkt, tmp_ports)
verify_no_other_packets(self)
-@disabled
-class L2FloodTaggedUnknownSrc(base_tests.SimpleDataPlane):
- """
- Test L2 flood to a vlan
- Send a packet with unknown dst_mac and check if the packet is flooded to all ports except inport
- #todo take in account unknown src
- """
- def runTest(self):
- delete_all_flows(self.controller)
- delete_all_groups(self.controller)
-
- ports = sorted(config["port_map"].keys())
- for port in ports:
- add_one_l2_interface_group(self.controller, port, 1, True, False)
- add_one_vlan_table_flow(self.controller, port, 1, flag=VLAN_TABLE_FLAG_ONLY_TAG)
-
- msg=add_l2_flood_group(self.controller, ports, 1, 1)
- add_bridge_flow(self.controller, None, 1, msg.group_id, True)
-
- parsed_pkt = simple_tcp_packet(dl_vlan_enable=True, vlan_vid=1, eth_dst='00:12:34:56:78:9a')
- pkt = str(parsed_pkt)
- #verify flood
- for ofport in ports:
- self.dataplane.send(ofport, pkt)
- #self won't rx packet
- verify_no_packet(self, pkt, ofport)
- #others will rx packet
- tmp_ports=list(ports)
- tmp_ports.remove(ofport)
- verify_packets(self, pkt, tmp_ports)
-
- verify_no_other_packets(self)
class L2UnicastTagged(base_tests.SimpleDataPlane):
"""
@@ -439,52 +330,6 @@
verify_no_other_packets(self)
-@disabled
-class Mtu4000(base_tests.SimpleDataPlane):
- """
- Test output function for an exact-match flow
- For each port A, adds a flow directing matching packets to that port.
- Then, for all other ports B != A, verifies that sending a matching packet
- to B results in an output to A.
- """
- def runTest(self):
- ports = sorted(config["port_map"].keys())
-
- delete_all_flows(self.controller)
- delete_all_groups(self.controller)
-
- add_vlan_table_flow(self.controller, config["port_map"].keys())
-
- # set up tag groups for each port
- add_l2_interface_group(self.controller, config["port_map"].keys(), 1, True, 1)
-
- for port in ports:
- add_one_l2_interface_group(self.controller, port, 1, True, False)
- add_one_vlan_table_flow(self.controller, port, 1, flag=VLAN_TABLE_FLAG_ONLY_TAG)
- group_id = encode_l2_interface_group_id(1, port)
- add_bridge_flow(self.controller, [0x00, 0x12, 0x34, 0x56, 0x78, port], 1, group_id, True)
- do_barrier(self.controller)
-
- for out_port in ports:
- # change dest based on port number
- mac_dst= '00:12:34:56:78:%02X' % out_port
- for in_port in ports:
- if in_port == out_port:
- continue
- # change source based on port number to avoid packet-ins from learning
- mac_src= '00:12:34:56:78:%02X' % in_port
- parsed_pkt = simple_tcp_packet(pktlen=4000,dl_vlan_enable=True, vlan_vid=1, eth_dst=mac_dst, eth_src=mac_src)
- pkt = str(parsed_pkt)
- self.dataplane.send(in_port, pkt)
-
- for ofport in ports:
- if ofport in [out_port]:
- verify_packet(self, pkt, ofport)
- else:
- verify_no_packet(self, pkt, ofport)
-
- verify_no_other_packets(self)
-
class L3UcastTagged(base_tests.SimpleDataPlane):
"""
Port1(vid=in_port, src=00:00:00:22:22:in_port, 192.168.outport.1) ,
@@ -608,7 +453,6 @@
verify_packet(self, pkt, out_port)
verify_no_other_packets(self)
-
class _32VPN(base_tests.SimpleDataPlane):
"""
Insert IP packet
@@ -671,72 +515,6 @@
pkt=str(exp_pkt)
verify_packet(self, pkt, out_port)
verify_no_other_packets(self)
-@disabled
-class UniqueMplsTermination(base_tests.SimpleDataPlane):
- """
- Insert IP packet
- Receive MPLS packet
- """
- 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]
- mcast_mac = [0x01, 0x00, 0x5e, 0x00, 0x00, 0x01]
-
- 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, False)
- dst_mac[5]=vlan_id
- #add L3 Unicast group
- l3_msg=add_l3_unicast_group(self.controller, port, vlanid=vlan_id, id=vlan_id, src_mac=intf_src_mac, dst_mac=dst_mac)
- #add L3 ecmp group
- ecmp_msg = add_l3_ecmp_group(self.controller, port, [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, 0x8847, intf_src_mac, vlan_id, goto_table=24)
- #add routing flow
- dst_ip = dip + (vlan_id<<8)
- add_mpls_flow(self.controller, ecmp_msg.group_id, port)
- #add entries in the Bridging table to avoid packet-in from mac learning
- group_id = encode_l2_interface_group_id(vlan_id, port)
- add_bridge_flow(self.controller, dst_mac, vlan_id, group_id, True)
-
- 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
-
- label = (out_port, 0, 1, 32)
- parsed_pkt = mpls_packet(pktlen=104, dl_vlan_enable=True, vlan_vid=in_port, ip_src=ip_src,
- ip_dst=ip_dst, eth_dst=switch_mac, eth_src=mac_src, label=[label])
- pkt=str(parsed_pkt)
- self.dataplane.send(in_port, pkt)
-
- #build expect packet
- mac_dst='00:00:00:22:22:%02X' % out_port
- mcast='01:00:5e:00:00:01'
- 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=31, ip_src=ip_src, ip_dst=ip_dst)
- pkt=str(exp_pkt)
- verify_packet(self, pkt, out_port)
- verify_no_other_packets(self)
class MPLSBUG(base_tests.SimpleDataPlane):
@@ -951,90 +729,13 @@
verify_packet(self, pkt, port2)
verify_packet(self, pkt, port3)
verify_no_other_packets(self)
-@disabled
-class L3McastToVPN(base_tests.SimpleDataPlane):
+
+
+
+class MplsTermination(base_tests.SimpleDataPlane):
"""
- Mcast routing
- """
- def runTest(self):
- """
- port1 (vlan 1)-> port 2 (vlan 2)
- """
- #delete_all_flows(self.controller)
- #delete_all_groups(self.controller)
-
- if len(config["port_map"]) <3:
- logging.info("Port count less than 3, can't run this case")
- assert(False)
- return
-
- vlan_id =1
- port2_out_vlan=2
- port3_out_vlan=3
- in_vlan=1 #macast group vid shall use input vlan diffe from l3 interface use output vlan
- intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
- intf_src_mac_str=':'.join(['%02X' % x for x in intf_src_mac])
- dst_mac=[0x01, 0x00, 0x5e, 0x01, 0x01, 0x01]
- dst_mac_str=':'.join(['%02X' % x for x in dst_mac])
- port1_mac=[0x00, 0x11, 0x11, 0x11, 0x11, 0x11]
- port1_mac_str=':'.join(['%02X' % x for x in port1_mac])
- src_ip=0xc0a80101
- src_ip_str="192.168.1.1"
- dst_ip=0xe0010101
- dst_ip_str="224.1.1.1"
-
- port1=config["port_map"].keys()[0]
- port2=config["port_map"].keys()[1]
- port3=config["port_map"].keys()[2]
-
- #add l2 interface group
- for port in config["port_map"].keys():
- add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=False, send_barrier=False)
- #add vlan flow table
- add_one_vlan_table_flow(self.controller, port, vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG)
- vlan_id +=1
-
- #add termination flow
- add_termination_flow(self.controller, port1, 0x0800, [0x01, 0x00, 0x5e, 0x00, 0x00, 0x00], vlan_id)
-
- #add MPLS interface group
- l2_gid = encode_l2_interface_group_id(port2_out_vlan, port2)
- mpls_gid2, mpls_msg = add_mpls_intf_group(self.controller, l2_gid, dst_mac, intf_src_mac, port2_out_vlan, port2)
- l2_gid3 = encode_l2_interface_group_id(port3_out_vlan, port3)
- mpls_gid3, mpls_msg = add_mpls_intf_group(self.controller, l2_gid3, dst_mac, intf_src_mac, port3_out_vlan, port3)
- #add L3VPN groups
- mpls_label_gid2, mpls_label_msg = add_mpls_label_group(self.controller, subtype=OFDPA_MPLS_GROUP_SUBTYPE_L3_VPN_LABEL,
- index=(0x20000+port2), ref_gid= mpls_gid2, push_mpls_header=True, set_mpls_label=port2, set_bos=1, cpy_ttl_outward=True)
- mpls_label_gid3, mpls_label_msg = add_mpls_label_group(self.controller, subtype=OFDPA_MPLS_GROUP_SUBTYPE_L3_VPN_LABEL,
- index=(0x10000+port3), ref_gid= mpls_gid3, push_mpls_header=True, set_mpls_label=port3, set_bos=1, cpy_ttl_outward=True)
-
- mcat_group_msg=add_l3_mcast_group(self.controller, in_vlan, 2, [0x92020022 , 0x92010023])
- add_mcast4_routing_flow(self.controller, in_vlan, src_ip, 0, dst_ip, mcat_group_msg.group_id)
-
- parsed_pkt = simple_tcp_packet(pktlen=100, dl_vlan_enable=True, vlan_vid=1,
- eth_dst=dst_mac_str,
- eth_src=port1_mac_str,
- ip_ttl=64,
- ip_src=src_ip_str,
- ip_dst=dst_ip_str)
- pkt=str(parsed_pkt)
- self.dataplane.send(port1, pkt)
- label = (in_vlan, 0, 1, 63)
- parsed_pkt = mpls_packet(pktlen=100,
- eth_dst=dst_mac_str,
- eth_src=intf_src_mac_str,
- ip_ttl=63,
- ip_src=src_ip_str, label= [label],
- ip_dst=dst_ip_str)
- pkt=str(parsed_pkt)
- verify_packet(self, pkt, port2)
- verify_packet(self, pkt, port3)
- verify_no_other_packets(self)
-@disabled
-class LPM(base_tests.SimpleDataPlane):
- """
- Insert IP packet
- Receive MPLS packet
+ Insert IP packet
+ Receive MPLS packet
"""
def runTest(self):
delete_all_flows(self.controller)
@@ -1046,81 +747,45 @@
intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
dst_mac=[0x00, 0x00, 0x00, 0x22, 0x22, 0x00]
- dip=0xc0a80001
- index=1
+ #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:
#add l2 interface group
+ id = port + class_id<<8
vlan_id=port
- l2_gid, l2_msg = add_one_l2_interface_group(self.controller, port, vlan_id, True, True)
+ l2_gid, l2_msg = add_one_l2_interface_group(self.controller, port, vlan_id, True, False)
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])
- do_barrier(self.controller)
+ #add L3 Unicast group
+ l3_msg=add_l3_unicast_group(self.controller, port, vlanid=vlan_id, id=id, src_mac=intf_src_mac, dst_mac=dst_mac)
+ #add L3 ecmp group
+ 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, vrf=0, flag=VLAN_TABLE_FLAG_ONLY_TAG)
+ 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 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)
- #add entries in the Bridging table to avoid packet-in from mac learning
- group_id = encode_l2_interface_group_id(vlan_id, port)
- add_bridge_flow(self.controller, dst_mac, vlan_id, group_id, True)
- 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)
+ add_termination_flow(self.controller, port, 0x8847, intf_src_mac, vlan_id, goto_table=24)
+ add_mpls_flow(self.controller, ecmp_msg.group_id, port)
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
+ 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)
+
+ label = (out_port, 0, 1, 32)
+ parsed_pkt = mpls_packet(pktlen=104, dl_vlan_enable=True, vlan_vid=in_port, ip_src=ip_src,
+ ip_dst=ip_dst, eth_dst=switch_mac, label=[label])
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])
+ 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=31, ip_src=ip_src, ip_dst=ip_dst)
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)