Skip to content

[202205]Use SAI_STATUS_ITEM_NOT_FOUND when key not found (#1224) #1237

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
akokhan merged 2 commits into from
Jun 29, 2023
Merged

[202205]Use SAI_STATUS_ITEM_NOT_FOUND when key not found (#1224) #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5808260
Use SAI_STATUS_ITEM_NOT_FOUND when key not found (#1224)
theasianpianist Apr 19, 2023
59e0cba
Fix missed SAI_STATUS_ITEM_NOT_FOUND
theasianpianist May 9, 2023
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
9 changes: 8 additions & 1 deletion .azure-pipelines/build-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,14 @@ jobs:
make check
gcovr --version
find SAI/meta -name "*.gc*" | xargs rm -vf
gcovr -r ./ -e ".*/SAI/.*" -e ".+/json.hpp" -e "swss/.+" -e ".*/.libs/.*" -e ".*/debian/.*" --exclude-unreachable-branches --exclude-throw-branches -x --xml-pretty -o coverage.xml
gcov_dirs=$(find . -path "*.libs*gcda" | xargs dirname | sort -u | cut -c"3-")
for dir in ${gcov_dirs}; do
source_dir=$(dirname $dir)
output_file="coverage-$source_dir.json"
gcovr --exclude-unreachable-branches --json-pretty -o $output_file --object-directory $source_dir $dir
done
gcovr -r ./ -e ".*/SAI/.*" -e ".+/json.hpp" -e "swss/.+" -e ".*/.libs/.*" -e ".*/debian/.*" --exclude-unreachable-branches --json-pretty -o coverage-all.json
gcovr -a "coverage-*.json" -x --xml-pretty -o coverage.xml
displayName: "Run sonic sairedis unit tests"
- publish: $(System.DefaultWorkingDirectory)/
artifact: ${{ parameters.artifact_name }}
Expand Down
38 changes: 19 additions & 19 deletions meta/Meta.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3050,7 +3050,7 @@ sai_status_t Meta::meta_generic_validation_remove(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

auto info = sai_metadata_get_object_type_info(meta_key.objecttype);
Expand Down Expand Up @@ -3332,7 +3332,7 @@ sai_status_t Meta::meta_sai_validate_oid(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_oid).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

return SAI_STATUS_SUCCESS;
Expand Down Expand Up @@ -3618,7 +3618,7 @@ sai_status_t Meta::meta_sai_validate_fdb_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_fdb).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// fdb entry is valid
Expand Down Expand Up @@ -3674,7 +3674,7 @@ sai_status_t Meta::meta_sai_validate_mcast_fdb_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_bv).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// check if fdb entry exists
Expand All @@ -3701,7 +3701,7 @@ sai_status_t Meta::meta_sai_validate_mcast_fdb_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_fdb).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// fdb entry is valid
Expand Down Expand Up @@ -3772,7 +3772,7 @@ sai_status_t Meta::meta_sai_validate_neighbor_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_rif).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

sai_object_meta_key_t meta_key_neighbor = { .objecttype = SAI_OBJECT_TYPE_NEIGHBOR_ENTRY, .objectkey = { .key = { .neighbor_entry = *neighbor_entry } } };
Expand All @@ -3797,7 +3797,7 @@ sai_status_t Meta::meta_sai_validate_neighbor_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_neighbor).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// neighbor entry is valid
Expand Down Expand Up @@ -3879,7 +3879,7 @@ sai_status_t Meta::meta_sai_validate_route_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_vr).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// check if route entry exists
Expand All @@ -3906,7 +3906,7 @@ sai_status_t Meta::meta_sai_validate_route_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_route).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

return SAI_STATUS_SUCCESS;
Expand Down Expand Up @@ -4002,7 +4002,7 @@ sai_status_t Meta::meta_sai_validate_l2mc_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_bv).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// check if l2mc entry exists
Expand All @@ -4029,7 +4029,7 @@ sai_status_t Meta::meta_sai_validate_l2mc_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_route).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

return SAI_STATUS_SUCCESS;
Expand Down Expand Up @@ -4125,7 +4125,7 @@ sai_status_t Meta::meta_sai_validate_ipmc_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_bv).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// check if ipmc entry exists
Expand All @@ -4152,7 +4152,7 @@ sai_status_t Meta::meta_sai_validate_ipmc_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_route).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

return SAI_STATUS_SUCCESS;
Expand Down Expand Up @@ -4208,7 +4208,7 @@ sai_status_t Meta::meta_sai_validate_nat_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_vr).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// check if NAT entry exists
Expand All @@ -4233,7 +4233,7 @@ sai_status_t Meta::meta_sai_validate_nat_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_nat).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

return SAI_STATUS_SUCCESS;
Expand Down Expand Up @@ -4307,7 +4307,7 @@ sai_status_t Meta::meta_sai_validate_my_sid_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_vr).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// check if my_sid_entry exists
Expand All @@ -4332,7 +4332,7 @@ sai_status_t Meta::meta_sai_validate_my_sid_entry(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key_my_sid_entry).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

return SAI_STATUS_SUCCESS;
Expand Down Expand Up @@ -5506,7 +5506,7 @@ sai_status_t Meta::meta_generic_validation_set(
META_LOG_ERROR(md, "object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

// object exists in DB so we can do "set" operation
Expand Down Expand Up @@ -5814,7 +5814,7 @@ sai_status_t Meta::meta_generic_validation_get(
SWSS_LOG_ERROR("object key %s doesn't exist",
sai_serialize_object_meta_key(meta_key).c_str());

return SAI_STATUS_INVALID_PARAMETER;
return SAI_STATUS_ITEM_NOT_FOUND;
}

auto info = sai_metadata_get_object_type_info(meta_key.objecttype);
Expand Down
Loading