[crm] Fix for Issue sonic-net#8036 (sonic-net#1829)

*Added more appropriate log message for CRM queries of MPLS_INSEG and MPLS_NEXTHOP resources when platform does not support these resource types.
theasianpianist · Aug 3, 2021 · 72a72f8 · 72a72f8
1 parent fe0dba0
commit 72a72f8
Showing 1 changed file with 20 additions and 0 deletions.
diff --git a/orchagent/crmorch.cpp b/orchagent/crmorch.cpp
@@ -565,6 +565,16 @@ void CrmOrch::getResAvailableCounters()
                 sai_status_t status = sai_object_type_get_availability(gSwitchId, objType, 0, nullptr, &availCount);
                 if (status != SAI_STATUS_SUCCESS)
                 {
+                    if ((status == SAI_STATUS_NOT_SUPPORTED) ||
+                        (status == SAI_STATUS_NOT_IMPLEMENTED) ||
+                        SAI_STATUS_IS_ATTR_NOT_SUPPORTED(status) ||
+                        SAI_STATUS_IS_ATTR_NOT_IMPLEMENTED(status))
+                    {
+                        // mark unsupported resources
+                        res.second.resStatus = CrmResourceStatus::CRM_RES_NOT_SUPPORTED;
+                        SWSS_LOG_NOTICE("CRM Resource %s not supported", crmResTypeNameMap.at(res.first).c_str());
+                        break;
+                    }
                     SWSS_LOG_ERROR("Failed to get availability for object_type %u , rv:%d", objType, status);
                     break;
                 }
@@ -585,6 +595,16 @@ void CrmOrch::getResAvailableCounters()
                 sai_status_t status = sai_object_type_get_availability(gSwitchId, objType, 1, &attr, &availCount);
                 if (status != SAI_STATUS_SUCCESS)
                 {
+                    if ((status == SAI_STATUS_NOT_SUPPORTED) ||
+                        (status == SAI_STATUS_NOT_IMPLEMENTED) ||
+                        SAI_STATUS_IS_ATTR_NOT_SUPPORTED(status) ||
+                        SAI_STATUS_IS_ATTR_NOT_IMPLEMENTED(status))
+                    {
+                        // mark unsupported resources
+                        res.second.resStatus = CrmResourceStatus::CRM_RES_NOT_SUPPORTED;
+                        SWSS_LOG_NOTICE("CRM Resource %s not supported", crmResTypeNameMap.at(res.first).c_str());
+                        break;
+                    }
                     SWSS_LOG_ERROR("Failed to get availability for object_type %u , rv:%d", objType, status);
                     break;
                 }