VOQ: Nexthop for remote VOQ LC should be created on inband OIF. (#1823)

minionatwork · web-flow · commit df96059aba31 · 2021-08-05T11:31:00.000-07:00
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.
diff --git 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<sai_attribute_t> next_hop_attrs;
 

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ bool NeighOrch::addNextHop(const NextHopKey &nh)`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`NextHopKey nexthop(nh);`
`194`		`- if (m_intfsOrch->isRemoteSystemPortIntf(nexthop.alias))`
	`194`	`+ if (m_intfsOrch->isRemoteSystemPortIntf(nh.alias))`
`195`	`195`	`{`
`196`	`196`	`//For remote system ports kernel nexthops are always on inband. Change the key`
`197`	`197`	`Port inbp;`
`@@ -202,7 +202,7 @@ bool NeighOrch::addNextHop(const NextHopKey &nh)`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`assert(!hasNextHop(nexthop));`
`205`		`- sai_object_id_t rif_id = m_intfsOrch->getRouterIntfsId(nexthop.alias);`
	`205`	`+ sai_object_id_t rif_id = m_intfsOrch->getRouterIntfsId(nh.alias);`
`206`	`206`
`207`	`207`	`vector<sai_attribute_t> next_hop_attrs;`
`208`	`208`