Orchagent changes needed to support single ASIC VOQ Fixed-System

orchagent/intfsorch.cpp

@@ -98,7 +98,12 @@ IntfsOrch::IntfsOrch(DBConnector *db, string tableName, VRFOrch *vrf_orch, DBCon
                                  RIF_PLUGIN_FIELD,
                                  rifRateSha);
 
-    if(gMySwitchType == "voq")
+    /* check if this is a single asic voq */
+    if (chassisAppDb == nullptr) {
+        m_singleVoq = true;
+    }
+
+    if(gMySwitchType == "voq" && !m_singleVoq)
     {
         //Add subscriber to process VOQ system interface
         tableName = CHASSIS_APP_SYSTEM_INTERFACE_TABLE_NAME;
@@ -1670,6 +1675,10 @@ bool IntfsOrch::isLocalSystemPortIntf(string alias)
 
 void IntfsOrch::voqSyncAddIntf(string &alias)
 {
+    if (m_singleVoq) {
+        return;
+    }
+
     //Sync only local interface. Confirm for the local interface and
     //get the system port alias for key for syncing to CHASSIS_APP_DB
     Port port;
@@ -1710,6 +1719,10 @@ void IntfsOrch::voqSyncAddIntf(string &alias)
 
 void IntfsOrch::voqSyncDelIntf(string &alias)
 {
+    if (m_singleVoq) {
+        return;
+    }
+
     //Sync only local interface. Confirm for the local interface and
     //get the system port alias for key for syncing to CHASSIS_APP_DB
     Port port;
@@ -1743,6 +1756,10 @@ void IntfsOrch::voqSyncDelIntf(string &alias)
 
 void IntfsOrch::voqSyncIntfState(string &alias, bool isUp)
 {
+    if (m_singleVoq) {
+        return;
+    }
+
     Port port;
     string port_alias;
     if(gPortsOrch->getPort(alias, port))
@@ -1773,4 +1790,3 @@ void IntfsOrch::voqSyncIntfState(string &alias, bool isUp)
     }
 
 }
-

orchagent/intfsorch.h

@@ -76,6 +76,7 @@ class IntfsOrch : public Orch
 
 private:
 
+    bool m_singleVoq = false;
     SelectableTimer* m_updateMapsTimer = nullptr;
     std::vector<Port> m_rifsToAdd;
 

orchagent/main.cpp

@@ -17,6 +17,8 @@ extern "C" {
 #include <stdexcept>
 #include <stdlib.h>
 #include <string.h>
+#include <fstream>
+#include <nlohmann/json.hpp>
 
 #include <sys/time.h>
 #include <sairedis.h>
@@ -205,6 +207,18 @@ void getCfgSwitchType(DBConnector *cfgDb, string &switch_type, string &switch_su
 
 }
 
+bool isChassisAppDbPresent()
+{
+    std::ifstream file("/etc/sonic/database_config.json");
+    if (!file.is_open()) return false;
+
+    nlohmann::json db_config;
+    file >> db_config;
+
+    return db_config.contains("DATABASES") &&
+           db_config["DATABASES"].contains("CHASSIS_APP_DB");
+}
+
 bool getSystemPortConfigList(DBConnector *cfgDb, DBConnector *appDb, vector<sai_system_port_config_t> &sysportcfglist)
 {
     Table cfgDeviceMetaDataTable(cfgDb, CFG_DEVICE_METADATA_TABLE_NAME);
@@ -607,7 +621,15 @@ int main(int argc, char **argv)
 
         //Connect to CHASSIS_APP_DB in redis-server in control/supervisor card as per
         //connection info in database_config.json
-        chassis_app_db = make_shared<DBConnector>("CHASSIS_APP_DB", 0, true);
+	chassis_app_db = nullptr;
+        if (isChassisAppDbPresent()) {
+            try {
+                chassis_app_db = make_shared<DBConnector>("CHASSIS_APP_DB", 0, true);
+            }
+            catch (const std::exception& e) {
+                SWSS_LOG_NOTICE("CHASSIS_APP_DB not available, operating in standalone VOQ mode");
+            }
+	}
     }
     else if (gMySwitchType == "fabric")
     {
@@ -804,6 +826,10 @@ int main(int argc, char **argv)
     }
 
     shared_ptr<OrchDaemon> orchDaemon;
+    DBConnector *chassis_db = nullptr;
+    if (chassis_app_db != nullptr) {
+        chassis_db = chassis_app_db.get();
+    }
 
     /*
      * Declare shared pointers for dpu specific databases.
@@ -821,7 +847,7 @@ int main(int argc, char **argv)
 
     else if (gMySwitchType != "fabric")
     {
-        orchDaemon = make_shared<OrchDaemon>(&appl_db, &config_db, &state_db, chassis_app_db.get(), zmq_server.get());
+        orchDaemon = make_shared<OrchDaemon>(&appl_db, &config_db, &state_db, chassis_db, zmq_server.get());
         if (gMySwitchType == "voq")
         {
             orchDaemon->setFabricEnabled(true);
@@ -831,7 +857,7 @@ int main(int argc, char **argv)
     }
     else
     {
-        orchDaemon = make_shared<FabricOrchDaemon>(&appl_db, &config_db, &state_db, chassis_app_db.get(), zmq_server.get());
+        orchDaemon = make_shared<FabricOrchDaemon>(&appl_db, &config_db, &state_db, chassis_db, zmq_server.get());
     }
 
     if (gRingMode) {

orchagent/neighorch.cpp

@@ -46,7 +46,12 @@ NeighOrch::NeighOrch(DBConnector *appDb, string tableName, IntfsOrch *intfsOrch,
         gBfdOrch->attach(this);
     }
 
-    if(gMySwitchType == "voq")
+    /* check if this is a single asic voq */
+    if (chassisAppDb == nullptr) {
+        m_singleVoq = true;
+    }
+
+    if(gMySwitchType == "voq" && !m_singleVoq)
     {
         //Add subscriber to process VOQ system neigh
         tableName = CHASSIS_APP_SYSTEM_NEIGH_TABLE_NAME;
@@ -1926,7 +1931,9 @@ void NeighOrch::doVoqSystemNeighTask(Consumer &consumer)
                         if (removeNeighbor(ctx))
                         {
                             //neigh successfully deleted from SAI. Set STATE DB to signal to remove entries from kernel
-                            m_stateSystemNeighTable->del(state_key);
+                            if (!m_singleVoq) {
+                                m_stateSystemNeighTable->del(state_key);
+                            }
                         }
                         else
                         {
@@ -1976,7 +1983,9 @@ void NeighOrch::doVoqSystemNeighTask(Consumer &consumer)
                     vector<FieldValueTuple> fvVector;
                     FieldValueTuple mac("neigh", mac_address.to_string());
                     fvVector.push_back(mac);
-                    m_stateSystemNeighTable->set(state_key, fvVector);
+                    if (!m_singleVoq) {
+                        m_stateSystemNeighTable->set(state_key, fvVector);
+                    }
 
                     it = consumer.m_toSync.erase(it);
                 }
@@ -2013,7 +2022,9 @@ void NeighOrch::doVoqSystemNeighTask(Consumer &consumer)
                 if (removeNeighbor(ctx))
                 {
                     //neigh successfully deleted from SAI. Set STATE DB to signal to remove entries from kernel
-                    m_stateSystemNeighTable->del(state_key);
+                    if (!m_singleVoq) {
+                        m_stateSystemNeighTable->del(state_key);
+                    }
 
                     it = consumer.m_toSync.erase(it);
                 }
@@ -2162,6 +2173,10 @@ bool NeighOrch::delInbandNeighbor(string alias, IpAddress ip_address)
 
 bool NeighOrch::getSystemPortNeighEncapIndex(string &alias, IpAddress &ip, uint32_t &encap_index)
 {
+    if (m_singleVoq) {
+        return true;
+    }
+
     string value;
     string key = alias + m_tableVoqSystemNeighTable->getTableNameSeparator().c_str() + ip.to_string();
 
@@ -2203,6 +2218,10 @@ bool NeighOrch::addVoqEncapIndex(string &alias, IpAddress &ip, vector<sai_attrib
 
 void NeighOrch::voqSyncAddNeigh(string &alias, IpAddress &ip_address, const MacAddress &mac, sai_neighbor_entry_t &neighbor_entry)
 {
+    if (m_singleVoq) {
+        return;
+    }
+
     sai_attribute_t attr;
     sai_status_t status;
 
@@ -2273,6 +2292,10 @@ void NeighOrch::voqSyncAddNeigh(string &alias, IpAddress &ip_address, const MacA
 
 void NeighOrch::voqSyncDelNeigh(string &alias, IpAddress &ip_address)
 {
+    if (m_singleVoq) {
+        return;
+    }
+
     //Sync only local neigh. Confirm for the local neigh and
     //get the system port alias for key for syncing to CHASSIS_APP_DB
     Port port;

orchagent/neighorch.h

@@ -113,6 +113,7 @@ class NeighOrch : public Orch, public Subject, public Observer
     void clearBulkers();
 
 private:
+    bool m_singleVoq =  false;
     PortsOrch *m_portsOrch;
     IntfsOrch *m_intfsOrch;
     FdbOrch *m_fdbOrch;

orchagent/portsorch.cpp

@@ -930,7 +930,12 @@ PortsOrch::PortsOrch(DBConnector *db, DBConnector *stateDb, vector<table_name_wi
         Orch::addExecutor(portHostTxReadyNotificatier);
     }
 
-    if (gMySwitchType == "voq")
+    /* check if this is a single asic voq */
+    if (chassisAppDb == nullptr) {
+	m_singleVoq = true;
+    }
+
+    if (gMySwitchType == "voq" && !m_singleVoq)
     {
         string tableName;
         //Add subscriber to process system LAG (System PortChannel) table
@@ -7283,14 +7288,16 @@ bool PortsOrch::addLag(string lag_alias, uint32_t spa_id, int32_t switch_id)
             switch_id = gVoqMySwitchId;
             system_lag_alias = gMyHostName + "|" + gMyAsicName + "|" + lag_alias;
 
-            // Allocate unique lag id
-            spa_id = m_lagIdAllocator->lagIdAdd(system_lag_alias, 0);
+	    if (!m_singleVoq) {
+                // Allocate unique lag id
+                spa_id = m_lagIdAllocator->lagIdAdd(system_lag_alias, 0);
 
-            if ((int32_t)spa_id <= 0)
-            {
-                SWSS_LOG_ERROR("Failed to allocate unique LAG id for local lag %s rv:%d", lag_alias.c_str(), spa_id);
-                return false;
-            }
+                if ((int32_t)spa_id <= 0)
+                {
+                    SWSS_LOG_ERROR("Failed to allocate unique LAG id for local lag %s rv:%d", lag_alias.c_str(), spa_id);
+                    return false;
+                }
+	    }
         }
 
         sai_attribute_t attr;
@@ -7401,7 +7408,7 @@ bool PortsOrch::removeLag(Port lag)
 
     m_counterLagTable->hdel("", lag.m_alias);
 
-    if (gMySwitchType == "voq")
+    if (gMySwitchType == "voq" && !m_singleVoq)
     {
         // Free the lag id, if this is local LAG
 
@@ -9946,7 +9953,8 @@ void PortsOrch::voqSyncAddLag (Port &lag)
 
     // Sync only local lag add to CHASSIS_APP_DB
 
-    if (switch_id != gVoqMySwitchId)
+    if (switch_id != gVoqMySwitchId ||
+       m_singleVoq)
     {
         return;
     }
@@ -9969,7 +9977,8 @@ void PortsOrch::voqSyncAddLag (Port &lag)
 void PortsOrch::voqSyncDelLag(Port &lag)
 {
     // Sync only local lag del to CHASSIS_APP_DB
-    if (lag.m_system_lag_info.switch_id != gVoqMySwitchId)
+    if (lag.m_system_lag_info.switch_id != gVoqMySwitchId ||
+       m_singleVoq)
     {
         return;
     }
@@ -9982,7 +9991,8 @@ void PortsOrch::voqSyncDelLag(Port &lag)
 void PortsOrch::voqSyncAddLagMember(Port &lag, Port &port, string status)
 {
     // Sync only local lag's member add to CHASSIS_APP_DB
-    if (lag.m_system_lag_info.switch_id != gVoqMySwitchId)
+    if (lag.m_system_lag_info.switch_id != gVoqMySwitchId ||
+       m_singleVoq)
     {
         return;
     }
@@ -9998,7 +10008,8 @@ void PortsOrch::voqSyncAddLagMember(Port &lag, Port &port, string status)
 void PortsOrch::voqSyncDelLagMember(Port &lag, Port &port)
 {
     // Sync only local lag's member del to CHASSIS_APP_DB
-    if (lag.m_system_lag_info.switch_id != gVoqMySwitchId)
+    if (lag.m_system_lag_info.switch_id != gVoqMySwitchId ||
+       m_singleVoq)
     {
         return;
     }

orchagent/portsorch.h

@@ -261,6 +261,7 @@ class PortsOrch : public Orch, public Subject
 private:
     unique_ptr<CounterNameMapUpdater> m_counterNameMapUpdater;
     // unique_ptr<Table> m_counterTable;
+    bool m_singleVoq = false;
     unique_ptr<Table> m_counterSysPortTable;
     unique_ptr<Table> m_counterLagTable;
     unique_ptr<Table> m_portTable;

tests/conftest.py

@@ -1669,6 +1669,11 @@ def create_vct_ctn(self, ctndir):
             vol = {}
             vol[chassis_config_dir] = {"bind": "/usr/share/sonic/virtual_chassis", "mode": "ro"}
 
+            # Mount database_config.json when connect_to_chassis_db is set to 1
+            if defcfg.get("connect_to_chassis_db") == 1:
+                database_config_file = cwd + "/virtual_chassis/database_config.json"
+                vol[database_config_file] = {"bind": "/etc/sonic/database_config.json", "mode": "ro"}
+
             # pass self.ns into the vs to be use for vs restarts by swss conftest.
             # connection to chassbr is setup by chassis_connect.py within the vs
             data = {}