Merge branch 'master' into set_ip_nexthop_and_disable_rewrites

Author: divyagayathri-hcl

orchagent/dash/dashorch.cpp

@@ -84,18 +84,18 @@ class DashOrch : public ZmqOrch
     void doTaskEniRouteTable(ConsumerBase &consumer);
     void doTaskRouteGroupTable(ConsumerBase &consumer);
     bool addApplianceEntry(const std::string& appliance_id, const dash::appliance::Appliance &entry);
-    void addApplianceTrustedVni(const std::string& appliance_id, const dash::appliance::Appliance& entry);
+    bool addApplianceTrustedVni(const std::string& appliance_id, const dash::appliance::Appliance& entry);
     bool removeApplianceEntry(const std::string& appliance_id);
-    void removeApplianceTrustedVni(const std::string& appliance_id, const dash::appliance::Appliance& entry);
+    bool removeApplianceTrustedVni(const std::string& appliance_id, const dash::appliance::Appliance& entry);
     bool addRoutingTypeEntry(const dash::route_type::RoutingType &routing_type, const dash::route_type::RouteType &entry);
     bool removeRoutingTypeEntry(const dash::route_type::RoutingType &routing_type);
     bool addEniObject(const std::string& eni, EniEntry& entry);
     bool addEniAddrMapEntry(const std::string& eni, const EniEntry& entry);
-    void addEniTrustedVnis(const std::string& eni, const EniEntry& entry);
+    bool addEniTrustedVnis(const std::string& eni, const EniEntry& entry);
     bool addEni(const std::string& eni, EniEntry &entry);
     bool removeEniObject(const std::string& eni);
     bool removeEniAddrMapEntry(const std::string& eni);
-    void removeEniTrustedVnis(const std::string& eni, const EniEntry& entry);
+    bool removeEniTrustedVnis(const std::string& eni, const EniEntry& entry);
     bool removeEni(const std::string& eni);
     bool setEniAdminState(const std::string& eni, const EniEntry& entry);
     bool addQosEntry(const std::string& qos_name, const dash::qos::Qos &entry);

orchagent/dash/dashorch.h

@@ -10,6 +10,22 @@ void MockOrchTest::PostSetUp() {}
 void MockOrchTest::PreTearDown() {}
 void MockOrchTest::ApplySaiMock() {}
 
+void MockOrchTest::initTestLogger(const std::string &appName, int minPrio)
+{
+    const char *syslogStdout = std::getenv("SWSS_SYSLOG_STDOUT");
+    if (syslogStdout != nullptr && std::string(syslogStdout) == "1")
+    {
+        static std::once_flag loggerInitFlag;
+
+        std::call_once(loggerInitFlag, [&appName]() {
+            swss::Logger::linkToDbNative(appName);
+        });
+
+        swss::Logger::swssOutputNotify("orchagent", "STDOUT");
+        swss::Logger::setMinPrio(static_cast<swss::Logger::Priority>(minPrio));
+    }
+}
+
 void MockOrchTest::PrepareSai()
 {
     sai_attribute_t attr;
@@ -61,6 +77,8 @@ void MockOrchTest::PrepareSai()
 
 void MockOrchTest::SetUp()
 {
+    initTestLogger();
+
     map<string, string> profile = {
         { "SAI_VS_SWITCH_TYPE", "SAI_VS_SWITCH_TYPE_BCM56850" },
         { "KV_DEVICE_MAC_ADDRESS", "20:03:04:05:06:00" }

orchagent/p4orch/route_manager.cpp

@@ -69,5 +69,6 @@ namespace mock_orch_test
         virtual void PostSetUp();
         virtual void PreTearDown();
         virtual void ApplySaiMock();
+        void initTestLogger(const std::string &appName = "mock_tests", int minPrio = swss::Logger::SWSS_INFO);
     };
 }

orchagent/p4orch/tests/route_manager_test.cpp

@@ -6,6 +6,11 @@ namespace swss
         ConsumerTableBase(db, tableName, popBatchSize, pri),
 	m_table(db, tableName)
     {
+        m_keyspace = "__keyspace@";
+
+        m_keyspace += std::to_string(db->getDbId()) + "__:" + tableName + m_table.getTableNameSeparator() + "*";
+
+        psubscribe(m_db, m_keyspace);
     }
 
     void SubscriberStateTable::pops(std::deque<KeyOpFieldsValuesTuple> &vkco, const std::string& /*prefix*/)