From f7a6dfa22bca6dfb90b82e0835a59f6a4f1b269b Mon Sep 17 00:00:00 2001 From: Nikola Dancejic Date: Tue, 7 Mar 2023 23:50:22 +0000 Subject: [PATCH] fixing merge issues Signed-off-by: Nikola Dancejic --- orchagent/routeorch.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp index f4b92e60aed..c9611411cda 100644 --- a/orchagent/routeorch.cpp +++ b/orchagent/routeorch.cpp @@ -2284,7 +2284,7 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey ipPrefix.to_string().c_str(), nextHops.to_string().c_str()); } - m_syncdRoutes[vrf_id][ipPrefix] = nextHops; + m_syncdRoutes[vrf_id][ipPrefix] = RouteNhg(nextHops, ctx.nhg_index); MuxOrch* mux_orch = gDirectory.get(); if (ctx.nhg_index.empty() && nextHops.getSize() == 1 && !nextHops.is_overlay_nexthop() && !nextHops.is_srv6_nexthop()) @@ -2295,7 +2295,8 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey { addNextHopRoute(nexthop, r_key); } - } else if (mux_orch->isMuxNexthops(nextHops)) + } + else if (mux_orch->isMuxNexthops(nextHops)) { RouteKey routekey = { vrf_id, ipPrefix }; auto nexthop_list = nextHops.getNextHops(); @@ -2320,8 +2321,6 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey gFlowCounterRouteOrch->handleRouteAdd(vrf_id, ipPrefix); } - m_syncdRoutes[vrf_id][ipPrefix] = RouteNhg(nextHops, ctx.nhg_index); - notifyNextHopChangeObservers(vrf_id, ipPrefix, nextHops, true); /* Publish and update APPL STATE DB route entry programming status */