Return correct error code when port is in use (sonic-net#565)

vasant17 · Vasant · web-flow · commit cd8238990431 · 2020-04-06T11:01:38.000+02:00
Co-authored-by: Vasant &lt;vapatil@linkedin.com&gt;
diff --git a/meta/Meta.cpp b/meta/Meta.cpp
@@ -2958,7 +2958,7 @@ sai_status_t Meta::meta_generic_validation_remove(
 
         SWSS_LOG_ERROR("object 0x%" PRIx64 " reference count is %d, can't remove", oid, count);
 
-        return SAI_STATUS_INVALID_PARAMETER;
+        return SAI_STATUS_OBJECT_IN_USE;
     }
 
     if (meta_key.objecttype == SAI_OBJECT_TYPE_PORT)
@@ -2987,14 +2987,6 @@ sai_status_t Meta::meta_port_remove_validation(
         return SAI_STATUS_SUCCESS;
     }
 
-    if (m_oids.getObjectReferenceCount(port_id) != 0)
-    {
-        SWSS_LOG_ERROR("port %s reference count is not zero, can't remove",
-                sai_serialize_object_id(port_id).c_str());
-
-        return SAI_STATUS_OBJECT_IN_USE;
-    }
-
     if (!meta_is_object_in_default_state(port_id))
     {
         SWSS_LOG_ERROR("port %s is not in default state, can't remove",

Original file line number	Diff line number	Diff line change
`@@ -2958,7 +2958,7 @@ sai_status_t Meta::meta_generic_validation_remove(`
`2958`	`2958`
`2959`	`2959`	`SWSS_LOG_ERROR("object 0x%" PRIx64 " reference count is %d, can't remove", oid, count);`
`2960`	`2960`
`2961`		`- return SAI_STATUS_INVALID_PARAMETER;`
	`2961`	`+ return SAI_STATUS_OBJECT_IN_USE;`
`2962`	`2962`	`}`
`2963`	`2963`
`2964`	`2964`	`if (meta_key.objecttype == SAI_OBJECT_TYPE_PORT)`
`@@ -2987,14 +2987,6 @@ sai_status_t Meta::meta_port_remove_validation(`
`2987`	`2987`	`return SAI_STATUS_SUCCESS;`
`2988`	`2988`	`}`
`2989`	`2989`
`2990`		`- if (m_oids.getObjectReferenceCount(port_id) != 0)`
`2991`		`- {`
`2992`		`- SWSS_LOG_ERROR("port %s reference count is not zero, can't remove",`
`2993`		`- sai_serialize_object_id(port_id).c_str());`
`2994`		`-`
`2995`		`- return SAI_STATUS_OBJECT_IN_USE;`
`2996`		`- }`
`2997`		`-`
`2998`	`2990`	`if (!meta_is_object_in_default_state(port_id))`
`2999`	`2991`	`{`
`3000`	`2992`	`SWSS_LOG_ERROR("port %s is not in default state, can't remove",`