Fixed spelling
diff --git a/ofdpa/accton_util.py b/ofdpa/accton_util.py
index fabcab7..342800c 100755
--- a/ofdpa/accton_util.py
+++ b/ofdpa/accton_util.py
@@ -163,7 +163,7 @@
return group_id_list, msgs
-def add_one_l2_interface_grouop(ctrl, port, vlan_id=1, is_tagged=False, send_barrier=False):
+def add_one_l2_interface_group(ctrl, port, vlan_id=1, is_tagged=False, send_barrier=False):
# group table
# set up untag groups for each port
group_id = encode_l2_interface_group_id(vlan_id, port)
diff --git a/ofdpa/onos.py b/ofdpa/onos.py
index b8f8052..3c26ef7 100644
--- a/ofdpa/onos.py
+++ b/ofdpa/onos.py
@@ -32,7 +32,7 @@
ports = sorted(config["port_map"].keys())
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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,
@@ -121,7 +121,7 @@
# Installing flows to avoid packet-in
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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)
@@ -162,7 +162,7 @@
# Installing flows to avoid packet-in
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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)
@@ -199,7 +199,7 @@
ports = sorted(config["port_map"].keys())
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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)
@@ -234,7 +234,7 @@
delete_all_groups(self.controller)
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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)
@@ -270,7 +270,7 @@
delete_all_groups(self.controller)
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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)
@@ -311,7 +311,7 @@
add_vlan_table_flow(self.controller, ports)
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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)
@@ -357,7 +357,7 @@
add_l2_interface_grouop(self.controller, config["port_map"].keys(), 1, True, 1)
for port in ports:
- add_one_l2_interface_grouop(self.controller, port, 1, True, False)
+ 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)
@@ -403,7 +403,7 @@
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)
+ 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
@@ -462,7 +462,7 @@
for port in ports:
#add l2 interface group
vlan_id=port
- l2_gid, l2_msg = add_one_l2_interface_grouop(self.controller, port, vlan_id, True, True)
+ 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)
@@ -525,7 +525,7 @@
for port in ports:
#add l2 interface group
vlan_id=port
- l2_gid, l2_msg = add_one_l2_interface_grouop(self.controller, port, vlan_id, True, False)
+ 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)
diff --git a/ofdpa/sr.py b/ofdpa/sr.py
index 2c6b34c..c43b7aa 100644
--- a/ofdpa/sr.py
+++ b/ofdpa/sr.py
@@ -15,7 +15,7 @@
#Add L3Unicast to Host
port, vlan_id = 33, 10
##add L2 Interface Group
- add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
##add L3 Unicast Group
l3_msg=add_l3_unicast_group(self.controller, port, vlanid=vlan_id, id=vlan_id, src_mac=switch_mac,
dst_mac=dst_mac)
@@ -32,7 +32,7 @@
add_bridge_flow(self.controller, dst_mac, vlan_id, group_id, True)
port = 32
- add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
add_one_vlan_table_flow(self.controller, port, vlan_id, vrf=vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG)
add_termination_flow(self.controller, port, 0x0800, switch_mac, vlan_id)
do_barrier(self.controller)
@@ -41,7 +41,7 @@
dst_mac = [0x00, 0x00, 0x00, 0x55, 0x55, 0x55]
vlan_id = 100
##add L2 Interface Group
- l2_gid, l2_msg = add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ l2_gid, l2_msg = add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
#add MPLS interface group
mpls_gid, mpls_msg = add_mpls_intf_group(self.controller, l2_gid, dst_mac, switch_mac, vlan_id, port)
##add L3VPN interface
@@ -66,7 +66,7 @@
#Add L3Unicast to Host
port, vlan_id=33, 20
##add L2 Interface Group
- add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
##add L3 Unicast Group
l3_msg=add_l3_unicast_group(self.controller, port, vlanid=vlan_id, id=vlan_id, src_mac=switch_mac,
dst_mac=dst_mac)
@@ -82,7 +82,7 @@
add_bridge_flow(self.controller, dst_mac, vlan_id, group_id, True)
port = 32
- add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
add_one_vlan_table_flow(self.controller, port, vlan_id, vrf=vlan_id, flag=VLAN_TABLE_FLAG_ONLY_TAG)
add_termination_flow(self.controller, port, 0x0800, switch_mac, vlan_id)
do_barrier(self.controller)
@@ -91,7 +91,7 @@
dst_mac= [0x00, 0x00, 0x00, 0x55, 0x55, 0x55]
vlan_id = 100
##add L2 Interface Group
- l2_gid, l2_msg = add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ l2_gid, l2_msg = add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
#add MPLS interface group
mpls_gid, mpls_msg = add_mpls_intf_group(self.controller, l2_gid, dst_mac, switch_mac, vlan_id, port)
##add L3VPN interface
@@ -113,7 +113,7 @@
#Add MPLS termination
port, vlan_id=31, 10
##add L2 Interface Group
- add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
##add L3 Unicast Group
l3_msg=add_l3_unicast_group(self.controller, port, vlanid=vlan_id, id=vlan_id, src_mac=switch_mac,
dst_mac=dst_mac)
@@ -130,7 +130,7 @@
#Add MPLS termination
port, vlan_id=32, 20
##add L2 Interface Group
- add_one_l2_interface_grouop(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
+ add_one_l2_interface_group(self.controller, port, vlan_id=vlan_id, is_tagged=True, send_barrier=False)
##add L3 Unicast Group
l3_msg=add_l3_unicast_group(self.controller, port, vlanid=vlan_id, id=vlan_id, src_mac=switch_mac,
dst_mac=dst_mac)