Merge branch 'master' of https://github.com/divyagayathri-hcl/sonic-swss into pytest_skip

Author: divyagayathri-hcl

cfgmgr/macsecmgr.cpp

@@ -503,14 +503,11 @@ task_process_status MACsecMgr::enableMACsec(
         return task_need_retry;
     }
 
-    // Create MKA Session object
-    auto port = m_macsec_ports.emplace(
-        std::piecewise_construct,
-        std::make_tuple(port_name),
-        std::make_tuple());
-    if (!port.second)
+    // Handle existing macsec profile
+    auto port_itr = m_macsec_ports.find(port_name);
+    if (port_itr != m_macsec_ports.end())
     {
-        if (port.first->second.profile_name == profile_name)
+        if (port_itr->second.profile_name == profile_name)
         {
             SWSS_LOG_NOTICE(
                 "The MACsec profile '%s' on the port '%s' has been loaded",
@@ -523,7 +520,7 @@ task_process_status MACsecMgr::enableMACsec(
             SWSS_LOG_NOTICE(
                 "The MACsec profile '%s' on the port '%s' "
                 "will be replaced by the MACsec profile '%s'",
-                port.first->second.profile_name.c_str(),
+                port_itr->second.profile_name.c_str(),
                 port_name.c_str(),
                 profile_name.c_str());
             auto result = disableMACsec(port_name, port_attr);
@@ -533,6 +530,11 @@ task_process_status MACsecMgr::enableMACsec(
             }
         }
     }
+    // Create MKA Session object
+    auto port = m_macsec_ports.emplace(
+        std::piecewise_construct,
+        std::make_tuple(port_name),
+        std::make_tuple());
     auto & session = port.first->second;
     session.profile_name = profile_name;
     ostringstream ostream;

fpmsyncd/routesync.cpp

@@ -1636,6 +1636,9 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf)
     {
         sendOffloadReply(route_obj);
     }
+    auto proto_num = rtnl_route_get_protocol(route_obj);
+    auto proto_str = getProtocolString(proto_num);
+    FieldValueTuple proto("protocol", proto_str);
 
     switch (rtnl_route_get_type(route_obj))
     {
@@ -1644,6 +1647,7 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf)
             vector<FieldValueTuple> fvVector;
             FieldValueTuple fv("blackhole", "true");
             fvVector.push_back(fv);
+            fvVector.push_back(proto);
             m_routeTable.set(destipprefix, fvVector);
             return;
         }
@@ -1699,9 +1703,6 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf)
             installNextHopGroup(nhg_id);
         }
 
-        auto proto_num = rtnl_route_get_protocol(route_obj);
-        auto proto_str = getProtocolString(proto_num);
-        FieldValueTuple proto("protocol", proto_str);
         fvVector.push_back(proto);
 
     }
@@ -1766,11 +1767,7 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf)
             }
         }
 
-        auto proto_num = rtnl_route_get_protocol(route_obj);
-        auto proto_str = getProtocolString(proto_num);
-
 
-        FieldValueTuple proto("protocol", proto_str);
         FieldValueTuple gw("nexthop", gw_list);
         FieldValueTuple intf("ifname", intf_list);
 
@@ -1983,13 +1980,18 @@ void RouteSync::onLabelRouteMsg(int nlmsg_type, struct nl_object *obj)
         return;
     }
 
+    auto proto_num = rtnl_route_get_protocol(route_obj);
+    auto proto_str = getProtocolString(proto_num);
+    FieldValueTuple proto("protocol", proto_str);
+
     switch (rtnl_route_get_type(route_obj))
     {
         case RTN_BLACKHOLE:
         {
             vector<FieldValueTuple> fvVector;
             FieldValueTuple fv("blackhole", "true");
             fvVector.push_back(fv);
+            fvVector.push_back(proto);
             m_label_routeTable.set(destaddr, fvVector);
             return;
         }
@@ -2745,4 +2747,4 @@ void RouteSync::getNextHopGroupFields(const NextHopGroup& nhg, string& nexthops,
             ++i;
         }
     }
-}
+}

tests/mock_tests/fpmsyncd/test_routesync.cpp

@@ -905,6 +905,62 @@ TEST_F(FpmSyncdResponseTest, TestRouteMsgWithNHG)
     rtnl_route_put(test_route);
 }
 
+TEST_F(FpmSyncdResponseTest, TestBlackholeRoute)
+{
+    Table route_table(m_db.get(), APP_ROUTE_TABLE_NAME);
+    Table label_route_table(m_db.get(), APP_LABEL_ROUTE_TABLE_NAME);
+    auto createRoute = [](const char* prefix, uint8_t prefixlen) -> rtnl_route* {
+        rtnl_route* route = rtnl_route_alloc();
+        nl_addr* dst_addr;
+        nl_addr_parse(prefix, AF_INET, &dst_addr);
+        rtnl_route_set_dst(route, dst_addr);
+        rtnl_route_set_type(route, RTN_BLACKHOLE);
+        rtnl_route_set_protocol(route, RTPROT_STATIC);
+        rtnl_route_set_family(route, AF_INET);
+        rtnl_route_set_scope(route, RT_SCOPE_UNIVERSE);
+        rtnl_route_set_table(route, RT_TABLE_UNSPEC);
+        nl_addr_put(dst_addr);
+        return route;
+    };
+
+    // create a route
+    const char* test_destipprefix = "10.1.1.0";
+    rtnl_route* test_route = createRoute(test_destipprefix, 24);
+
+    const char* test_destipprefix2 = "20.1.1.0";
+    rtnl_route* test_route2 = createRoute(test_destipprefix2, 24);
+    {
+
+        m_mockRouteSync.onRouteMsg(RTM_NEWROUTE, (nl_object*)test_route, nullptr);
+
+        // verify the blackhole route has protocol programmed
+        vector<FieldValueTuple> fvs;
+        EXPECT_TRUE(route_table.get(test_destipprefix, fvs));
+
+        bool proto_found = false;
+        for (const auto& fv : fvs) {
+            if (fvField(fv) == "protocol") {
+                proto_found = true;
+                EXPECT_EQ(fvValue(fv), "static");
+            }
+        }
+        EXPECT_TRUE(proto_found);
+
+        m_mockRouteSync.onLabelRouteMsg(RTM_NEWROUTE, (nl_object*)test_route2);
+
+        // verify the blackhole route has protocol programmed
+        EXPECT_TRUE(label_route_table.get(test_destipprefix2, fvs));
+
+        proto_found = false;
+        for (const auto& fv : fvs) {
+            if (fvField(fv) == "protocol") {
+                proto_found = true;
+                EXPECT_EQ(fvValue(fv), "static");
+            }
+        }
+        EXPECT_TRUE(proto_found);
+    }
+}
 auto create_nl_addr(const char* addr_str)
 {
     nl_addr* addr;