Rewrote L3unicastTagged
diff --git a/ofdpa/onos.py b/ofdpa/onos.py
index dcbcfa5..cf9796f 100644
--- a/ofdpa/onos.py
+++ b/ofdpa/onos.py
@@ -300,12 +300,13 @@
logging.info("Port count less than 2, can't run this case")
return
- vlan_id=1
intf_src_mac=[0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc]
dst_mac=[0x00, 0x00, 0x00, 0x22, 0x22, 0x00]
dip=0xc0a80001
- for port in config["port_map"].keys():
+ ports = config["port_map"].keys()
+ for port in ports:
#add l2 interface group
+ vlan_id=port
add_one_l2_interface_grouop(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)
@@ -320,69 +321,28 @@
#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)
-
- vlan_id += 1
do_barrier(self.controller)
- port1=config["port_map"].keys()[0]
- port2=config["port_map"].keys()[1]
- #port 1 to port 2
switch_mac = ':'.join(['%02X' % x for x in intf_src_mac])
- dst_mac[5]=1
- port1_mac=':'.join(['%02X' % x for x in dst_mac])
-
- parsed_pkt = simple_tcp_packet(pktlen=100, dl_vlan_enable=True,
- vlan_vid=1,
- eth_dst=switch_mac,
- eth_src=port1_mac,
- ip_ttl=64,
- ip_src="192.168.1.1",
- ip_dst='192.168.2.1')
- pkt=str(parsed_pkt)
- self.dataplane.send(port1, pkt)
- #build expect packet
- dst_mac[5]=2
- port2_mac=':'.join(['%02X' % x for x in dst_mac])
- exp_pkt = simple_tcp_packet(pktlen=100,
- dl_vlan_enable=True,
- vlan_vid=2,
- eth_dst=port2_mac,
- eth_src=switch_mac,
- ip_ttl=63,
- ip_src="192.168.1.1",
- ip_dst='192.168.2.1')
- pkt=str(exp_pkt)
- verify_packet(self, pkt, port2)
- verify_no_other_packets(self)
-
- #port 2 to port 1
- switch_mac = ':'.join(['%02X' % x for x in intf_src_mac])
- dst_mac[5]=2
- port2_mac=':'.join(['%02X' % x for x in dst_mac])
-
- parsed_pkt = simple_tcp_packet(pktlen=100,
- dl_vlan_enable=True,
- vlan_vid=2,
- eth_dst=switch_mac,
- eth_src=port2_mac,
- ip_ttl=64,
- ip_src="192.168.2.1",
- ip_dst='192.168.1.1')
- pkt=str(parsed_pkt)
- self.dataplane.send(port2, pkt)
- #build expect packet
- dst_mac[5]=1
- port1_mac=':'.join(['%02X' % x for x in dst_mac])
- exp_pkt = simple_tcp_packet(pktlen=100,
- dl_vlan_enable=True,
- vlan_vid=1,
- eth_dst=port1_mac,
- eth_src=switch_mac,
- ip_ttl=63,
- ip_src="192.168.2.1",
- ip_dst='192.168.1.1')
- pkt=str(exp_pkt)
- verify_packet(self, pkt, port1)
- verify_no_other_packets(self)
+ 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
+ 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)