To be backward compatible with VLAN configuration via Minigraph

Author: jipanyang

portsyncd/linksync.cpp

@@ -29,11 +29,15 @@ const string LAG_PREFIX = "PortChannel";
 extern set<string> g_portSet;
 extern map<string, set<string>> g_vlanMap;
 extern bool g_init;
+extern bool g_minigraphVlan;
 
 LinkSync::LinkSync(DBConnector *db) :
     m_portTableProducer(db, APP_PORT_TABLE_NAME),
+    m_vlanTableProducer(db, APP_VLAN_TABLE_NAME),
+    m_vlanMemberTableProducer(db, APP_VLAN_MEMBER_TABLE_NAME),
     m_lagTableProducer(db, APP_LAG_TABLE_NAME),
     m_portTableConsumer(db, APP_PORT_TABLE_NAME),
+    m_vlanMemberTableConsumer(db, APP_VLAN_MEMBER_TABLE_NAME),
     m_lagTableConsumer(db, APP_LAG_TABLE_NAME)
 {
     /* See the comments for g_portSet in portsyncd.cpp */
@@ -52,6 +56,22 @@ LinkSync::LinkSync(DBConnector *db) :
             }
         }
     }
+
+    vector<KeyOpFieldsValuesTuple> tuples;
+    m_vlanMemberTableConsumer.getTableContent(tuples);
+
+    for (auto tuple : tuples)
+    {
+        vector<string> keys = tokenize(kfvKey(tuple), ':');
+        string vlan = keys[0];
+        string member = keys[1];
+
+        if (g_vlanMap.find(vlan) == g_vlanMap.end())
+        {
+            g_vlanMap[vlan] = set<string>();
+        }
+        g_vlanMap[vlan].insert(member);
+    }
 }
 
 void LinkSync::onMsg(int nlmsg_type, struct nl_object *obj)
@@ -65,14 +85,17 @@ void LinkSync::onMsg(int nlmsg_type, struct nl_object *obj)
     string key = rtnl_link_get_name(link);
 
     if (key.compare(0, INTFS_PREFIX.length(), INTFS_PREFIX) &&
+        key.compare(0, VLAN_PREFIX.length(), VLAN_PREFIX) &&
         key.compare(0, LAG_PREFIX.length(), LAG_PREFIX))
     {
         return;
     }
 
-    if (key.compare(0, VLAN_PREFIX.length(), VLAN_PREFIX) == 0)
+    if (!g_minigraphVlan && key.compare(0, VLAN_PREFIX.length(), VLAN_PREFIX) == 0)
     {
-        /* VLAN APP config doesn't rely on netlink */
+        /*
+         * VLAN APP config doesn't rely on netlink when VLAN not configured from minigraph
+         */
         return;
     }
 
@@ -108,12 +131,65 @@ void LinkSync::onMsg(int nlmsg_type, struct nl_object *obj)
         return;
     }
 
+    /* VLAN member: A separate entry in VLAN_TABLE will be inserted */
+    if (master)
+    {
+        string master_key = m_ifindexNameMap[master];
+        /* Verify the master interface starts with "Vlan" to exclude "PortChannel" interfaces */
+        if (!master_key.compare(0, VLAN_PREFIX.length(), VLAN_PREFIX))
+        {
+            string member_key = master_key + ":" + key;
+
+            if (nlmsg_type == RTM_DELLINK) /* Will it happen? */
+            {
+                m_vlanMemberTableProducer.del(member_key);
+            }
+            else /* RTM_NEWLINK */
+            {
+                vector<FieldValueTuple> fvVector;
+                FieldValueTuple t("tagging_mode", "untagged");
+                fvVector.push_back(t);
+
+                m_vlanMemberTableProducer.set(member_key, fvVector);
+            }
+        }
+    }
+    /* No longer a VLAN member: Check if it was a member before and remove it */
+    else
+    {
+        for (auto i = g_vlanMap.begin(); i != g_vlanMap.end(); i++)
+        {
+            set<string> member_set = (*i).second;
+            if (member_set.find(key) != member_set.end())
+            {
+                string member_key = (*i).first + ":" + key;
+                m_vlanMemberTableProducer.del(member_key);
+            }
+        }
+    }
+
     vector<FieldValueTuple> fvVector;
     FieldValueTuple a("admin_status", admin ? "up" : "down");
     FieldValueTuple m("mtu", to_string(mtu));
     fvVector.push_back(a);
     fvVector.push_back(m);
 
+    /* VLAN interfaces: Check if the type is bridge */
+    if (type && !strcmp(type, VLAN_DRV_NAME))
+    {
+        if (nlmsg_type == RTM_DELLINK)
+        {
+            m_vlanTableProducer.del(key);
+        }
+        else
+        {
+            FieldValueTuple o("oper_status", oper ? "up" : "down");
+            fvVector.push_back(o);
+            m_vlanTableProducer.set(key, fvVector);
+        }
+        return;
+    }
+
     /* front panel interfaces: Check if the port is in the PORT_TABLE
      * non-front panel interfaces such as eth0, lo which are not in the
      * PORT_TABLE are ignored. */

portsyncd/linksync.h

@@ -19,8 +19,8 @@ class LinkSync : public NetMsg
     virtual void onMsg(int nlmsg_type, struct nl_object *obj);
 
 private:
-    ProducerStateTable m_portTableProducer, m_lagTableProducer;
-    Table m_portTableConsumer, m_lagTableConsumer;
+    ProducerStateTable m_portTableProducer, m_vlanTableProducer, m_vlanMemberTableProducer, m_lagTableProducer;
+    Table m_portTableConsumer, m_vlanMemberTableConsumer, m_lagTableConsumer;
 
     std::map<unsigned int, std::string> m_ifindexNameMap;
 };

portsyncd/portsyncd.cpp

@@ -5,6 +5,7 @@
 #include <vector>
 #include <set>
 #include <map>
+#include "exec.h"
 #include "dbconnector.h"
 #include "select.h"
 #include "netdispatcher.h"
@@ -30,7 +31,7 @@ using namespace swss;
 set<string> g_portSet;
 map<string, set<string>> g_vlanMap;
 bool g_init = false;
-
+bool g_minigraphVlan = false;
 void usage()
 {
     cout << "Usage: portsyncd [-p port_config.ini]" << endl;
@@ -40,6 +41,7 @@ void usage()
 
 void handlePortConfigFile(ProducerStateTable &p, string file);
 void handleVlanIntfFile(string file);
+void minigraphVlan();
 
 int main(int argc, char **argv)
 {
@@ -63,6 +65,7 @@ int main(int argc, char **argv)
         }
     }
 
+    minigraphVlan();
     DBConnector db(0, DBConnector::DEFAULT_UNIXSOCKET, 0);
     ProducerStateTable p(&db, APP_PORT_TABLE_NAME);
 
@@ -165,3 +168,15 @@ void handlePortConfigFile(ProducerStateTable &p, string file)
 
     infile.close();
 }
+
+void minigraphVlan()
+{
+    string vlan;
+
+    vlan = swss::exec("sonic-cfggen -m /etc/sonic/minigraph.xml -v 'minigraph_vlans.keys()'");
+    if(vlan.compare(0, 2, "[]"))
+    {
+        g_minigraphVlan = true;
+        cout << "VLAN configured from minigraph" << endl;
+    }
+}