Skip to content

[aclorch] Fix TODO: use SAI object API to query capabilities #2743

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
liat-grozovik merged 1 commit into from
Jun 14, 2023
Merged

[aclorch] Fix TODO: use SAI object API to query capabilities #2743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 3 additions & 12 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static acl_rule_attr_lookup_t aclDTelActionLookup =
{ ACTION_DTEL_REPORT_ALL_PACKETS, SAI_ACL_ENTRY_ATTR_ACTION_DTEL_REPORT_ALL_PACKETS }
};

static acl_rule_attr_lookup_t aclOtherActionLookup =
static acl_rule_attr_lookup_t aclOtherActionLookup =
{
{ ACTION_COUNTER, SAI_ACL_ENTRY_ATTR_ACTION_COUNTER}
};
Expand Down Expand Up @@ -415,7 +415,7 @@ static map<sai_acl_counter_attr_t, sai_acl_counter_attr_t> aclCounterLookup =
{SAI_ACL_COUNTER_ATTR_ENABLE_PACKET_COUNT, SAI_ACL_COUNTER_ATTR_PACKETS},
};

static map<AclObjectStatus, string> aclObjectStatusLookup =
static map<AclObjectStatus, string> aclObjectStatusLookup =
{
{AclObjectStatus::ACTIVE, "Active"},
{AclObjectStatus::INACTIVE, "Inactive"},
Expand Down Expand Up @@ -3462,8 +3462,6 @@ void AclOrch::queryAclActionAttrEnumValues(const string &action_name,
SWSS_LOG_THROW("%s is not an enum", action_name.c_str());
}

// TODO: once sai object api is available make this code compile
#ifdef SAIREDIS_SUPPORT_OBJECT_API
vector<int32_t> values_list(meta->enummetadata->valuescount);
sai_s32_list_t values;
values.count = static_cast<uint32_t>(values_list.size());
Expand All @@ -3482,7 +3480,7 @@ void AclOrch::queryAclActionAttrEnumValues(const string &action_name,
}
else
{
SWSS_LOG_WARN("Failed to query enum values supported for ACL action %s - ",
SWSS_LOG_WARN("Failed to query enum values supported for ACL action %s - "
"API is not implemented, assuming all values are supported for this action",
action_name.c_str());
/* assume all enum values are supported */
Expand All @@ -3491,13 +3489,6 @@ void AclOrch::queryAclActionAttrEnumValues(const string &action_name,
m_aclEnumActionCapabilities[acl_action].insert(meta->enummetadata->values[i]);
}
}
#else
/* assume all enum values are supported until sai object api is available */
for (size_t i = 0; i < meta->enummetadata->valuescount; i++)
{
m_aclEnumActionCapabilities[acl_action].insert(meta->enummetadata->values[i]);
}
#endif

// put supported values in DB
for (const auto& it: lookupMap)
Expand Down