Fix neighbor doesn't update all attribute (sonic-net#2577)

iris00522 · web-flow · commit 4395cea1887f · 2023-01-03T13:42:14.000-08:00
* Fix neighbor doesn't update all attribute
diff --git a/orchagent/neighorch.cpp b/orchagent/neighorch.cpp
@@ -912,15 +912,18 @@ bool NeighOrch::addNeighbor(const NeighborEntry &neighborEntry, const MacAddress
     }
     else if (isHwConfigured(neighborEntry))
     {
-        status = sai_neighbor_api->set_neighbor_entry_attribute(&neighbor_entry, &neighbor_attr);
-        if (status != SAI_STATUS_SUCCESS)
+        for (auto itr : neighbor_attrs)
         {
-            SWSS_LOG_ERROR("Failed to update neighbor %s on %s, rv:%d",
-                           macAddress.to_string().c_str(), alias.c_str(), status);
-            task_process_status handle_status = handleSaiSetStatus(SAI_API_NEIGHBOR, status);
-            if (handle_status != task_success)
+            status = sai_neighbor_api->set_neighbor_entry_attribute(&neighbor_entry, &itr);
+            if (status != SAI_STATUS_SUCCESS)
             {
-                return parseHandleSaiStatusFailure(handle_status);
+                SWSS_LOG_ERROR("Failed to update neighbor %s on %s, attr.id=0x%x, rv:%d",
+                               macAddress.to_string().c_str(), alias.c_str(), itr.id, status);
+                task_process_status handle_status = handleSaiSetStatus(SAI_API_NEIGHBOR, status);
+                if (handle_status != task_success)
+                {
+                    return parseHandleSaiStatusFailure(handle_status);
+                }
             }
         }
         SWSS_LOG_NOTICE("Updated neighbor %s on %s", macAddress.to_string().c_str(), alias.c_str());

Original file line number	Diff line number	Diff line change
`@@ -912,15 +912,18 @@ bool NeighOrch::addNeighbor(const NeighborEntry &neighborEntry, const MacAddress`
`912`	`912`	`}`
`913`	`913`	`else if (isHwConfigured(neighborEntry))`
`914`	`914`	`{`
`915`		`- status = sai_neighbor_api->set_neighbor_entry_attribute(&neighbor_entry, &neighbor_attr);`
`916`		`- if (status != SAI_STATUS_SUCCESS)`
	`915`	`+ for (auto itr : neighbor_attrs)`
`917`	`916`	`{`
`918`		`- SWSS_LOG_ERROR("Failed to update neighbor %s on %s, rv:%d",`
`919`		`- macAddress.to_string().c_str(), alias.c_str(), status);`
`920`		`- task_process_status handle_status = handleSaiSetStatus(SAI_API_NEIGHBOR, status);`
`921`		`- if (handle_status != task_success)`
	`917`	`+ status = sai_neighbor_api->set_neighbor_entry_attribute(&neighbor_entry, &itr);`
	`918`	`+ if (status != SAI_STATUS_SUCCESS)`
`922`	`919`	`{`
`923`		`- return parseHandleSaiStatusFailure(handle_status);`
	`920`	`+ SWSS_LOG_ERROR("Failed to update neighbor %s on %s, attr.id=0x%x, rv:%d",`
	`921`	`+ macAddress.to_string().c_str(), alias.c_str(), itr.id, status);`
	`922`	`+ task_process_status handle_status = handleSaiSetStatus(SAI_API_NEIGHBOR, status);`
	`923`	`+ if (handle_status != task_success)`
	`924`	`+ {`
	`925`	`+ return parseHandleSaiStatusFailure(handle_status);`
	`926`	`+ }`
`924`	`927`	`}`
`925`	`928`	`}`
`926`	`929`	`SWSS_LOG_NOTICE("Updated neighbor %s on %s", macAddress.to_string().c_str(), alias.c_str());`