Skip to content

Commit ab96400

Browse files
nazariigdgsudharsan
nazariig
and
dgsudharsan
authored
[trim]: Update log level severity to avoid errors during attribute/enum capabilities query (#3916)
Signed-off-by: Nazarii Hnydyn <[email protected]> Co-authored-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
1 parent 582eed0 commit ab96400

File tree

1 file changed

+39
-56
lines changed

1 file changed

+39
-56
lines changed

‎orchagent/switch/trimming/capabilities.cpp‎

Lines changed: 39 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ static std::string toStr(const std::set<sai_packet_trim_queue_resolution_mode_t>
115115
return join(",", strList.cbegin(), strList.cend());
116116
}
117117

118+
static std::string toStr(sai_status_t value)
119+
{
120+
const auto *name = sai_metadata_get_status_name(value);
121+
122+
return name != nullptr ? name : "UNKNOWN";
123+
}
124+
118125
static std::string toStr(sai_uint8_t value)
119126
{
120127
return std::to_string(value);
@@ -297,9 +304,10 @@ void SwitchTrimmingCapabilities::queryTrimSizeAttrCapabilities()
297304
);
298305
if (status != SAI_STATUS_SUCCESS)
299306
{
300-
SWSS_LOG_ERROR(
301-
"Failed to get attribute(%s) capabilities",
302-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_SIZE).c_str()
307+
SWSS_LOG_NOTICE(
308+
"Attribute(%s) capabilities are not available: unexpected status(%s)",
309+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_SIZE).c_str(),
310+
toStr(status).c_str()
303311
);
304312
return;
305313
}
@@ -324,19 +332,12 @@ void SwitchTrimmingCapabilities::queryTrimDscpModeEnumCapabilities()
324332
auto status = queryEnumCapabilitiesSai(
325333
mList, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE
326334
);
327-
if (status == SAI_STATUS_NOT_SUPPORTED)
335+
if (status != SAI_STATUS_SUCCESS)
328336
{
329337
SWSS_LOG_NOTICE(
330-
"Attribute not supported(%s) to query enum value capabilities",
331-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
332-
);
333-
return;
334-
}
335-
else if (status != SAI_STATUS_SUCCESS)
336-
{
337-
SWSS_LOG_ERROR(
338-
"Failed to get attribute(%s) enum value capabilities",
339-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
338+
"Attribute(%s) enum value capabilities are not available: unexpected status(%s)",
339+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str(),
340+
toStr(status).c_str()
340341
);
341342
return;
342343
}
@@ -377,19 +378,12 @@ void SwitchTrimmingCapabilities::queryTrimDscpModeAttrCapabilities()
377378
auto status = queryAttrCapabilitiesSai(
378379
attrCap, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE
379380
);
380-
if (status == SAI_STATUS_NOT_SUPPORTED)
381+
if (status != SAI_STATUS_SUCCESS)
381382
{
382383
SWSS_LOG_NOTICE(
383-
"Attribute not supported(%s) to query attr vapabilities",
384-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
385-
);
386-
return;
387-
}
388-
else if (status != SAI_STATUS_SUCCESS)
389-
{
390-
SWSS_LOG_ERROR(
391-
"Failed to get attribute(%s) capabilities",
392-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str()
384+
"Attribute(%s) capabilities are not available: unexpected status(%s)",
385+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_RESOLUTION_MODE).c_str(),
386+
toStr(status).c_str()
393387
);
394388
return;
395389
}
@@ -417,9 +411,10 @@ void SwitchTrimmingCapabilities::queryTrimDscpAttrCapabilities()
417411
);
418412
if (status != SAI_STATUS_SUCCESS)
419413
{
420-
SWSS_LOG_ERROR(
421-
"Failed to get attribute(%s) capabilities",
422-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_VALUE).c_str()
414+
SWSS_LOG_NOTICE(
415+
"Attribute(%s) capabilities are not available: unexpected status(%s)",
416+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_DSCP_VALUE).c_str(),
417+
toStr(status).c_str()
423418
);
424419
return;
425420
}
@@ -447,9 +442,10 @@ void SwitchTrimmingCapabilities::queryTrimTcAttrCapabilities()
447442
);
448443
if (status != SAI_STATUS_SUCCESS)
449444
{
450-
SWSS_LOG_ERROR(
451-
"Failed to get attribute(%s) capabilities",
452-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_TC_VALUE).c_str()
445+
SWSS_LOG_NOTICE(
446+
"Attribute(%s) capabilities are not available: unexpected status(%s)",
447+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_TC_VALUE).c_str(),
448+
toStr(status).c_str()
453449
);
454450
return;
455451
}
@@ -474,19 +470,12 @@ void SwitchTrimmingCapabilities::queryTrimQueueModeEnumCapabilities()
474470
auto status = queryEnumCapabilitiesSai(
475471
mList, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE
476472
);
477-
if (status == SAI_STATUS_NOT_SUPPORTED)
473+
if (status != SAI_STATUS_SUCCESS)
478474
{
479475
SWSS_LOG_NOTICE(
480-
"Attribute not supported(%s) to query enum value capabilities",
481-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
482-
);
483-
return;
484-
}
485-
else if (status != SAI_STATUS_SUCCESS)
486-
{
487-
SWSS_LOG_ERROR(
488-
"Failed to get attribute(%s) enum value capabilities",
489-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
476+
"Attribute(%s) enum value capabilities are not available: unexpected status(%s)",
477+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str(),
478+
toStr(status).c_str()
490479
);
491480
return;
492481
}
@@ -514,19 +503,12 @@ void SwitchTrimmingCapabilities::queryTrimQueueModeAttrCapabilities()
514503
auto status = queryAttrCapabilitiesSai(
515504
attrCap, SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE
516505
);
517-
if (status == SAI_STATUS_NOT_SUPPORTED)
506+
if (status != SAI_STATUS_SUCCESS)
518507
{
519508
SWSS_LOG_NOTICE(
520-
"Attribute not supported(%s) to query attr capabilities",
521-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
522-
);
523-
return;
524-
}
525-
else if (status != SAI_STATUS_SUCCESS)
526-
{
527-
SWSS_LOG_ERROR(
528-
"Failed to get attribute(%s) capabilities",
529-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str()
509+
"Attribute(%s) capabilities are not available: unexpected status(%s)",
510+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_RESOLUTION_MODE).c_str(),
511+
toStr(status).c_str()
530512
);
531513
return;
532514
}
@@ -554,9 +536,10 @@ void SwitchTrimmingCapabilities::queryTrimQueueIndexAttrCapabilities()
554536
);
555537
if (status != SAI_STATUS_SUCCESS)
556538
{
557-
SWSS_LOG_ERROR(
558-
"Failed to get attribute(%s) capabilities",
559-
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_INDEX).c_str()
539+
SWSS_LOG_NOTICE(
540+
"Attribute(%s) capabilities are not available: unexpected status(%s)",
541+
toStr(SAI_OBJECT_TYPE_SWITCH, SAI_SWITCH_ATTR_PACKET_TRIM_QUEUE_INDEX).c_str(),
542+
toStr(status).c_str()
560543
);
561544
return;
562545
}

0 commit comments

Comments
 (0)