[portsorch] fix PortsOrch::allPortsReady() returns true when it should not

orchagent/pfcwdorch.cpp

@@ -759,6 +759,11 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)
 {
     PfcWdOrch<DropHandler, ForwardHandler>::doTask(consumer);
 
+    if (!gPortsOrch->allPortsReady())
+    {
+        return;
+    }
+
     if ((consumer.getDbId() == APPL_DB) && (consumer.getTableName() == APP_PFC_WD_TABLE_NAME))
     {
         auto it = consumer.m_toSync.begin();

orchagent/portsorch.cpp

@@ -1471,6 +1471,16 @@ bool PortsOrch::bake()
         return false;
     }
 
+    for (const auto& alias: keys)
+    {
+        if (alias == "PortConfigDone" || alias == "PortInitDone")
+        {
+            continue;
+        }
+
+        m_pendingPortSet.emplace(alias);
+    }
+
     addExistingData(m_portTable.get());
     addExistingData(APP_LAG_TABLE_NAME);
     addExistingData(APP_LAG_MEMBER_TABLE_NAME);

tests/Makefile.am

@@ -2,6 +2,8 @@ CFLAGS_SAI = -I /usr/include/sai
 
 TESTS = tests
 
+SUBDIRS = mock_tests
+
 noinst_PROGRAMS = tests
 
 if DEBUG

tests/mock_tests/.gitignore

@@ -0,0 +1 @@
+tests

tests/mock_tests/Makefile.am

@@ -1,6 +1,8 @@
 CFLAGS_SAI = -I /usr/include/sai
 
-bin_PROGRAMS = tests
+TESTS = tests
+
+noinst_PROGRAMS = tests
 
 LDADD_SAI = -lsaimeta -lsaimetadata -lsaivs -lsairedis
 
@@ -13,42 +15,48 @@ endif
 CFLAGS_GTEST =
 LDADD_GTEST = -L/usr/src/gtest
 
-tests_SOURCES = swssnet_ut.cpp request_parser_ut.cpp aclorch_ut.cpp saispy_ut.cpp \
+tests_SOURCES = aclorch_ut.cpp \
+                portsorch_ut.cpp \
+                saispy_ut.cpp \
+                ut_saihelper.cpp \
                 mock_orchagent_main.cpp \
                 mock_dbconnector.cpp \
                 mock_consumerstatetable.cpp \
+                mock_table.cpp \
                 mock_hiredis.cpp \
                 mock_redisreply.cpp \
-                ../orchagent/orchdaemon.cpp \
-                ../orchagent/orch.cpp \
-                ../orchagent/notifications.cpp \
-                ../orchagent/routeorch.cpp \
-                ../orchagent/neighorch.cpp \
-                ../orchagent/intfsorch.cpp \
-                ../orchagent/portsorch.cpp \
-                ../orchagent/copporch.cpp \
-                ../orchagent/tunneldecaporch.cpp \
-                ../orchagent/qosorch.cpp \
-                ../orchagent/bufferorch.cpp \
-                ../orchagent/mirrororch.cpp \
-                ../orchagent/fdborch.cpp \
-                ../orchagent/aclorch.cpp \
-                ../orchagent/saihelper.cpp \
-                ../orchagent/switchorch.cpp \
-                ../orchagent/pfcwdorch.cpp \
-                ../orchagent/pfcactionhandler.cpp \
-                ../orchagent/policerorch.cpp \
-                ../orchagent/crmorch.cpp \
-                ../orchagent/request_parser.cpp \
-                ../orchagent/vrforch.cpp \
-                ../orchagent/countercheckorch.cpp \
-                ../orchagent/vxlanorch.cpp \
-                ../orchagent/vnetorch.cpp \
-                ../orchagent/dtelorch.cpp \
-                ../orchagent/flexcounterorch.cpp \
-                ../orchagent/watermarkorch.cpp
+                $(top_srcdir)/orchagent/orchdaemon.cpp \
+                $(top_srcdir)/orchagent/orch.cpp \
+                $(top_srcdir)/orchagent/notifications.cpp \
+                $(top_srcdir)/orchagent/routeorch.cpp \
+                $(top_srcdir)/orchagent/neighorch.cpp \
+                $(top_srcdir)/orchagent/intfsorch.cpp \
+                $(top_srcdir)/orchagent/portsorch.cpp \
+                $(top_srcdir)/orchagent/copporch.cpp \
+                $(top_srcdir)/orchagent/tunneldecaporch.cpp \
+                $(top_srcdir)/orchagent/qosorch.cpp \
+                $(top_srcdir)/orchagent/bufferorch.cpp \
+                $(top_srcdir)/orchagent/mirrororch.cpp \
+                $(top_srcdir)/orchagent/fdborch.cpp \
+                $(top_srcdir)/orchagent/aclorch.cpp \
+                $(top_srcdir)/orchagent/saihelper.cpp \
+                $(top_srcdir)/orchagent/switchorch.cpp \
+                $(top_srcdir)/orchagent/pfcwdorch.cpp \
+                $(top_srcdir)/orchagent/pfcactionhandler.cpp \
+                $(top_srcdir)/orchagent/policerorch.cpp \
+                $(top_srcdir)/orchagent/crmorch.cpp \
+                $(top_srcdir)/orchagent/request_parser.cpp \
+                $(top_srcdir)/orchagent/vrforch.cpp \
+                $(top_srcdir)/orchagent/countercheckorch.cpp \
+                $(top_srcdir)/orchagent/vxlanorch.cpp \
+                $(top_srcdir)/orchagent/vnetorch.cpp \
+                $(top_srcdir)/orchagent/dtelorch.cpp \
+                $(top_srcdir)/orchagent/flexcounterorch.cpp \
+                $(top_srcdir)/orchagent/watermarkorch.cpp \
+                $(top_srcdir)/orchagent/chassisorch.cpp \
+                $(top_srcdir)/orchagent/sfloworch.cpp
 
 tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI)
-tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -I../orchagent
+tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -I$(top_srcdir)/orchagent
 tests_LDADD = $(LDADD_GTEST) $(LDADD_SAI) -lnl-genl-3 -lhiredis -lhiredis -lpthread \
         -lswsscommon -lswsscommon -lgtest -lgtest_main

tests/mock_tests/aclorch_ut.cpp

@@ -643,16 +643,16 @@ namespace aclorch_test
         // leakage check
         bool validateResourceCountWithLowerLayerDb(const AclOrch *aclOrch)
         {
-            // TODO: Using the need to include "sai_vs_state.h". That will need the include path from `configure`
-            //       Do this later ...
+        // TODO: Using the need to include "sai_vs_state.h". That will need the include path from `configure`
+        //       Do this later ...
 #if WITH_SAI == LIBVS
-            // {
-            //     auto& aclTableHash = g_switch_state_map.at(gSwitchId)->objectHash.at(SAI_OBJECT_TYPE_ACL_TABLE);
-            //
-            //     return aclTableHash.size() == Portal::AclOrchInternal::getAclTables(aclOrch).size();
-            // }
-            //
-            // TODO: add rule check
+        // {
+        //     auto& aclTableHash = g_switch_state_map.at(gSwitchId)->objectHash.at(SAI_OBJECT_TYPE_ACL_TABLE);
+        //
+        //     return aclTableHash.size() == Portal::AclOrchInternal::getAclTables(aclOrch).size();
+        // }
+        //
+        // TODO: add rule check
 #endif
 
             return true;

tests/mock_tests/mock_consumerstatetable.cpp

@@ -7,4 +7,4 @@ namespace swss
         TableName_KeySet(tableName)
     {
     }
-}
+}

tests/mock_tests/mock_dbconnector.cpp

@@ -40,6 +40,6 @@ namespace swss
 
     int DBConnector::getDbId() const
     {
-        return 12345;
+        return m_dbId;
     }
-}
+}

tests/mock_tests/mock_orchagent_main.h

@@ -0,0 +1,56 @@
+#pragma once
+
+#include "orch.h"
+#include "switchorch.h"
+#include "crmorch.h"
+#include "portsorch.h"
+#include "routeorch.h"
+#include "intfsorch.h"
+#include "neighorch.h"
+#include "fdborch.h"
+#include "mirrororch.h"
+#include "bufferorch.h"
+#include "vrforch.h"
+#include "vnetorch.h"
+#include "vxlanorch.h"
+#include "policerorch.h"
+
+extern int gBatchSize;
+extern bool gSwssRecord;
+extern bool gSairedisRecord;
+extern bool gLogRotate;
+extern ofstream gRecordOfs;
+extern string gRecordFile;
+
+extern MacAddress gMacAddress;
+extern MacAddress gVxlanMacAddress;
+
+extern sai_object_id_t gSwitchId;
+extern sai_object_id_t gVirtualRouterId;
+extern sai_object_id_t gUnderlayIfId;
+
+extern SwitchOrch *gSwitchOrch;
+extern CrmOrch *gCrmOrch;
+extern PortsOrch *gPortsOrch;
+extern RouteOrch *gRouteOrch;
+extern IntfsOrch *gIntfsOrch;
+extern NeighOrch *gNeighOrch;
+extern FdbOrch *gFdbOrch;
+extern MirrorOrch *gMirrorOrch;
+extern BufferOrch *gBufferOrch;
+extern VRFOrch *gVrfOrch;
+
+extern sai_acl_api_t *sai_acl_api;
+extern sai_switch_api_t *sai_switch_api;
+extern sai_virtual_router_api_t *sai_virtual_router_api;
+extern sai_port_api_t *sai_port_api;
+extern sai_lag_api_t *sai_lag_api;
+extern sai_vlan_api_t *sai_vlan_api;
+extern sai_bridge_api_t *sai_bridge_api;
+extern sai_router_interface_api_t *sai_router_intfs_api;
+extern sai_route_api_t *sai_route_api;
+extern sai_neighbor_api_t *sai_neighbor_api;
+extern sai_tunnel_api_t *sai_tunnel_api;
+extern sai_next_hop_api_t *sai_next_hop_api;
+extern sai_hostif_api_t *sai_hostif_api;
+extern sai_buffer_api_t *sai_buffer_api;

tests/mock_tests/mock_table.cpp

@@ -0,0 +1,74 @@
+#include "table.h"
+
+using TableDataT = std::map<std::string, std::vector<swss::FieldValueTuple>>;
+using TablesT = std::map<std::string, TableDataT>;
+
+namespace testing_db
+{
+
+    TableDataT gTableData;
+    TablesT gTables;
+    std::map<int, TablesT> gDB;
+
+    void reset()
+    {
+        gDB.clear();
+    }
+}
+
+namespace swss
+{
+
+    using namespace testing_db;
+
+    bool Table::get(const std::string &key, std::vector<FieldValueTuple> &ovalues)
+    {
+        auto table = gDB[getDbId()][getTableName()];
+        if (table.find(key) == table.end())
+        {
+            return false;
+        }
+
+        ovalues = table[key];
+        return true;
+    }
+
+    bool Table::hget(const std::string &key, const std::string &field, std::string &value)
+    {
+        auto table = gDB[getDbId()][getTableName()];
+        if (table.find(key) == table.end())
+        {
+            return false;
+        }
+
+        for (const auto &it : table[key])
+        {
+            if (it.first == field)
+            {
+                value = it.second;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void Table::set(const std::string &key,
+                    const std::vector<FieldValueTuple> &values,
+                    const std::string &op,
+                    const std::string &prefix)
+    {
+        auto &table = gDB[getDbId()][getTableName()];
+        table[key] = values;
+    }
+
+    void Table::getKeys(std::vector<std::string> &keys)
+    {
+        keys.clear();
+        auto table = gDB[getDbId()][getTableName()];
+        for (const auto &it : table)
+        {
+            keys.push_back(it.first);
+        }
+    }
+}

tests/mock_tests/mock_table.h

@@ -0,0 +1,6 @@
+#include "table.h"
+
+namespace testing_db
+{
+    void reset();
+}