Skip to content

Commit 54b2510

Browse files
authored
[syncd] Use correct VID when GET will fail to obrain object type (sonic-net#577)
1 parent 59b0430 commit 54b2510

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

lib/src/VirtualObjectIdManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ sai_object_type_t VirtualObjectIdManager::saiObjectTypeQuery(
146146

147147
if (objectType == SAI_OBJECT_TYPE_NULL || objectType >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
148148
{
149-
SWSS_LOG_ERROR("invalid object id 0x%s",
149+
SWSS_LOG_ERROR("invalid object id %s",
150150
sai_serialize_object_id(objectId).c_str());
151151

152152
/*
@@ -359,7 +359,7 @@ sai_object_type_t VirtualObjectIdManager::objectTypeQuery(
359359

360360
if (!sai_metadata_is_object_type_valid(objectType))
361361
{
362-
SWSS_LOG_ERROR("invalid object id 0x%s",
362+
SWSS_LOG_ERROR("invalid object id %s",
363363
sai_serialize_object_id(objectId).c_str());
364364

365365
return SAI_OBJECT_TYPE_NULL;

syncd/Syncd.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@ sai_status_t Syncd::processBulkEntry(
742742
}
743743

744744
sai_status_t Syncd::processEntry(
745-
_In_ sai_object_meta_key_t &metaKey,
745+
_In_ sai_object_meta_key_t metaKey,
746746
_In_ sai_common_api_t api,
747747
_In_ uint32_t attr_count,
748748
_In_ sai_attribute_t *attr_list)

syncd/Syncd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ namespace syncd
211211
public: // TODO to private
212212

213213
sai_status_t processEntry(
214-
_In_ sai_object_meta_key_t &meta_key,
214+
_In_ sai_object_meta_key_t meta_key,
215215
_In_ sai_common_api_t api,
216216
_In_ uint32_t attr_count,
217217
_In_ sai_attribute_t *attr_list);

vslib/src/RealObjectIdManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ sai_object_type_t RealObjectIdManager::saiObjectTypeQuery(
143143

144144
if (objectType == SAI_OBJECT_TYPE_NULL || objectType >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
145145
{
146-
SWSS_LOG_ERROR("invalid object id 0x%s",
146+
SWSS_LOG_ERROR("invalid object id %s",
147147
sai_serialize_object_id(objectId).c_str());
148148

149149
/*
@@ -357,7 +357,7 @@ sai_object_type_t RealObjectIdManager::objectTypeQuery(
357357

358358
if (!sai_metadata_is_object_type_valid(objectType))
359359
{
360-
SWSS_LOG_ERROR("invalid object id 0x%s",
360+
SWSS_LOG_ERROR("invalid object id %s",
361361
sai_serialize_object_id(objectId).c_str());
362362

363363
return SAI_OBJECT_TYPE_NULL;

0 commit comments

Comments
 (0)