From df96059aba319410f60d752eff6211f3ba5cb347 Mon Sep 17 00:00:00 2001 From: minionatwork <60480922+minionatwork@users.noreply.github.com> Date: Thu, 5 Aug 2021 11:31:00 -0700 Subject: [PATCH] VOQ: Nexthop for remote VOQ LC should be created on inband OIF. (#1823) VOQ nexthop for remote neighbors should be created on local inband port only for the kernel purpose. SAI should use actual RIF of the remote system port interface. #1686 seems to be break this condition and this change address it. --- orchagent/neighorch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp index f792c24621d9..e3f9a4175e97 100644 --- a/orchagent/neighorch.cpp +++ b/orchagent/neighorch.cpp @@ -191,7 +191,7 @@ bool NeighOrch::addNextHop(const NextHopKey &nh) } NextHopKey nexthop(nh); - if (m_intfsOrch->isRemoteSystemPortIntf(nexthop.alias)) + if (m_intfsOrch->isRemoteSystemPortIntf(nh.alias)) { //For remote system ports kernel nexthops are always on inband. Change the key Port inbp; @@ -202,7 +202,7 @@ bool NeighOrch::addNextHop(const NextHopKey &nh) } assert(!hasNextHop(nexthop)); - sai_object_id_t rif_id = m_intfsOrch->getRouterIntfsId(nexthop.alias); + sai_object_id_t rif_id = m_intfsOrch->getRouterIntfsId(nh.alias); vector next_hop_attrs;