Merge pull request sonic-net#1 from vasant17/PORT_ACL_ATTR_WORKAROUND

Do NOT set SAI_OBJECT_NULL_ID as a value to SAI_PORT_ATTR_INGRESS_ACL

Author: zhenggen-xu

meta/sai_meta.cpp

@@ -6044,15 +6044,43 @@ sai_status_t meta_sai_set_oid(
         return SAI_STATUS_FAILURE;
     }
 
-    status = set(object_type, object_id, attr);
+    // Temporary code start
+    // Remove this code once SAI_NULL_OBJECT_ID
+    // as value to SAI_PORT_ATTR_INGRESS_ACL is handled in Broadcom
+    // SAI SDK
+    //
+    auto mdp = sai_metadata_get_attr_metadata(meta_key.objecttype, attr->id);
 
-    if (status == SAI_STATUS_SUCCESS)
+    if (mdp == NULL)
     {
-        SWSS_LOG_DEBUG("set status: %s", sai_serialize_status(status).c_str());
+        SWSS_LOG_ERROR("unable to find attribute metadata %d:%d", meta_key.objecttype, attr->id);
+
+        return SAI_STATUS_FAILURE;
     }
+
+    const sai_attribute_value_t& value = attr->value;
+
+    const sai_attr_metadata_t& md = *mdp;
+
+    if (SAI_PORT_ATTR_INGRESS_ACL == md.attrid &&
+        SAI_NULL_OBJECT_ID == value.oid)
+    {
+        // Do nothing.
+        SWSS_LOG_NOTICE("Ignoring %s attribute set with NULL object ID", md->attridname);
+    }
+    // Temporary code end.
     else
     {
-        SWSS_LOG_ERROR("set status: %s", sai_serialize_status(status).c_str());
+        status = set(object_type, object_id, attr);
+
+        if (status == SAI_STATUS_SUCCESS)
+        {
+            SWSS_LOG_DEBUG("set status: %s", sai_serialize_status(status).c_str());
+        }
+        else
+        {
+            SWSS_LOG_ERROR("set status: %s", sai_serialize_status(status).c_str());
+        }
     }
 
     if (status == SAI_STATUS_SUCCESS)