Skip to content

[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603 #328

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.

Sign up for GitHub

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

Merged
mssonicbld merged 2 commits into from
May 14, 2026
Merged

[code sync] Merge code from sonic-net/sonic-utilities:202511 to 202603 #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3136803
[acl-loader] Include `IP_TYPE=IP` in `IP_PROTOCOL` rules (#4540)
mssonicbld May 13, 2026
a295d6b
Merge branch '202511' of https://github.com/sonic-net/sonic-utilities…
mssonicbld May 14, 2026
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
6 changes: 6 additions & 0 deletions acl_loader/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,6 +774,12 @@ def convert_rule_to_db_schema(self, table_name, rule, skip_action_validation=Fal
deep_update(rule_props, self.convert_transport(table_name, rule_idx, rule))
deep_update(rule_props, self.convert_input_interface(table_name, rule_idx, rule))

if "IP_PROTOCOL" in rule_props and "IP_TYPE" not in rule_props:
# If we don't include IP_TYPE as a qualifier in the IP_PROTOCOL rule
# we could match on non-IP packets if the bits at the same offset match
# https://github.com/sonic-net/sonic-mgmt/issues/23960
rule_props["IP_TYPE"] = "IP"

self.validate_rule_fields(rule_props)

return rule_data
Expand Down
7 changes: 7 additions & 0 deletions tests/acl_loader_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def test_load_rules_when_capability_table_is_empty(self, acl_loader):
"VLAN_ID": 369,
"ETHER_TYPE": "2048",
"IP_PROTOCOL": 6,
'IP_TYPE': 'IP',
"SRC_IP": "20.0.0.2/32",
"DST_IP": "30.0.0.3/32",
"PACKET_ACTION": "FORWARD",
Expand All @@ -94,6 +95,7 @@ def test_vlan_id_translation(self, acl_loader):
"VLAN_ID": 369,
"ETHER_TYPE": "2048",
"IP_PROTOCOL": 6,
'IP_TYPE': 'IP',
"SRC_IP": "20.0.0.2/32",
"DST_IP": "30.0.0.3/32",
"PACKET_ACTION": "FORWARD",
Expand Down Expand Up @@ -134,6 +136,7 @@ def test_v4_rule_inv4v6_table(self, acl_loader):
"VLAN_ID": 369,
"ETHER_TYPE": 2048,
"IP_PROTOCOL": 6,
'IP_TYPE': 'IP',
"SRC_IP": "20.0.0.2/32",
"DST_IP": "30.0.0.3/32",
"PACKET_ACTION": "FORWARD",
Expand All @@ -147,6 +150,7 @@ def test_v6_rule_inv4v6_table(self, acl_loader):
assert acl_loader.rules_info[("DATAACLV4V6", "RULE_2")] == {
"ETHER_TYPE": 34525,
"IP_PROTOCOL": 58,
'IP_TYPE': 'IP',
"SRC_IPV6": "::1/128",
"DST_IPV6": "::1/128",
"PACKET_ACTION": "FORWARD",
Expand All @@ -170,6 +174,7 @@ def test_icmp_translation(self, acl_loader):
"ICMP_TYPE": 3,
"ICMP_CODE": 0,
"IP_PROTOCOL": 1,
'IP_TYPE': 'IP',
"SRC_IP": "20.0.0.2/32",
"DST_IP": "30.0.0.3/32",
"ETHER_TYPE": "2048",
Expand Down Expand Up @@ -208,6 +213,7 @@ def test_icmp_translation_in_custom_acl_table_type(self, acl_loader):
"ICMP_TYPE": 136,
"ICMP_CODE": 0,
"IP_PROTOCOL": 1,
'IP_TYPE': 'IP',
"PACKET_ACTION": "FORWARD",
"PRIORITY": "9998"
}
Expand All @@ -220,6 +226,7 @@ def test_icmpv6_translation_in_custom_acl_table_type(self, acl_loader):
"ICMPV6_TYPE": 136,
"ICMPV6_CODE": 0,
"IP_PROTOCOL": 58,
'IP_TYPE': 'IP',
"PACKET_ACTION": "FORWARD",
"PRIORITY": "9998"
}
Expand Down
Loading