Accept detailed SAI status codes in dashportmaporch.cpp (sonic-net#3770)

What I did
Check for specific SAI status codes instead of just SAI_STATUS_NOT_EXECUTED and respond accordingly

Why I did it
sonic-net/sonic-sairedis#1613 means that SAI should return accurate states codes for each entry in a bulk operation. Prior to this change, any failure in a bulk op meant the status for all objects involved was set to SAI_STATUS_NOT_EXECUTED.

Signed-off-by: Yogapriya Mohankumar <ymohanku@cisco.com>

Author: theasianpianist

orchagent/dash/dashportmaporch.cpp

@@ -464,10 +464,10 @@ bool DashPortMapOrch::addPortMapRangePost(DashPortMapRangeBulkContext &ctxt)
     sai_status_t status = *it_status++;
     if (status != SAI_STATUS_SUCCESS)
     {
-        if (status == SAI_STATUS_NOT_EXECUTED)
+        if (status == SAI_STATUS_ITEM_ALREADY_EXISTS)
         {
-            SWSS_LOG_INFO("Port map range for %s not created, will retry later", ctxt.parent_map_id.c_str());
-            return false;
+            SWSS_LOG_INFO("Port map range for %s already exists", ctxt.parent_map_id.c_str());
+            return true;
         }
         SWSS_LOG_ERROR("Failed to create port map range for %s, status: %s", ctxt.parent_map_id.c_str(), sai_serialize_status(status).c_str());
         task_process_status handle_status = handleSaiCreateStatus((sai_api_t)SAI_API_DASH_OUTBOUND_PORT_MAP, status);
@@ -523,10 +523,10 @@ bool DashPortMapOrch::removePortMapRangePost(DashPortMapRangeBulkContext &ctxt)
     sai_status_t status = *it_status++;
     if (status != SAI_STATUS_SUCCESS)
     {
-        if (status == SAI_STATUS_NOT_EXECUTED)
+        if (status == SAI_STATUS_ITEM_NOT_FOUND)
         {
-            SWSS_LOG_INFO("Port map range for %s not removed, will retry later", ctxt.parent_map_id.c_str());
-            return false;
+            SWSS_LOG_INFO("Port map range for %s already removed", ctxt.parent_map_id.c_str());
+            return true;
         }
         SWSS_LOG_ERROR("Failed to remove port map range for %s, status: %s", ctxt.parent_map_id.c_str(), sai_serialize_status(status).c_str());
         task_process_status handle_status = handleSaiCreateStatus((sai_api_t)SAI_API_DASH_OUTBOUND_PORT_MAP, status);

tests/mock_tests/dashportmaporch_ut.cpp

@@ -168,7 +168,7 @@ namespace dashportmaporch_test
         EXPECT_CALL(*mock_sai_dash_outbound_port_map_api, create_outbound_port_map_port_range_entries).Times(2);
         SetDashTable(APP_DASH_OUTBOUND_PORT_MAP_TABLE_NAME, port_map1, dash::outbound_port_map::OutboundPortMap());
         SetDashTable(APP_DASH_OUTBOUND_PORT_MAP_RANGE_TABLE_NAME, key, port_map_range);
-        SetDashTable(APP_DASH_OUTBOUND_PORT_MAP_RANGE_TABLE_NAME, key, port_map_range, true, false);
+        SetDashTable(APP_DASH_OUTBOUND_PORT_MAP_RANGE_TABLE_NAME, key, port_map_range);
     }
 
     TEST_F(DashPortMapOrchTest, RemoveNonexistPortMapRange)
@@ -179,7 +179,7 @@ namespace dashportmaporch_test
 
         EXPECT_CALL(*mock_sai_dash_outbound_port_map_api, remove_outbound_port_map_port_range_entries);
         SetDashTable(APP_DASH_OUTBOUND_PORT_MAP_TABLE_NAME, port_map1, dash::outbound_port_map::OutboundPortMap());
-        SetDashTable(APP_DASH_OUTBOUND_PORT_MAP_RANGE_TABLE_NAME, port_map_range_key, dash::outbound_port_map_range::OutboundPortMapRange(), false, false);
+        SetDashTable(APP_DASH_OUTBOUND_PORT_MAP_RANGE_TABLE_NAME, port_map_range_key, dash::outbound_port_map_range::OutboundPortMapRange(), false);
     }
 
     TEST_F(DashPortMapOrchTest, AddPortRangeWithoutPortMap)