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

Add MIRRORv6 support for NPS platform #1018

Merged
merged 8 commits into from
Aug 7, 2019
Merged

Add MIRRORv6 support for NPS platform #1018

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd523b8
fix bad parameter for gCrmOrch->incCrmAclUsedCounter in qosorch
Apr 10, 2019
8f28e46
fix VS test failure for test_crm.py::test_CrmAcl FAILED
May 5, 2019
01bd303
remove crm acl_counters when acl_table removed
May 31, 2019
d58e0d6
Merge branch 'master' of https://github.com/Azure/sonic-swss
May 31, 2019
cb113c9
Merge branch 'master' of https://github.com/Azure/sonic-swss
Jun 5, 2019
bbf311a
add test case for remove crm acl_counters when acl_table removed #918
Jun 5, 2019
81cacdd
Merge branch 'master' of https://github.com/Azure/sonic-swss
Aug 7, 2019
24b7d10
Add MIRRORv6 support for NPS platform
Aug 7, 2019
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: 4 additions & 2 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,8 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
// purposes.
string platform = getenv("platform") ? getenv("platform") : "";
if (platform == BRCM_PLATFORM_SUBSTRING ||
platform == MLNX_PLATFORM_SUBSTRING)
platform == MLNX_PLATFORM_SUBSTRING ||
platform == NPS_PLATFORM_SUBSTRING)
{
m_mirrorTableCapabilities =
{
Expand All @@ -2001,7 +2002,8 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
m_mirrorTableCapabilities[ACL_TABLE_MIRRORV6] ? "yes" : "no");

// In Broadcom platform, V4 and V6 rules are stored in the same table
if (platform == BRCM_PLATFORM_SUBSTRING) {
if (platform == BRCM_PLATFORM_SUBSTRING ||
platform == NPS_PLATFORM_SUBSTRING) {
m_isCombinedMirrorV6Table = true;
}

Expand Down