Change some error code to SAI_STATUS_ITEM_ALREADY_EXISTS (sonic-net#99)

Shuotian Cheng · web-flow · commit 3f61a44ff3b3 · 2016-10-24T16:59:03.000-07:00
diff --git a/meta/sai_meta.cpp b/meta/sai_meta.cpp
@@ -1415,7 +1415,7 @@ sai_status_t meta_generic_validation_create(
                 {
                     SWSS_LOG_ERROR("object key %s already exists", key.c_str());
 
-                    return SAI_STATUS_INVALID_PARAMETER;
+                    return SAI_STATUS_ITEM_ALREADY_EXISTS;
                 }
 
                 break;
@@ -3371,7 +3371,7 @@ sai_status_t meta_sai_validate_fdb_entry(
         {
             SWSS_LOG_ERROR("object key %s already exists", key_fdb.c_str());
 
-            return SAI_STATUS_INVALID_PARAMETER;
+            return SAI_STATUS_ITEM_ALREADY_EXISTS;
         }
 
         return SAI_STATUS_SUCCESS;
@@ -3666,7 +3666,7 @@ sai_status_t meta_sai_validate_neighbor_entry(
         {
             SWSS_LOG_ERROR("object key %s already exists", key_neighbor.c_str());
 
-            return SAI_STATUS_INVALID_PARAMETER;
+            return SAI_STATUS_ITEM_ALREADY_EXISTS;
         }
 
         return SAI_STATUS_SUCCESS;
@@ -3908,7 +3908,7 @@ sai_status_t meta_sai_validate_vlan_id(
         {
             SWSS_LOG_ERROR("object key %s already exists", key_vlan.c_str());
 
-            return SAI_STATUS_INVALID_PARAMETER;
+            return SAI_STATUS_ITEM_ALREADY_EXISTS;
         }
 
         return SAI_STATUS_SUCCESS;
@@ -4218,7 +4218,7 @@ sai_status_t meta_sai_validate_route_entry(
         {
             SWSS_LOG_ERROR("object key %s already exists", key_route.c_str());
 
-            return SAI_STATUS_INVALID_PARAMETER;
+            return SAI_STATUS_ITEM_ALREADY_EXISTS;
         }
 
         return SAI_STATUS_SUCCESS;

Original file line number	Diff line number	Diff line change
`@@ -1415,7 +1415,7 @@ sai_status_t meta_generic_validation_create(`
`1415`	`1415`	`{`
`1416`	`1416`	`SWSS_LOG_ERROR("object key %s already exists", key.c_str());`
`1417`	`1417`
`1418`		`- return SAI_STATUS_INVALID_PARAMETER;`
	`1418`	`+ return SAI_STATUS_ITEM_ALREADY_EXISTS;`
`1419`	`1419`	`}`
`1420`	`1420`
`1421`	`1421`	`break;`
`@@ -3371,7 +3371,7 @@ sai_status_t meta_sai_validate_fdb_entry(`
`3371`	`3371`	`{`
`3372`	`3372`	`SWSS_LOG_ERROR("object key %s already exists", key_fdb.c_str());`
`3373`	`3373`
`3374`		`- return SAI_STATUS_INVALID_PARAMETER;`
	`3374`	`+ return SAI_STATUS_ITEM_ALREADY_EXISTS;`
`3375`	`3375`	`}`
`3376`	`3376`
`3377`	`3377`	`return SAI_STATUS_SUCCESS;`
`@@ -3666,7 +3666,7 @@ sai_status_t meta_sai_validate_neighbor_entry(`
`3666`	`3666`	`{`
`3667`	`3667`	`SWSS_LOG_ERROR("object key %s already exists", key_neighbor.c_str());`
`3668`	`3668`
`3669`		`- return SAI_STATUS_INVALID_PARAMETER;`
	`3669`	`+ return SAI_STATUS_ITEM_ALREADY_EXISTS;`
`3670`	`3670`	`}`
`3671`	`3671`
`3672`	`3672`	`return SAI_STATUS_SUCCESS;`
`@@ -3908,7 +3908,7 @@ sai_status_t meta_sai_validate_vlan_id(`
`3908`	`3908`	`{`
`3909`	`3909`	`SWSS_LOG_ERROR("object key %s already exists", key_vlan.c_str());`
`3910`	`3910`
`3911`		`- return SAI_STATUS_INVALID_PARAMETER;`
	`3911`	`+ return SAI_STATUS_ITEM_ALREADY_EXISTS;`
`3912`	`3912`	`}`
`3913`	`3913`
`3914`	`3914`	`return SAI_STATUS_SUCCESS;`
`@@ -4218,7 +4218,7 @@ sai_status_t meta_sai_validate_route_entry(`
`4218`	`4218`	`{`
`4219`	`4219`	`SWSS_LOG_ERROR("object key %s already exists", key_route.c_str());`
`4220`	`4220`
`4221`		`- return SAI_STATUS_INVALID_PARAMETER;`
	`4221`	`+ return SAI_STATUS_ITEM_ALREADY_EXISTS;`
`4222`	`4222`	`}`
`4223`	`4223`
`4224`	`4224`	`return SAI_STATUS_SUCCESS;`