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

Author: divyagayathri-hcl

fpmsyncd/fpmsyncd.cpp

@@ -318,11 +318,6 @@ int main(int argc, char **argv)
         {
             cout << "Connection lost, reconnecting..." << endl;
         }
-        catch (const exception& e)
-        {
-            cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
-            return 0;
-        }
     }
 
     return 1;
@@ -358,4 +353,4 @@ void flushPipeline(RedisPipeline& pipeline) {
         // by doing this, we make sure every entry eventually gets flushed
         gSelectTimeout = gFlushTimeout - idle;
     }
-}
+}

fpmsyncd/routesync.cpp

@@ -2529,6 +2529,14 @@ void RouteSync::onRouteResponse(const std::string& key, const std::vector<FieldV
         return;
     }
 
+    // When a route is programmed without FRR knowledge protocol will be empty.
+    if (protocol.empty())
+    {
+        SWSS_LOG_NOTICE("Received response for prefix %s(%s) without protol, ignoring ",
+            prefix.to_string().c_str(), vrfName.c_str());
+        return;
+    }
+
     auto routeObject = makeUniqueWithDestructor(rtnl_route_alloc(), rtnl_route_put);
     auto dstAddr = makeNlAddr(prefix);
 

orchagent/Makefile.am

@@ -103,6 +103,7 @@ orchagent_SOURCES = \
             macsecorch.cpp \
             lagid.cpp \
             bfdorch.cpp \
+            icmporch.cpp \
             srv6orch.cpp \
             response_publisher.cpp \
             nvgreorch.cpp \

orchagent/dash/dashhaorch.cpp

@@ -236,7 +236,7 @@ bool DashHaOrch::addHaScopeEntry(const std::string &key, const dash::ha_scope::H
     }
     sai_object_id_t ha_set_oid = ha_set_it->second.ha_set_id;
 
-    uint32_t attr_count = 2;
+    const uint32_t attr_count = 2;
     sai_attribute_t ha_scope_attrs[attr_count]={};
     sai_status_t status;
     sai_object_id_t sai_ha_scope_oid = 0UL;

orchagent/flex_counter/flex_counter_manager.cpp

@@ -50,6 +50,7 @@ const unordered_map<CounterType, string> FlexCounterManager::counter_id_field_lo
     { CounterType::HOSTIF_TRAP,     FLOW_COUNTER_ID_LIST },
     { CounterType::ROUTE,           FLOW_COUNTER_ID_LIST },
     { CounterType::ENI,             ENI_COUNTER_ID_LIST },
+    { CounterType::SRV6,            SRV6_COUNTER_ID_LIST },
 };
 
 FlexManagerDirectory g_FlexManagerDirectory;

orchagent/flex_counter/flex_counter_manager.h

@@ -38,7 +38,8 @@ enum class CounterType
     TUNNEL,
     HOSTIF_TRAP,
     ROUTE,
-    ENI
+    ENI,
+    SRV6
 };
 
 extern bool gTraditionalFlexCounter;

orchagent/flexcounterorch.cpp

@@ -27,6 +27,7 @@ extern BufferOrch *gBufferOrch;
 extern Directory<Orch*> gDirectory;
 extern CoppOrch *gCoppOrch;
 extern FlowCounterRouteOrch *gFlowCounterRouteOrch;
+extern Srv6Orch *gSrv6Orch;
 extern sai_object_id_t gSwitchId;
 
 #define FLEX_COUNTER_DELAY_SEC 60
@@ -46,6 +47,7 @@ extern sai_object_id_t gSwitchId;
 #define ENI_KEY                     "ENI"
 #define WRED_QUEUE_KEY              "WRED_ECN_QUEUE"
 #define WRED_PORT_KEY               "WRED_ECN_PORT"
+#define SRV6_KEY                    "SRV6"
 
 unordered_map<string, string> flexCounterGroupMap =
 {
@@ -71,6 +73,7 @@ unordered_map<string, string> flexCounterGroupMap =
     {"ENI", ENI_STAT_COUNTER_FLEX_COUNTER_GROUP},
     {"WRED_ECN_PORT", WRED_PORT_STAT_COUNTER_FLEX_COUNTER_GROUP},
     {"WRED_ECN_QUEUE", WRED_QUEUE_STAT_COUNTER_FLEX_COUNTER_GROUP},
+    {SRV6_KEY, SRV6_STAT_COUNTER_FLEX_COUNTER_GROUP},
 };
 
 
@@ -270,6 +273,10 @@ void FlexCounterOrch::doTask(Consumer &consumer)
                             m_route_flow_counter_enabled = false;
                         }
                     }
+                    if (gSrv6Orch && (key == SRV6_KEY))
+                    {
+                        gSrv6Orch->setCountersState((value == "enable"));
+                    }
 
                     gPortsOrch->flushCounters();
                     setFlexCounterGroupOperation(flexCounterGroupMap[key], value);