[sonic-swss]: Added flap counter and last flap time functionality.

.gitignore

@@ -54,8 +54,10 @@ cfgmgr/vlanmgrd
 cfgmgr/vrfmgrd
 cfgmgr/nbrmgrd
 cfgmgr/vxlanmgrd
+cfgmgr/natmgrd
 neighsyncd/neighsyncd
 portsyncd/portsyncd
+natsyncd/natsyncd
 orchagent/orchagent
 orchagent/routeresync
 orchagent/orchagent_restart_check

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = fpmsyncd neighsyncd portsyncd orchagent swssconfig cfgmgr tests
+SUBDIRS = fpmsyncd neighsyncd portsyncd natsyncd orchagent swssconfig cfgmgr tests
 
 if HAVE_LIBTEAM
 SUBDIRS += teamsyncd

README.md

@@ -1,5 +1,3 @@
-Broadcom[![Broadcom](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/sonic-swss-build/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/sonic-swss-build/)
-Mellanox[![Mellanox](https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/sonic-swss-build/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/mellanox/job/sonic-swss-build/)
 VS[![VS](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/sonic-swss-build/badge/icon)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/sonic-swss-build/)
 
 # SONiC - SWitch State Service - SWSS

cfgmgr/Makefile.am

@@ -1,9 +1,9 @@
-INCLUDES = -I $(top_srcdir) -I $(top_srcdir)/orchagent -I $(top_srcdir)/warmrestart
+INCLUDES = -I $(top_srcdir) -I $(top_srcdir)/orchagent -I $(top_srcdir)/warmrestart -I $(top_srcdir)/orchagent/flex_counter
 CFLAGS_SAI = -I /usr/include/sai
 LIBNL_CFLAGS = -I/usr/include/libnl3
 LIBNL_LIBS = -lnl-genl-3 -lnl-route-3 -lnl-3
 
-bin_PROGRAMS = vlanmgrd teammgrd portmgrd intfmgrd buffermgrd vrfmgrd nbrmgrd vxlanmgrd sflowmgrd
+bin_PROGRAMS = vlanmgrd teammgrd portmgrd intfmgrd buffermgrd vrfmgrd nbrmgrd vxlanmgrd sflowmgrd natmgrd
 
 if DEBUG
 DBGFLAGS = -ggdb -DDEBUG
@@ -55,3 +55,8 @@ sflowmgrd_SOURCES = sflowmgrd.cpp sflowmgr.cpp $(top_srcdir)/orchagent/orch.cpp
 sflowmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 sflowmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 sflowmgrd_LDADD = -lswsscommon
+
+natmgrd_SOURCES = natmgrd.cpp natmgr.cpp $(top_srcdir)/orchagent/orch.cpp $(top_srcdir)/orchagent/request_parser.cpp shellcmd.h
+natmgrd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
+natmgrd_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
+natmgrd_LDADD = -lswsscommon

cfgmgr/intfmgr.cpp

@@ -7,6 +7,7 @@
 #include "intfmgr.h"
 #include "exec.h"
 #include "shellcmd.h"
+#include "warm_restart.h"
 
 using namespace std;
 using namespace swss;
@@ -29,6 +30,10 @@ IntfMgr::IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, c
         m_stateIntfTable(stateDb, STATE_INTERFACE_TABLE_NAME),
         m_appIntfTableProducer(appDb, APP_INTF_TABLE_NAME)
 {
+    if (!WarmStart::isWarmStart())
+    {
+        flushLoopbackIntfs();
+    }
 }
 
 void IntfMgr::setIntfIp(const string &alias, const string &opCmd,
@@ -107,6 +112,28 @@ void IntfMgr::delLoopbackIntf(const string &alias)
     }
 }
 
+void IntfMgr::flushLoopbackIntfs()
+{
+    stringstream cmd;
+    string res;
+
+    cmd << IP_CMD << " link show type dummy | grep -o '" << LOOPBACK_PREFIX << "[^:]*'";
+
+    int ret = swss::exec(cmd.str(), res);
+    if (ret)
+    {
+        SWSS_LOG_DEBUG("Command '%s' failed with rc %d", cmd.str().c_str(), ret);
+        return;
+    }
+
+    auto aliases = tokenize(res, '\n');
+    for (string &alias : aliases)
+    {
+        SWSS_LOG_NOTICE("Remove loopback device %s", alias.c_str());
+        delLoopbackIntf(alias);
+    }
+}
+
 int IntfMgr::getIntfIpCount(const string &alias)
 {
     stringstream cmd;
@@ -390,6 +417,7 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
     string vrf_name = "";
     string mtu = "";
     string adminStatus = "";
+    string nat_zone = "";
     for (auto idx : data)
     {
         const auto &field = fvField(idx);
@@ -404,6 +432,11 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
         {
             adminStatus = value;
         }
+
+        if (field == "nat_zone")
+        {
+            nat_zone = value;
+        }
     }
 
     if (op == SET_COMMAND)
@@ -431,6 +464,15 @@ bool IntfMgr::doIntfGeneralTask(const vector<string>& keys,
         {
             addLoopbackIntf(alias);
         }
+        else
+        {
+            /* Set nat zone */
+            if (!nat_zone.empty())
+            {
+                FieldValueTuple fvTuple("nat_zone", nat_zone);
+                data.push_back(fvTuple);
+            }
+        }
 
         if (!vrf_name.empty())
         {

cfgmgr/intfmgr.h

@@ -34,6 +34,7 @@ class IntfMgr : public Orch
     int getIntfIpCount(const std::string &alias);
     void addLoopbackIntf(const std::string &alias);
     void delLoopbackIntf(const std::string &alias);
+    void flushLoopbackIntfs(void);
 
     void addHostSubIntf(const std::string&intf, const std::string &subIntf, const std::string &vlan);
     void setHostSubIntfMtu(const std::string &subIntf, const std::string &mtu);

cfgmgr/intfmgrd.cpp

@@ -8,6 +8,7 @@
 #include "intfmgr.h"
 #include <fstream>
 #include <iostream>
+#include "warm_restart.h"
 
 using namespace std;
 using namespace swss;
@@ -52,6 +53,9 @@ int main(int argc, char **argv)
         DBConnector appDb("APPL_DB", 0);
         DBConnector stateDb("STATE_DB", 0);
 
+        WarmStart::initialize("intfmgrd", "swss");
+        WarmStart::checkWarmStart("intfmgrd", "swss");
+
         IntfMgr intfmgr(&cfgDb, &appDb, &stateDb, cfg_intf_tables);
 
         // TODO: add tables in stateDB which interface depends on to monitor list