[crmorch]: Implement CRM feature (sonic-net#447)

Signed-off-by: Volodymyr Samotiy <[email protected]>
madhanmellanox · Mar 5, 2018 · 6e739b5 · 6e739b5
1 parent e32212a
commit 6e739b5
Show file tree

Hide file tree

Showing 12 changed files with 889 additions and 10 deletions.
diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am
@@ -34,9 +34,10 @@ orchagent_SOURCES = \
 		    fdborch.cpp \
 		    aclorch.cpp \
 		    saihelper.cpp \
-		    switchorch.cpp \
+	            switchorch.cpp \
 		    pfcwdorch.cpp \
 		    pfcactionhandler.cpp \
+		    crmorch.cpp \
 		    request_parser.cpp \
 		    vrforch.cpp \
 		    acltable.h \
@@ -58,9 +59,10 @@ orchagent_SOURCES = \
 		    qosorch.h \
 		    routeorch.h \
 		    saihelper.h \
-		    switchorch.h \
+	            switchorch.h \
 		    swssnet.h \
 		    tunneldecaporch.h \
+		    crmorch.h
 		    request_parser.h \
 		    vrforch.h
 

diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -7,6 +7,7 @@
 #include "ipprefix.h"
 #include "converter.h"
 #include "timer.h"
+#include "crmorch.h"
 
 using namespace std;
 using namespace swss;
@@ -26,6 +27,7 @@ extern sai_port_api_t*   sai_port_api;
 extern sai_switch_api_t* sai_switch_api;
 extern sai_object_id_t   gSwitchId;
 extern PortsOrch*        gPortsOrch;
+extern CrmOrch *gCrmOrch;
 
 acl_rule_attr_lookup_t aclMatchLookup =
 {
@@ -368,6 +370,8 @@ bool AclRule::create()
         decreaseNextHopRefCount();
     }
 
+    gCrmOrch->incCrmAclTableUsedCounter(CrmResourceType::CRM_ACL_ENTRY, m_tableOid);
+
     return (status == SAI_STATUS_SUCCESS);
 }
 
@@ -412,6 +416,8 @@ bool AclRule::remove()
         return false;
     }
 
+    gCrmOrch->decCrmAclTableUsedCounter(CrmResourceType::CRM_ACL_ENTRY, m_tableOid);
+
     m_ruleOid = SAI_NULL_OBJECT_ID;
 
     decreaseNextHopRefCount();
@@ -505,6 +511,8 @@ bool AclRule::createCounter()
         return false;
     }
 
+    gCrmOrch->incCrmAclTableUsedCounter(CrmResourceType::CRM_ACL_COUNTER, m_tableOid);
+
     return true;
 }
 
@@ -537,6 +545,8 @@ bool AclRule::removeCounter()
         return false;
     }
 
+    gCrmOrch->decCrmAclTableUsedCounter(CrmResourceType::CRM_ACL_COUNTER, m_tableOid);
+
     SWSS_LOG_INFO("Removing record about the counter %lX from the DB", m_counterOid);
     AclOrch::getCountersTable().del(getTableId() + ":" + getId());
 
@@ -973,6 +983,12 @@ bool AclTable::create()
     }
 
     sai_status_t status = sai_acl_api->create_acl_table(&m_oid, gSwitchId, (uint32_t)table_attrs.size(), table_attrs.data());
+
+    if (status == SAI_STATUS_SUCCESS)
+    {
+        gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_TABLE, (sai_acl_stage_t) attr.value.s32, SAI_ACL_BIND_POINT_TYPE_PORT);
+    }
+
     return status == SAI_STATUS_SUCCESS;
 }
 
@@ -1388,6 +1404,10 @@ bool AclOrch::removeAclTable(string table_id)
     {
         SWSS_LOG_NOTICE("Successfully deleted ACL table %s", table_id.c_str());
         m_AclTables.erase(table_oid);
+
+        sai_acl_stage_t stage = (m_AclTables[table_oid].stage == ACL_STAGE_INGRESS) ? SAI_ACL_STAGE_INGRESS : SAI_ACL_STAGE_EGRESS;
+        gCrmOrch->decCrmAclUsedCounter(CrmResourceType::CRM_ACL_TABLE, stage, SAI_ACL_BIND_POINT_TYPE_PORT, table_oid);
+
         return true;
     }
     else