Skip to content

[meta] Fix stat_mode enums to sai_bulk_op_error_mode_t #753

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
lguohan merged 1 commit into from
Dec 18, 2020
Merged

[meta] Fix stat_mode enums to sai_bulk_op_error_mode_t #753

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
52 changes: 26 additions & 26 deletions meta/Meta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,7 @@ sai_status_t Meta::meta_validate_stats(
{
if (sai_metadata_get_enum_value_name(info->statenum, counter_ids[idx]) == nullptr)
{
SWSS_LOG_ERROR("vlaue %d is not in range on %s", counter_ids[idx], info->statenum->name);
SWSS_LOG_ERROR("value %d is not in range on %s", counter_ids[idx], info->statenum->name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand All @@ -2010,7 +2010,7 @@ sai_status_t Meta::meta_validate_stats(

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2105,9 +2105,9 @@ sai_status_t Meta::bulkRemove(
PARAMETER_CHECK_POSITIVE(object_count);
PARAMETER_CHECK_IF_NOT_NULL(object_id);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2164,9 +2164,9 @@ sai_status_t Meta::bulkRemove(
PARAMETER_CHECK_POSITIVE(object_count);
PARAMETER_CHECK_IF_NOT_NULL(route_entry);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2223,9 +2223,9 @@ sai_status_t Meta::bulkRemove(
PARAMETER_CHECK_POSITIVE(object_count);
PARAMETER_CHECK_IF_NOT_NULL(nat_entry);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2282,9 +2282,9 @@ sai_status_t Meta::bulkRemove(
PARAMETER_CHECK_POSITIVE(object_count);
PARAMETER_CHECK_IF_NOT_NULL(fdb_entry);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2344,9 +2344,9 @@ sai_status_t Meta::bulkSet(
PARAMETER_CHECK_IF_NOT_NULL(object_id);
PARAMETER_CHECK_IF_NOT_NULL(attr_list);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2402,9 +2402,9 @@ sai_status_t Meta::bulkSet(
PARAMETER_CHECK_IF_NOT_NULL(route_entry);
PARAMETER_CHECK_IF_NOT_NULL(attr_list);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2460,9 +2460,9 @@ sai_status_t Meta::bulkSet(
PARAMETER_CHECK_IF_NOT_NULL(nat_entry);
PARAMETER_CHECK_IF_NOT_NULL(attr_list);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2518,9 +2518,9 @@ sai_status_t Meta::bulkSet(
PARAMETER_CHECK_IF_NOT_NULL(fdb_entry);
PARAMETER_CHECK_IF_NOT_NULL(attr_list);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2595,9 +2595,9 @@ sai_status_t Meta::bulkCreate(

PARAMETER_CHECK_IF_NOT_NULL(object_id);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2664,9 +2664,9 @@ sai_status_t Meta::bulkCreate(
PARAMETER_CHECK_IF_NOT_NULL(attr_count);
PARAMETER_CHECK_IF_NOT_NULL(attr_list);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2724,9 +2724,9 @@ sai_status_t Meta::bulkCreate(
PARAMETER_CHECK_IF_NOT_NULL(attr_count);
PARAMETER_CHECK_IF_NOT_NULL(attr_list);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down Expand Up @@ -2783,9 +2783,9 @@ sai_status_t Meta::bulkCreate(
PARAMETER_CHECK_IF_NOT_NULL(attr_count);
PARAMETER_CHECK_IF_NOT_NULL(attr_list);

if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_stats_mode_t, mode) == nullptr)
if (sai_metadata_get_enum_value_name(&sai_metadata_enum_sai_bulk_op_error_mode_t, mode) == nullptr)
{
SWSS_LOG_ERROR("mode vlaue %d is not in range on %s", mode, sai_metadata_enum_sai_stats_mode_t.name);
SWSS_LOG_ERROR("mode value %d is not in range on %s", mode, sai_metadata_enum_sai_bulk_op_error_mode_t.name);

return SAI_STATUS_INVALID_PARAMETER;
}
Expand Down