Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sonic-utilities : Added support for L2_TABLE_TYPE in acl-loader #2514

Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions acl_loader/main.py
Original file line number Diff line number Diff line change
@@ -314,6 +314,14 @@ def is_table_l3(self, tname):
"""
return self.tables_db_info[tname]["type"].upper() == "L3"

def is_table_l2(self, tname):
"""
Check if ACL table type is L2
:param tname: ACL table name
:return: True if table type is L2 else False
"""
return self.tables_db_info[tname]["type"].upper() == "L2"

def is_table_ipv6(self, tname):
"""
Check if ACL table type is IPv6 (L3V6 or MIRRORV6)
@@ -456,6 +464,15 @@ def convert_l2(self, table_name, rule_idx, rule):

rule_props["VLAN_ID"] = vlan_id

if rule.l2.config.source_mac:
source_mac = rule.l2.config.source_mac
source_mac_mask = rule.l2.config.source_mac_mask
rule_props["SRC_MAC"] = source_mac + "/" + source_mac_mask
if rule.l2.config.destination_mac:
destination_mac = rule.l2.config.destination_mac
destination_mac_mask = rule.l2.config.destination_mac_mask
rule_props["DST_MAC"] = destination_mac + "/" + destination_mac_mask

return rule_props

def convert_ip(self, table_name, rule_idx, rule):
@@ -639,6 +656,8 @@ def deny_rule(self, table_name):
rule_props["PACKET_ACTION"] = "DROP"
if self.is_table_ipv6(table_name):
rule_props["IP_TYPE"] = "IPV6ANY" # ETHERTYPE is not supported for DATAACLV6
elif self.is_table_l2(table_name):
rule_props["IP_TYPE"] = "ANY"
else:
rule_props["ETHER_TYPE"] = str(self.ethertype_map["ETHERTYPE_IPV4"])
return rule_data