Fix style

Author: bocon13

orchagent/acltable.h

@@ -15,9 +15,9 @@ extern "C" {
 #define ACL_TABLE_PORTS        "PORTS"
 #define ACL_TABLE_SERVICES     "SERVICES"
 
-#define STAGE_INGRESS  "INGRESS"
-#define STAGE_EGRESS   "EGRESS"
-#define STAGE_PRE_INGRESS "PRE_INGRESS"
+#define STAGE_INGRESS      "INGRESS"
+#define STAGE_EGRESS       "EGRESS"
+#define STAGE_PRE_INGRESS  "PRE_INGRESS"
 
 #define TABLE_TYPE_L3                   "L3"
 #define TABLE_TYPE_L3V6                 "L3V6"
@@ -64,14 +64,12 @@ typedef std::unordered_map<std::string, acl_table_type_t> acl_table_type_lookup_
 typedef std::map<std::string, sai_acl_stage_t> acl_stage_lookup_t;
 typedef std::map<sai_acl_stage_t, sai_switch_attr_t> acl_stage_to_switch_attr_lookup_t;
 
-struct AclTableGroupMember {
+struct AclTableGroupMember
+{
     sai_object_id_t m_group_oid;
     sai_object_id_t m_group_member_oid;
     uint32_t m_priority;
-    AclTableGroupMember()
-        : m_group_oid(SAI_NULL_OBJECT_ID)
-        , m_group_member_oid(SAI_NULL_OBJECT_ID)
-        , m_priority(0)
+    AclTableGroupMember() : m_group_oid(SAI_NULL_OBJECT_ID), m_group_member_oid(SAI_NULL_OBJECT_ID), m_priority(0)
     {}
 };
 

orchagent/switchorch.cpp

@@ -14,7 +14,7 @@ using namespace swss;
 
 extern sai_object_id_t gSwitchId;
 extern sai_switch_api_t *sai_switch_api;
-extern sai_acl_api_t* sai_acl_api;
+extern sai_acl_api_t *sai_acl_api;
 extern MacAddress gVxlanMacAddress;
 extern CrmOrch *gCrmOrch;
 
@@ -64,36 +64,32 @@ SwitchOrch::SwitchOrch(DBConnector *db, vector<TableConnector>& connectors, Tabl
 void SwitchOrch::initAclGroupsBindToSwitch()
 {
     // Create an ACL group per stage, INGRESS, EGRESS and PRE_INGRESS
-    for (auto stage_it : aclStageLookup) {
+    for (auto stage_it : aclStageLookup)
+    {
         sai_object_id_t group_oid;
         auto status = createAclGroup(fvValue(stage_it), &group_oid);
         if (!status.ok())
         {
-            status.prepend("Failed to create ACL group for stage " +
-                            fvField(stage_it) + ": ");
+            status.prepend("Failed to create ACL group for stage " + fvField(stage_it) + ": ");
             SWSS_LOG_THROW("%s", status.message().c_str());
         }
-        SWSS_LOG_NOTICE("Created ACL group for stage %s",
-                        fvField(stage_it).c_str());
+        SWSS_LOG_NOTICE("Created ACL group for stage %s", fvField(stage_it).c_str());
         m_aclGroups[fvValue(stage_it)] = group_oid;
         status = bindAclGroupToSwitch(fvValue(stage_it), group_oid);
         if (!status.ok())
         {
-            status.prepend("Failed to bind ACL group to stage " +
-                            fvField(stage_it) + ": ");
+            status.prepend("Failed to bind ACL group to stage " + fvField(stage_it) + ": ");
             SWSS_LOG_THROW("%s", status.message().c_str());
         }
     }
 }
 
-const std::map<sai_acl_stage_t, sai_object_id_t>&
-    SwitchOrch::getAclGroupOidsBindingToSwitch()
+const std::map<sai_acl_stage_t, sai_object_id_t> &SwitchOrch::getAclGroupOidsBindingToSwitch()
 {
     return m_aclGroups;
 }
 
-ReturnCode SwitchOrch::createAclGroup(const sai_acl_stage_t& group_stage,
-                                           sai_object_id_t* acl_grp_oid)
+ReturnCode SwitchOrch::createAclGroup(const sai_acl_stage_t &group_stage, sai_object_id_t *acl_grp_oid)
 {
     SWSS_LOG_ENTER();
 
@@ -114,47 +110,39 @@ ReturnCode SwitchOrch::createAclGroup(const sai_acl_stage_t& group_stage,
     acl_grp_attr.value.s32list.list = bpoint_list.data();
     acl_grp_attrs.push_back(acl_grp_attr);
 
-    CHECK_ERROR_AND_LOG_AND_RETURN(
-        sai_acl_api->create_acl_table_group(acl_grp_oid, gSwitchId,
-                                            (uint32_t)acl_grp_attrs.size(),
-                                            acl_grp_attrs.data()),
-        "Failed to create ACL group for stage " << group_stage);
-    if (group_stage == SAI_ACL_STAGE_INGRESS ||
-        group_stage == SAI_ACL_STAGE_PRE_INGRESS ||
+    CHECK_ERROR_AND_LOG_AND_RETURN(sai_acl_api->create_acl_table_group(
+                                       acl_grp_oid, gSwitchId, (uint32_t)acl_grp_attrs.size(), acl_grp_attrs.data()),
+                                   "Failed to create ACL group for stage " << group_stage);
+    if (group_stage == SAI_ACL_STAGE_INGRESS || group_stage == SAI_ACL_STAGE_PRE_INGRESS ||
         group_stage == SAI_ACL_STAGE_EGRESS)
     {
-        gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_GROUP,
-                                        (sai_acl_stage_t)group_stage,
-                                        SAI_ACL_BIND_POINT_TYPE_SWITCH);
+        gCrmOrch->incCrmAclUsedCounter(CrmResourceType::CRM_ACL_GROUP, (sai_acl_stage_t)group_stage,
+                                       SAI_ACL_BIND_POINT_TYPE_SWITCH);
     }
-    SWSS_LOG_INFO("Suceeded to create ACL group %s in stage %d ",
-                sai_serialize_object_id(*acl_grp_oid).c_str(), group_stage);
+    SWSS_LOG_INFO("Suceeded to create ACL group %s in stage %d ", sai_serialize_object_id(*acl_grp_oid).c_str(),
+                  group_stage);
     return ReturnCode();
 }
 
-ReturnCode SwitchOrch::bindAclGroupToSwitch(
-    const sai_acl_stage_t& group_stage, const sai_object_id_t& acl_grp_oid)
+ReturnCode SwitchOrch::bindAclGroupToSwitch(const sai_acl_stage_t &group_stage, const sai_object_id_t &acl_grp_oid)
 {
     SWSS_LOG_ENTER();
 
     auto switch_attr_it = aclStageToSwitchAttrLookup.find(group_stage);
     if (switch_attr_it == aclStageToSwitchAttrLookup.end())
     {
         LOG_ERROR_AND_RETURN(ReturnCode(StatusCode::SWSS_RC_INVALID_PARAM)
-                                << "Failed to set ACL group(" << acl_grp_oid
-                                << ") to the SWITCH bind point at stage "
-                                << group_stage);
+                             << "Failed to set ACL group(" << acl_grp_oid << ") to the SWITCH bind point at stage "
+                             << group_stage);
     }
     sai_attribute_t attr;
     attr.id = switch_attr_it->second;
     attr.value.oid = acl_grp_oid;
     auto sai_status = sai_switch_api->set_switch_attribute(gSwitchId, &attr);
     if (sai_status != SAI_STATUS_SUCCESS)
     {
-        LOG_ERROR_AND_RETURN(
-            ReturnCode(sai_status)
-            << "[SAI] Failed to set_switch_attribute with attribute.id=" << attr.id
-            << " and acl group oid=" << acl_grp_oid);
+        LOG_ERROR_AND_RETURN(ReturnCode(sai_status) << "[SAI] Failed to set_switch_attribute with attribute.id="
+                                                    << attr.id << " and acl group oid=" << acl_grp_oid);
     }
     return ReturnCode();
 }

orchagent/switchorch.h

@@ -1,8 +1,8 @@
 #pragma once
 
+#include "acltable.h"
 #include "orch.h"
 #include "timer.h"
-#include "acltable.h"
 
 #define DEFAULT_ASIC_SENSORS_POLLER_INTERVAL 60
 #define ASIC_SENSORS_POLLER_STATUS "ASIC_SENSORS_POLLER_STATUS"
@@ -32,9 +32,10 @@ class SwitchOrch : public Orch
 
     // Return reference to ACL group created for each stage and the bind point is
     // the switch
-    const std::map<sai_acl_stage_t, sai_object_id_t>& getAclGroupOidsBindingToSwitch();
+    const std::map<sai_acl_stage_t, sai_object_id_t> &getAclGroupOidsBindingToSwitch();
     // Initialize the ACL groups bind to Switch
     void initAclGroupsBindToSwitch();
+
 private:
     void doTask(Consumer &consumer);
     void doTask(swss::SelectableTimer &timer);
@@ -47,13 +48,11 @@ class SwitchOrch : public Orch
     // Create the default ACL group for the given stage, bind point is
     // SAI_ACL_BIND_POINT_TYPE_SWITCH and group type is
     // SAI_ACL_TABLE_GROUP_TYPE_PARALLEL.
-    ReturnCode createAclGroup(const sai_acl_stage_t& group_stage,
-                                sai_object_id_t* acl_grp_oid);
+    ReturnCode createAclGroup(const sai_acl_stage_t &group_stage, sai_object_id_t *acl_grp_oid);
 
     // Bind the ACL group to switch for the given stage.
     // Set the SAI_SWITCH_ATTR_{STAGE}_ACL with the group oid.
-    ReturnCode bindAclGroupToSwitch(const sai_acl_stage_t& group_stage,
-                                    const sai_object_id_t& acl_grp_oid);
+    ReturnCode bindAclGroupToSwitch(const sai_acl_stage_t &group_stage, const sai_object_id_t &acl_grp_oid);
 
     swss::NotificationConsumer* m_restartCheckNotificationConsumer;
     void doTask(swss::NotificationConsumer& consumer);