updated as per latest review comments

sonic-net · Dec 29, 2020 · 3ceb819 · 3ceb819
1 parent f17b20e
commit 3ceb819
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/orchagent/fdborch.cpp b/orchagent/fdborch.cpp
@@ -1185,7 +1185,7 @@ bool FdbOrch::removeFdbEntry(const FdbEntry& entry, FdbOrigin origin)
          * but we should not delete this mac here since now
          * mac in orchagent represents locally learnt
          */
-        SWSS_LOG_NOTICE("FdbOrch RemoveFDBEntry: mac=%s fdb origin is different; found_origin:%d delete_origin:%d",
+        SWSS_LOG_INFO("FdbOrch RemoveFDBEntry: mac=%s fdb origin is different; found_origin:%d delete_origin:%d",
                 entry.mac.to_string().c_str(), fdbData.origin, origin);
 
         /* We may still have the mac in saved-fdb probably due to unavailability
@@ -1212,7 +1212,7 @@ bool FdbOrch::removeFdbEntry(const FdbEntry& entry, FdbOrigin origin)
         return true; //FIXME: it should be based on status. Some could be retried. some not
     }
 
-    SWSS_LOG_NOTICE("Removed mac=%s bv_id=0x%lx port:%s",
+    SWSS_LOG_INFO("Removed mac=%s bv_id=0x%lx port:%s",
             entry.mac.to_string().c_str(), entry.bv_id, port.m_alias.c_str());
 
     port.m_fdb_count--;
@@ -1264,7 +1264,7 @@ void FdbOrch::deleteFdbEntryFromSavedFDB(const MacAddress &mac,
                 {
                     if (iter->fdbData.origin == origin)
                     {
-                        SWSS_LOG_NOTICE("FDB entry found in saved fdb. deleting..."
+                        SWSS_LOG_INFO("FDB entry found in saved fdb. deleting..."
                                 "mac=%s vlan_id=0x%x origin:%d port:%s", 
                                 mac.to_string().c_str(), vlanId, origin,
                                 itr.first.c_str());
@@ -1275,7 +1275,7 @@ void FdbOrch::deleteFdbEntryFromSavedFDB(const MacAddress &mac,
                     }
                     else
                     {
-                        SWSS_LOG_NOTICE("FDB entry found in saved fdb, but Origin is "
+                        SWSS_LOG_INFO("FDB entry found in saved fdb, but Origin is "
                                 "different mac=%s vlan_id=0x%x reqOrigin:%d "
                                 "foundOrigin:%d port:%s, IGNORED", 
                                 mac.to_string().c_str(), vlanId, origin,

diff --git a/orchagent/portsorch.cpp b/orchagent/portsorch.cpp
@@ -1882,7 +1882,6 @@ bool PortsOrch::initPort(const string &alias, const int index, const set<int> &l
                 /* Add port to port list */
                 m_portList[alias] = p;
                 m_portOidToIndex[id] = index;
-                m_port_ref_count[alias] = 0;   
 
                 /* Add port name map to counter table */
                 FieldValueTuple tuple(p.m_alias, sai_serialize_object_id(p.m_port_id));

diff --git a/orchagent/portsorch.h b/orchagent/portsorch.h
@@ -9,7 +9,6 @@
 #include "observer.h"
 #include "macaddress.h"
 #include "producertable.h"
-#include "notificationproducer.h"
 #include "flex_counter_manager.h"
 #include "gearboxutils.h"
 #include "saihelper.h"
@@ -171,7 +170,7 @@ class PortsOrch : public Orch, public Subject
     Port m_cpuPort;
     // TODO: Add Bridge/Vlan class
     sai_object_id_t m_default1QBridge;
-    sai_object_id_t   m_defaultVlan;
+    sai_object_id_t m_defaultVlan;
 
     typedef enum
     {
@@ -200,7 +199,6 @@ class PortsOrch : public Orch, public Subject
     map<set<int>, tuple<string, uint32_t, int, string, int>> m_lanesAliasSpeedMap;
     map<string, Port> m_portList;
     unordered_map<sai_object_id_t, int> m_portOidToIndex;
-
     map<string, uint32_t> m_port_ref_count;
     unordered_set<string> m_pendingPortSet;