[swss]voq changes

Author: vedganes

cfgmgr/intfmgr.cpp

@@ -613,6 +613,13 @@ void IntfMgr::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
+    string table_name = consumer.getTableName();
+    if(table_name == CFG_VOQ_INBAND_INTERFACE_TABLE_NAME)
+    {
+        doCfgVoqInbandInterfaceTask(consumer);
+        return;
+    }
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {
@@ -646,3 +653,72 @@ void IntfMgr::doTask(Consumer &consumer)
         it = consumer.m_toSync.erase(it);
     }
 }
+
+void IntfMgr::doCfgVoqInbandInterfaceTask(Consumer &consumer)
+{
+    SWSS_LOG_ENTER();
+
+    string inband_type="";
+
+    auto it = consumer.m_toSync.begin();
+    while (it != consumer.m_toSync.end())
+    {
+        KeyOpFieldsValuesTuple t = it->second;
+
+        vector<string> keys = tokenize(kfvKey(t), config_db_key_delimiter);
+        const vector<FieldValueTuple>& data = kfvFieldsValues(t);
+        string op = kfvOp(t);
+        string alias(keys[0]);
+
+        if (keys.size() == 1)
+        {
+            for (auto idx : data)
+            {
+                const auto &field = fvField(idx);
+                const auto &value = fvValue(idx);
+
+                if (field == "inband_type")
+                {
+                    inband_type = value;
+                }
+
+            }
+
+            if(inband_type == "port")
+            {
+                if(op == SET_COMMAND)
+                {
+                    //For "port" type inband interface no further processing is needed.
+                    m_appIntfTableProducer.set(alias, data);
+                    m_stateIntfTable.hset(alias, "vrf", "");
+                }
+                else if(op == DEL_COMMAND)
+                {
+                    if (!doIntfGeneralTask(keys, data, op))
+                    {
+                        it++;
+                        continue;
+                    }
+                }
+            }
+            else
+            {
+                SWSS_LOG_ERROR("%s type Inband interface not supported! i/f: %s", inband_type.c_str(), kfvKey(t).c_str());
+            }
+        }
+        else if (keys.size() == 2)
+        {
+            if (!doIntfAddrTask(keys, data, op))
+            {
+                it++;
+                continue;
+            }
+        }
+        else
+        {
+            SWSS_LOG_ERROR("Invalid key %s", kfvKey(t).c_str());
+        }
+
+        it = consumer.m_toSync.erase(it);
+    }
+}

cfgmgr/intfmgr.h

@@ -30,7 +30,7 @@ class IntfMgr : public Orch
     bool doIntfGeneralTask(const std::vector<std::string>& keys, std::vector<FieldValueTuple> data, const std::string& op);
     bool doIntfAddrTask(const std::vector<std::string>& keys, const std::vector<FieldValueTuple>& data, const std::string& op);
     void doTask(Consumer &consumer);
-    
+    void doCfgVoqInbandInterfaceTask(Consumer &consumer);
     bool isIntfStateOk(const std::string &alias);
     bool isIntfCreated(const std::string &alias);
     bool isIntfChangeVrf(const std::string &alias, const std::string &vrfName);

cfgmgr/intfmgrd.cpp

@@ -47,6 +47,7 @@ int main(int argc, char **argv)
             CFG_VLAN_INTF_TABLE_NAME,
             CFG_LOOPBACK_INTERFACE_TABLE_NAME,
             CFG_VLAN_SUB_INTF_TABLE_NAME,
+            CFG_VOQ_INBAND_INTERFACE_TABLE_NAME,
         };
 
         DBConnector cfgDb("CONFIG_DB", 0);

orchagent/intfsorch.cpp

@@ -16,6 +16,7 @@
 #include "bufferorch.h"
 #include "directory.h"
 #include "vnetorch.h"
+#include "subscriberstatetable.h"
 
 extern sai_object_id_t gVirtualRouterId;
 extern Directory<Orch*> gDirectory;
@@ -32,6 +33,7 @@ extern RouteOrch *gRouteOrch;
 extern CrmOrch *gCrmOrch;
 extern BufferOrch *gBufferOrch;
 extern bool gIsNatSupported;
+extern NeighOrch *gNeighOrch;
 
 const int intfsorch_pri = 35;
 
@@ -52,8 +54,9 @@ static const vector<sai_router_interface_stat_t> rifStatIds =
     SAI_ROUTER_INTERFACE_STAT_OUT_ERROR_OCTETS,
 };
 
-IntfsOrch::IntfsOrch(DBConnector *db, string tableName, VRFOrch *vrf_orch) :
-        Orch(db, tableName, intfsorch_pri), m_vrfOrch(vrf_orch)
+IntfsOrch::IntfsOrch(DBConnector *db, string tableName, VRFOrch *vrf_orch, DBConnector *voqDb) :
+        Orch(db, tableName, intfsorch_pri), m_vrfOrch(vrf_orch),
+        m_tableVoqSystemInterfaceTable(voqDb, VOQ_SYSTEM_INTERFACE_TABLE_NAME)
 {
     SWSS_LOG_ENTER();
 
@@ -96,6 +99,11 @@ IntfsOrch::IntfsOrch(DBConnector *db, string tableName, VRFOrch *vrf_orch) :
     {
         SWSS_LOG_WARN("RIF flex counter group plugins was not set successfully: %s", e.what());
     }
+
+    //Add subscriber to process VOQ system interface
+    tableName = VOQ_SYSTEM_INTERFACE_TABLE_NAME;
+    Orch::addExecutor(new Consumer(new SubscriberStateTable(voqDb, tableName, TableConsumable::DEFAULT_POP_BATCH_SIZE, 0), this, tableName));
+
 }
 
 sai_object_id_t IntfsOrch::getRouterIntfsId(const string &alias)
@@ -430,6 +438,15 @@ bool IntfsOrch::setIntf(const string& alias, sai_object_id_t vrf_id, const IpPre
 
     addIp2MeRoute(port.m_vr_id, *ip_prefix);
 
+    if(alias == gPortsOrch->m_inbandPortName)
+    {
+        gNeighOrch->addInbandNeighbor(alias, ip_prefix->getIp());
+
+        //There is no config to bring inband host if admin up. So bring the
+        //admin up here after setting the Ip2me route for inband host if ip
+        gPortsOrch->setSystemPortHostIfAdminUp(alias);
+    }
+
     if (port.m_type == Port::VLAN)
     {
         addDirectedBroadcast(port, *ip_prefix);
@@ -453,6 +470,11 @@ bool IntfsOrch::removeIntf(const string& alias, sai_object_id_t vrf_id, const Ip
     {
         removeIp2MeRoute(port.m_vr_id, *ip_prefix);
 
+        if(alias == gPortsOrch->m_inbandPortName)
+        {
+            gNeighOrch->delInbandNeighbor(alias, ip_prefix->getIp());
+        }
+
         if(port.m_type == Port::VLAN)
         {
             removeDirectedBroadcast(port, *ip_prefix);
@@ -497,6 +519,8 @@ void IntfsOrch::doTask(Consumer &consumer)
         return;
     }
 
+    string table_name = consumer.getTableName();
+
     auto it = consumer.m_toSync.begin();
     while (it != consumer.m_toSync.end())
     {
@@ -521,6 +545,16 @@ void IntfsOrch::doTask(Consumer &consumer)
             ip_prefix_in_key = true;
         }
 
+        if(table_name == VOQ_SYSTEM_INTERFACE_TABLE_NAME)
+        {
+            if(!isRemoteSystemPortIntf(alias))
+            {
+                //Synced local interface. Skip
+                it = consumer.m_toSync.erase(it);
+                continue;
+            }
+        }
+
         const vector<FieldValueTuple>& data = kfvFieldsValues(t);
         string vrf_name = "", vnet_name = "", nat_zone = "";
         MacAddress mac;
@@ -529,6 +563,7 @@ void IntfsOrch::doTask(Consumer &consumer)
         bool adminUp;
         uint32_t nat_zone_id = 0;
         string proxy_arp = "";
+        string inband_type = "";
 
         for (auto idx : data)
         {
@@ -608,6 +643,10 @@ void IntfsOrch::doTask(Consumer &consumer)
             {
                 proxy_arp = value;
             }
+            else if (field == "inband_type")
+            {
+                inband_type = value;
+            }
         }
 
         if (alias == "eth0" || alias == "docker0")
@@ -680,6 +719,11 @@ void IntfsOrch::doTask(Consumer &consumer)
                 }
             }
 
+            if(inband_type == "port")
+            {
+                gPortsOrch->voqAddInbandHostIf(alias, port);
+            }
+
             if (m_vnetInfses.find(alias) != m_vnetInfses.end())
             {
                 vnet_name = m_vnetInfses.at(alias);
@@ -892,6 +936,7 @@ bool IntfsOrch::addRouterIntfs(sai_object_id_t vrf_id, Port &port)
     {
         case Port::PHY:
         case Port::LAG:
+        case Port::SYSTEM:
             attr.value.s32 = SAI_ROUTER_INTERFACE_TYPE_PORT;
             attrs.push_back(attr);
             break;
@@ -911,6 +956,7 @@ bool IntfsOrch::addRouterIntfs(sai_object_id_t vrf_id, Port &port)
     switch(port.m_type)
     {
         case Port::PHY:
+        case Port::SYSTEM:
             attr.id = SAI_ROUTER_INTERFACE_ATTR_PORT_ID;
             attr.value.oid = port.m_port_id;
             attrs.push_back(attr);
@@ -975,6 +1021,9 @@ bool IntfsOrch::addRouterIntfs(sai_object_id_t vrf_id, Port &port)
 
     SWSS_LOG_NOTICE("Create router interface %s MTU %u", port.m_alias.c_str(), port.m_mtu);
 
+    //Sync the interface to add to the SYSTEM_INTERFACE table of VOQ DB
+    voqSyncAddIntf(port.m_alias, port.m_rif_id);
+
     return true;
 }
 
@@ -1005,6 +1054,9 @@ bool IntfsOrch::removeRouterIntfs(Port &port)
 
     SWSS_LOG_NOTICE("Remove router interface for port %s", port.m_alias.c_str());
 
+    //Sync the interface to del from the SYSTEM_INTERFACE table of VOQ DB
+    voqSyncDelIntf(port.m_alias);
+
     return true;
 }
 
@@ -1227,6 +1279,7 @@ void IntfsOrch::doTask(SelectableTimer &timer)
         {
             case Port::PHY:
             case Port::LAG:
+            case Port::SYSTEM:
                 type = "SAI_ROUTER_INTERFACE_TYPE_PORT";
                 break;
             case Port::VLAN:
@@ -1252,3 +1305,78 @@ void IntfsOrch::doTask(SelectableTimer &timer)
         }
     }
 }
+
+bool IntfsOrch::isRemoteSystemPortIntf(string alias)
+{
+    Port port;
+    if(gPortsOrch->getPort(alias, port))
+    {
+        return(port.m_system_port_info.type == SAI_SYSTEM_PORT_TYPE_REMOTE);
+    }
+    //Given alias is system port alias of the local port
+    return false;
+}
+
+bool IntfsOrch::voqSyncAddIntf(string &alias, sai_object_id_t &rif_id)
+{
+    //Sync only local interface. Confirm for the local interface and
+    //get the system port alias for key for syncing
+    Port port;
+    if(gPortsOrch->getPort(alias, port))
+    {
+        if(port.m_system_port_info.type == SAI_SYSTEM_PORT_TYPE_REMOTE)
+        {
+            return true;
+        }
+    }
+    alias = port.m_system_port_info.alias;
+
+    //Get router interface to make sure it exists
+    sai_attribute_t attr;
+    sai_status_t status;
+
+    attr.id = SAI_ROUTER_INTERFACE_ATTR_PORT_ID;
+
+    status = sai_router_intfs_api->get_router_interface_attribute(rif_id, 1, &attr);
+    if (status != SAI_STATUS_SUCCESS)
+    {
+        SWSS_LOG_ERROR("Failed to get rif for %s:0x%lx, rv:%d", alias.c_str(), rif_id, status);
+        return false;
+    }
+
+    //Get the Real ID of the RIF ID
+    string value;
+    const auto id = sai_serialize_object_id(rif_id);
+
+    if (m_vidToRidTable->hget("", id, value))
+    {
+        FieldValueTuple rifIdFv ("rif_id", value);
+        vector<FieldValueTuple> attrs;
+        attrs.push_back(rifIdFv);
+
+        m_tableVoqSystemInterfaceTable.set(alias, attrs);
+        return true;
+    }
+    SWSS_LOG_ERROR("Failed to get real ID from ASIC DB for RIF id 0x%lx of %s", rif_id, alias.c_str());
+    return false;
+}
+
+bool IntfsOrch::voqSyncDelIntf(string &alias)
+{
+    //Sync only local interface. Confirm for the local interface and
+    //get the system port alias for key for syncing to global VOQ DB
+    Port port;
+    if(gPortsOrch->getPort(alias, port))
+    {
+        if(port.m_system_port_info.type == SAI_SYSTEM_PORT_TYPE_REMOTE)
+        {
+            return true;
+        }
+    }
+    alias = port.m_system_port_info.alias;
+
+    m_tableVoqSystemInterfaceTable.del(alias);
+
+    return true;
+}
+

orchagent/intfsorch.h

@@ -32,7 +32,7 @@ typedef map<string, IntfsEntry> IntfsTable;
 class IntfsOrch : public Orch
 {
 public:
-    IntfsOrch(DBConnector *db, string tableName, VRFOrch *vrf_orch);
+    IntfsOrch(DBConnector *db, string tableName, VRFOrch *vrf_orch, DBConnector *voqDb);
 
     sai_object_id_t getRouterIntfsId(const string&);
     bool isPrefixSubnet(const IpPrefix&, const string&);
@@ -64,6 +64,8 @@ class IntfsOrch : public Orch
 
     bool updateSyncdIntfPfx(const string &alias, const IpPrefix &ip_prefix, bool add = true);
 
+    bool isRemoteSystemPortIntf(string alias);
+
 private:
 
     SelectableTimer* m_updateMapsTimer = nullptr;
@@ -94,6 +96,11 @@ class IntfsOrch : public Orch
 
     bool setIntfVlanFloodType(const Port &port, sai_vlan_flood_control_type_t vlan_flood_type);
     bool setIntfProxyArp(const string &alias, const string &proxy_arp);
+
+    Table m_tableVoqSystemInterfaceTable;
+    bool voqSyncAddIntf(string &alias, sai_object_id_t &rif_id);
+    bool voqSyncDelIntf(string &alias);
+
 };
 
 #endif /* SWSS_INTFSORCH_H */