merge azure/sonic-swss to aclorch branch

cfgmgr/intfmgr.cpp

@@ -30,19 +30,27 @@ IntfMgr::IntfMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, c
 }
 
 void IntfMgr::setIntfIp(const string &alias, const string &opCmd,
-                        const string &ipPrefixStr, const bool ipv4)
+                        const IpPrefix &ipPrefix)
 {
-    stringstream cmd;
-    string res;
+    stringstream    cmd;
+    string          res;
+    string          ipPrefixStr = ipPrefix.to_string();
+    string          broadcastIpStr = ipPrefix.getBroadcastIp().to_string();
+    int             prefixLen = ipPrefix.getMaskLength();
 
-    if (ipv4)
+    if (ipPrefix.isV4())
     {
-        cmd << IP_CMD << " address " << opCmd << " " << ipPrefixStr << " dev " << alias;
+        (prefixLen < 31) ?
+        (cmd << IP_CMD << " address " << opCmd << " " << ipPrefixStr << " broadcast " << broadcastIpStr <<" dev " << alias) :
+        (cmd << IP_CMD << " address " << opCmd << " " << ipPrefixStr << " dev " << alias);
     }
     else
     {
-        cmd << IP_CMD << " -6 address " << opCmd << " " << ipPrefixStr << " dev " << alias;
+        (prefixLen < 127) ?
+        (cmd << IP_CMD << " -6 address " << opCmd << " " << ipPrefixStr << " broadcast " << broadcastIpStr << " dev " << alias) :
+        (cmd << IP_CMD << " -6 address " << opCmd << " " << ipPrefixStr << " dev " << alias);
     }
+
     int ret = swss::exec(cmd.str(), res);
     if (ret)
     {
@@ -202,7 +210,7 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,
         // Set Interface IP except for lo
         if (!is_lo)
         {
-            setIntfIp(alias, "add", ip_prefix.to_string(), ip_prefix.isV4());
+            setIntfIp(alias, "add", ip_prefix);
         }
 
         std::vector<FieldValueTuple> fvVector;
@@ -219,7 +227,7 @@ bool IntfMgr::doIntfAddrTask(const vector<string>& keys,
         // Set Interface IP except for lo
         if (!is_lo)
         {
-            setIntfIp(alias, "del", ip_prefix.to_string(), ip_prefix.isV4());
+            setIntfIp(alias, "del", ip_prefix);
         }
         m_appIntfTableProducer.del(appKey);
         m_stateIntfTable.del(keys[0] + state_db_key_delimiter + keys[1]);

cfgmgr/intfmgr.h

@@ -21,7 +21,7 @@ class IntfMgr : public Orch
     Table m_cfgIntfTable, m_cfgVlanIntfTable;
     Table m_statePortTable, m_stateLagTable, m_stateVlanTable, m_stateVrfTable, m_stateIntfTable;
 
-    void setIntfIp(const string &alias, const string &opCmd, const string &ipPrefixStr, const bool ipv4 = true);
+    void setIntfIp(const string &alias, const string &opCmd, const IpPrefix &ipPrefix);
     void setIntfVrf(const string &alias, const string vrfName);
     bool doIntfGeneralTask(const vector<string>& keys, const vector<FieldValueTuple>& data, const string& op);
     bool doIntfAddrTask(const vector<string>& keys, const vector<FieldValueTuple>& data, const string& op);

cfgmgr/nbrmgr.cpp

@@ -47,7 +47,8 @@ NbrMgr::NbrMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, con
         m_statePortTable(stateDb, STATE_PORT_TABLE_NAME),
         m_stateLagTable(stateDb, STATE_LAG_TABLE_NAME),
         m_stateVlanTable(stateDb, STATE_VLAN_TABLE_NAME),
-        m_stateIntfTable(stateDb, STATE_INTERFACE_TABLE_NAME)
+        m_stateIntfTable(stateDb, STATE_INTERFACE_TABLE_NAME),
+        m_stateNeighRestoreTable(stateDb, STATE_NEIGH_RESTORE_TABLE_NAME)
 {
     int err = 0;
 
@@ -91,6 +92,19 @@ bool NbrMgr::isIntfStateOk(const string &alias)
     return false;
 }
 
+bool NbrMgr::isNeighRestoreDone()
+{
+    string value;
+
+    m_stateNeighRestoreTable.hget("Flags", "restored", value);
+    if (value == "true")
+    {
+        SWSS_LOG_INFO("Kernel neighbor table restore is done");
+        return true;
+    }
+    return false;
+}
+
 bool NbrMgr::setNeighbor(const string& alias, const IpAddress& ip, const MacAddress& mac)
 {
     SWSS_LOG_ENTER();

cfgmgr/nbrmgr.h

@@ -20,13 +20,15 @@ class NbrMgr : public Orch
     NbrMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, const vector<string> &tableNames);
     using Orch::doTask;
 
+    bool isNeighRestoreDone();
+
 private:
     bool isIntfStateOk(const string &alias);
     bool setNeighbor(const string& alias, const IpAddress& ip, const MacAddress& mac);
 
     void doTask(Consumer &consumer);
 
-    Table m_statePortTable, m_stateLagTable, m_stateVlanTable, m_stateIntfTable;
+    Table m_statePortTable, m_stateLagTable, m_stateVlanTable, m_stateIntfTable, m_stateNeighRestoreTable;
     struct nl_sock *m_nl_sock;
 };
 

cfgmgr/nbrmgrd.cpp

@@ -3,15 +3,20 @@
 #include <mutex>
 #include <fstream>
 #include <iostream>
+#include <chrono>
 
 #include "select.h"
 #include "exec.h"
 #include "schema.h"
 #include "nbrmgr.h"
+#include "warm_restart.h"
 
 using namespace std;
 using namespace swss;
 
+#define RESTORE_NEIGH_WAIT_TIME_OUT 120
+#define RESTORE_NEIGH_WAIT_TIME_INT 10
+
 /* select() function timeout retry time, in millisecond */
 #define SELECT_TIMEOUT 1000
 
@@ -50,6 +55,27 @@ int main(int argc, char **argv)
 
         NbrMgr nbrmgr(&cfgDb, &appDb, &stateDb, cfg_nbr_tables);
 
+        WarmStart::initialize("nbrmgrd", "swss");
+        WarmStart::checkWarmStart("nbrmgrd", "swss");
+
+        if (WarmStart::isWarmStart())
+        {
+            chrono::steady_clock::time_point starttime = chrono::steady_clock::now();
+            while (!nbrmgr.isNeighRestoreDone())
+            {
+                chrono::duration<double> time_span = chrono::duration_cast<chrono::duration<double>>
+                                                     (chrono::steady_clock::now() - starttime);
+                int pasttime = int(time_span.count());
+                SWSS_LOG_INFO("Kernel neighbor table restoration waited for %d seconds", pasttime);
+                if (pasttime > RESTORE_NEIGH_WAIT_TIME_OUT)
+                {
+                    SWSS_LOG_WARN("Kernel neighbor table restore is not finished!");
+                    break;
+                }
+                sleep(RESTORE_NEIGH_WAIT_TIME_INT);
+            }
+        }
+
         std::vector<Orch *> cfgOrchList = {&nbrmgr};
 
         swss::Select s;

cfgmgr/vlanmgr.cpp

@@ -51,13 +51,19 @@ VlanMgr::VlanMgr(DBConnector *cfgDb, DBConnector *appDb, DBConnector *stateDb, c
     // The command should be generated as:
     // /bin/bash -c "/sbin/ip link del Bridge 2>/dev/null ;
     //               /sbin/ip link add Bridge up type bridge &&
-    //               /sbin/bridge vlan del vid 1 dev Bridge self"
+    //               /sbin/bridge vlan del vid 1 dev Bridge self;
+    //               /sbin/ip link del dummy 2>/dev/null;
+    //               /sbin/ip link add dummy type dummy &&
+    //               sbin/ip link set dummy master Bridge"
 
     const std::string cmds = std::string("")
       + BASH_CMD + " -c \""
       + IP_CMD + " link del " + DOT1Q_BRIDGE_NAME + " 2>/dev/null; "
       + IP_CMD + " link add " + DOT1Q_BRIDGE_NAME + " up type bridge && "
-      + BRIDGE_CMD + " vlan del vid " + DEFAULT_VLAN_ID + " dev " + DOT1Q_BRIDGE_NAME + " self\"";
+      + BRIDGE_CMD + " vlan del vid " + DEFAULT_VLAN_ID + " dev " + DOT1Q_BRIDGE_NAME + " self; "
+      + IP_CMD + " link del dev dummy 2>/dev/null; "
+      + IP_CMD + " link add dummy type dummy && "
+      + IP_CMD + " link set dummy master " + DOT1Q_BRIDGE_NAME + "\"";
 
     std::string res;
     EXEC_WITH_ERROR_THROW(cmds, res);
@@ -169,10 +175,12 @@ bool VlanMgr::addHostVlanMember(int vlan_id, const string &port_alias, const str
 
     // The command should be generated as:
     // /bin/bash -c "/sbin/ip link set {{port_alias}} master Bridge &&
+    //               /sbin/bridge vlan del vid 1 dev {{ port_alias }} &&
     //               /sbin/bridge vlan add vid {{vlan_id}} dev {{port_alias}} {{tagging_mode}}"
     const std::string cmds = std::string("")
       + BASH_CMD + " -c \""
       + IP_CMD + " link set " + port_alias + " master " + DOT1Q_BRIDGE_NAME + " && "
+      + BRIDGE_CMD + " vlan del vid " + DEFAULT_VLAN_ID + " dev " + port_alias + " && "
       + BRIDGE_CMD + " vlan add vid " + std::to_string(vlan_id) + " dev " + port_alias + " " + tagging_cmd + "\"";
 
     std::string res;

debian/swss.install

@@ -1,3 +1,4 @@
 swssconfig/sample/netbouncer.json etc/swss/config.d
 swssconfig/sample/00-copp.config.json etc/swss/config.d
 neighsyncd/restore_neighbors.py usr/bin
+fpmsyncd/bgp_eoiu_marker.py  usr/bin