[crm] Add support for snat, dnat and ipmc crm resources

Signed-off-by: Prabhu Sreenivasan <[email protected]>

Author: Prabhu Sreenivasan

orchagent/crmorch.cpp

@@ -37,7 +37,10 @@ const map<CrmResourceType, string> crmResTypeNameMap =
     { CrmResourceType::CRM_ACL_GROUP, "ACL_GROUP" },
     { CrmResourceType::CRM_ACL_ENTRY, "ACL_ENTRY" },
     { CrmResourceType::CRM_ACL_COUNTER, "ACL_COUNTER" },
-    { CrmResourceType::CRM_FDB_ENTRY, "FDB_ENTRY" }
+    { CrmResourceType::CRM_FDB_ENTRY, "FDB_ENTRY" },
+    { CrmResourceType::CRM_IPMC_ENTRY, "IPMC_ENTRY" },
+    { CrmResourceType::CRM_SNAT_ENTRY, "SNAT_ENTRY" },
+    { CrmResourceType::CRM_DNAT_ENTRY, "DNAT_ENTRY" }
 };
 
 const map<CrmResourceType, uint32_t> crmResSaiAvailAttrMap =
@@ -54,7 +57,10 @@ const map<CrmResourceType, uint32_t> crmResSaiAvailAttrMap =
     { CrmResourceType::CRM_ACL_GROUP, SAI_SWITCH_ATTR_AVAILABLE_ACL_TABLE_GROUP },
     { CrmResourceType::CRM_ACL_ENTRY, SAI_ACL_TABLE_ATTR_AVAILABLE_ACL_ENTRY },
     { CrmResourceType::CRM_ACL_COUNTER, SAI_ACL_TABLE_ATTR_AVAILABLE_ACL_COUNTER },
-    { CrmResourceType::CRM_FDB_ENTRY, SAI_SWITCH_ATTR_AVAILABLE_FDB_ENTRY }
+    { CrmResourceType::CRM_FDB_ENTRY, SAI_SWITCH_ATTR_AVAILABLE_FDB_ENTRY },
+    { CrmResourceType::CRM_IPMC_ENTRY, SAI_SWITCH_ATTR_AVAILABLE_IPMC_ENTRY},
+    { CrmResourceType::CRM_SNAT_ENTRY, SAI_SWITCH_ATTR_AVAILABLE_SNAT_ENTRY },
+    { CrmResourceType::CRM_DNAT_ENTRY, SAI_SWITCH_ATTR_AVAILABLE_DNAT_ENTRY }
 };
 
 const map<string, CrmResourceType> crmThreshTypeResMap =
@@ -71,7 +77,10 @@ const map<string, CrmResourceType> crmThreshTypeResMap =
     { "acl_group_threshold_type", CrmResourceType::CRM_ACL_GROUP },
     { "acl_entry_threshold_type", CrmResourceType::CRM_ACL_ENTRY },
     { "acl_counter_threshold_type", CrmResourceType::CRM_ACL_COUNTER },
-    { "fdb_entry_threshold_type", CrmResourceType::CRM_FDB_ENTRY }
+    { "fdb_entry_threshold_type", CrmResourceType::CRM_FDB_ENTRY },
+    { "ipmc_entry_threshold_type", CrmResourceType::CRM_IPMC_ENTRY },
+    { "snat_entry_threshold_type", CrmResourceType::CRM_SNAT_ENTRY },
+    { "dnat_entry_threshold_type", CrmResourceType::CRM_DNAT_ENTRY }
 };
 
 const map<string, CrmResourceType> crmThreshLowResMap =
@@ -89,6 +98,9 @@ const map<string, CrmResourceType> crmThreshLowResMap =
     {"acl_entry_low_threshold", CrmResourceType::CRM_ACL_ENTRY },
     {"acl_counter_low_threshold", CrmResourceType::CRM_ACL_COUNTER },
     {"fdb_entry_low_threshold", CrmResourceType::CRM_FDB_ENTRY },
+    {"ipmc_entry_low_threshold", CrmResourceType::CRM_IPMC_ENTRY },
+    {"snat_entry_low_threshold", CrmResourceType::CRM_SNAT_ENTRY },
+    {"dnat_entry_low_threshold", CrmResourceType::CRM_DNAT_ENTRY }
 };
 
 const map<string, CrmResourceType> crmThreshHighResMap =
@@ -105,7 +117,10 @@ const map<string, CrmResourceType> crmThreshHighResMap =
     {"acl_group_high_threshold", CrmResourceType::CRM_ACL_GROUP },
     {"acl_entry_high_threshold", CrmResourceType::CRM_ACL_ENTRY },
     {"acl_counter_high_threshold", CrmResourceType::CRM_ACL_COUNTER },
-    {"fdb_entry_high_threshold", CrmResourceType::CRM_FDB_ENTRY }
+    {"fdb_entry_high_threshold", CrmResourceType::CRM_FDB_ENTRY },
+    {"ipmc_entry_high_threshold", CrmResourceType::CRM_IPMC_ENTRY },
+    {"snat_entry_high_threshold", CrmResourceType::CRM_SNAT_ENTRY },
+    {"dnat_entry_high_threshold", CrmResourceType::CRM_DNAT_ENTRY }
 };
 
 const map<string, CrmThresholdType> crmThreshTypeMap =
@@ -129,7 +144,10 @@ const map<string, CrmResourceType> crmAvailCntsTableMap =
     { "crm_stats_acl_group_available", CrmResourceType::CRM_ACL_GROUP },
     { "crm_stats_acl_entry_available", CrmResourceType::CRM_ACL_ENTRY },
     { "crm_stats_acl_counter_available", CrmResourceType::CRM_ACL_COUNTER },
-    { "crm_stats_fdb_entry_available", CrmResourceType::CRM_FDB_ENTRY }
+    { "crm_stats_fdb_entry_available", CrmResourceType::CRM_FDB_ENTRY },
+    { "crm_stats_ipmc_entry_available", CrmResourceType::CRM_IPMC_ENTRY },
+    { "crm_stats_snat_entry_available", CrmResourceType::CRM_SNAT_ENTRY },
+    { "crm_stats_dnat_entry_available", CrmResourceType::CRM_DNAT_ENTRY }
 };
 
 const map<string, CrmResourceType> crmUsedCntsTableMap =
@@ -146,7 +164,10 @@ const map<string, CrmResourceType> crmUsedCntsTableMap =
     { "crm_stats_acl_group_used", CrmResourceType::CRM_ACL_GROUP },
     { "crm_stats_acl_entry_used", CrmResourceType::CRM_ACL_ENTRY },
     { "crm_stats_acl_counter_used", CrmResourceType::CRM_ACL_COUNTER },
-    { "crm_stats_fdb_entry_used", CrmResourceType::CRM_FDB_ENTRY }
+    { "crm_stats_fdb_entry_used", CrmResourceType::CRM_FDB_ENTRY },
+    { "crm_stats_ipmc_entry_used", CrmResourceType::CRM_IPMC_ENTRY },
+    { "crm_stats_snat_entry_used", CrmResourceType::CRM_SNAT_ENTRY },
+    { "crm_stats_dnat_entry_used", CrmResourceType::CRM_DNAT_ENTRY }
 };
 
 CrmOrch::CrmOrch(DBConnector *db, string tableName):
@@ -429,11 +450,17 @@ void CrmOrch::getResAvailableCounters()
             case SAI_SWITCH_ATTR_AVAILABLE_NEXT_HOP_GROUP_MEMBER_ENTRY:
             case SAI_SWITCH_ATTR_AVAILABLE_NEXT_HOP_GROUP_ENTRY:
             case SAI_SWITCH_ATTR_AVAILABLE_FDB_ENTRY:
+            case SAI_SWITCH_ATTR_AVAILABLE_IPMC_ENTRY:
+            case SAI_SWITCH_ATTR_AVAILABLE_SNAT_ENTRY:
+            case SAI_SWITCH_ATTR_AVAILABLE_DNAT_ENTRY:
             {
                 sai_status_t status = sai_switch_api->get_switch_attribute(gSwitchId, 1, &attr);
                 if (status != SAI_STATUS_SUCCESS)
                 {
-                    SWSS_LOG_ERROR("Failed to get switch attribute %u , rv:%d", attr.id, status);
+                    if(status != SAI_STATUS_NOT_SUPPORTED)
+                    {
+                        SWSS_LOG_ERROR("Failed to get switch attribute %u , rv:%d", attr.id, status);
+                    }
                     break;
                 }
 

orchagent/crmorch.h

@@ -25,6 +25,9 @@ enum class CrmResourceType
     CRM_ACL_ENTRY,
     CRM_ACL_COUNTER,
     CRM_FDB_ENTRY,
+    CRM_IPMC_ENTRY,
+    CRM_SNAT_ENTRY,
+    CRM_DNAT_ENTRY,
 };
 
 enum class CrmThresholdType