Skip to content

[aclorch]: Check for existing mirror table only when creating a new table #1089

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
stcheng merged 3 commits into from
Oct 11, 2019
Merged

[aclorch]: Check for existing mirror table only when creating a new table #1089

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e0ee28
[aclorch]: Check for existing mirror table only when creating a new t…
daall Oct 10, 2019
f897a71
Display mirror table type
daall Oct 11, 2019
eee1ed3
Delete extra paren
daall Oct 11, 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
34 changes: 25 additions & 9 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2446,6 +2446,31 @@ bool AclOrch::addAclTable(AclTable &newTable, string table_id)
return false;
}
}
else
{
// If ACL table is new, check for the existence of current mirror tables
// Note: only one table per mirror type can be created
auto table_type = newTable.type;
if (table_type == ACL_TABLE_MIRROR || table_type == ACL_TABLE_MIRRORV6)
{
string mirror_type;
if ((table_type == ACL_TABLE_MIRROR && !m_mirrorTableId.empty()))
{
mirror_type = TABLE_TYPE_MIRROR;
}

if (table_type == ACL_TABLE_MIRRORV6 && !m_mirrorV6TableId.empty())
{
mirror_type = TABLE_TYPE_MIRRORV6;
}

if (!mirror_type.empty())
{
SWSS_LOG_ERROR("Mirror table %s has already been created", mirror_type.c_str());
return false;
}
}
}

// Check if a separate mirror table is needed or not based on the platform
if (newTable.type == ACL_TABLE_MIRROR || newTable.type == ACL_TABLE_MIRRORV6)
Expand Down Expand Up @@ -2878,15 +2903,6 @@ bool AclOrch::processAclTableType(string type, acl_table_type_t &table_type)
SWSS_LOG_ERROR("Mirror table type %s is not supported", type.c_str());
return false;
}

// Check the existence of current mirror tables
// Note: only one table per type could be created
if ((table_type == ACL_TABLE_MIRROR && !m_mirrorTableId.empty()) ||
(table_type == ACL_TABLE_MIRRORV6 && !m_mirrorV6TableId.empty()))
{
SWSS_LOG_ERROR("Mirror table table_type %s has already been created", type.c_str());
return false;
}
}

return true;
Expand Down