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.

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

[acl] Remove Ethertype from L3V6 qualifiers #1433

Merged
merged 3 commits into from
Sep 19, 2020
Merged

[acl] Remove Ethertype from L3V6 qualifiers #1433

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90e29e6
[acl] Remove Ethertype from L3V6 qualifiers
daall Sep 11, 2020
6100f67
Add missing validation check for MIRRORV6
daall Sep 11, 2020
2b433ad
Remove redundant check and fix unit tests
daall Sep 16, 2020
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
14 changes: 13 additions & 1 deletion orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,6 +1036,12 @@ bool AclRuleL3V6::validateAddMatch(string attr_name, string attr_value)
return false;
}

if (attr_name == MATCH_ETHER_TYPE)
{
SWSS_LOG_ERROR("Ethertype match is not supported for table type L3V6");
return false;
}

return AclRule::validateAddMatch(attr_name, attr_value);
}

Expand Down Expand Up @@ -1140,6 +1146,12 @@ bool AclRuleMirror::validateAddMatch(string attr_name, string attr_value)
return false;
}

if (m_tableType == ACL_TABLE_MIRRORV6 && attr_name == MATCH_ETHER_TYPE)
daall marked this conversation as resolved.
Show resolved Hide resolved
{
SWSS_LOG_ERROR("ETHER_TYPE match is not supported for table of type MIRRORV6");
return false;
}

return AclRule::validateAddMatch(attr_name, attr_value);
}

Expand Down Expand Up @@ -1356,7 +1368,7 @@ bool AclTable::create()
return status == SAI_STATUS_SUCCESS;
}

if (type != ACL_TABLE_MIRRORV6)
if (type != ACL_TABLE_MIRRORV6 && type != ACL_TABLE_L3V6)
{
attr.id = SAI_ACL_TABLE_ATTR_FIELD_ETHER_TYPE;
attr.value.booldata = true;
Expand Down