[UTC][ITC][Non-ACR] Fix use of ml_service_model_delete

- Remove usage of ml_service_model_delete on "active" model:
  The policy on how to deal with the "active" model could be changed in
  future

Change-Id: Ib4eeb4816a4f1556f234aadd2d5377f04e8b8efd
Signed-off-by: Yongjoo Ahn <yongjoo1.ahn@samsung.com>

diff --git a/src/itc/nnstreamer/ITs-nnstreamer-ml-service.c b/src/itc/nnstreamer/ITs-nnstreamer-ml-service.c
index c1c69426afbaff94244a919ce400192426df50d9..a91a2718ab52a34b410b23280f1d60bb8148f9a4 100755 (executable)
--- a/src/itc/nnstreamer/ITs-nnstreamer-ml-service.c
+++ b/src/itc/nnstreamer/ITs-nnstreamer-ml-service.c
@@ -666,8 +666,8 @@ int ITc_nnstreamer_ml_service_model_register_update_description_delete_p(void)
        ML_SERVICE_FEATURE_CHECK;
        PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_update_description", NnStreamerGetError(nRetVal), ml_service_model_delete(key, version));
 
-       // delete the active model
-       nRetVal = ml_service_model_delete(key, version);
+       // delete all models with the key
+       nRetVal = ml_service_model_delete(key, 0U);
        PRINT_RESULT(ML_ERROR_NONE, nRetVal, "ml_service_model_delete", NnStreamerGetError(nRetVal));
        return 0;
 }
@@ -715,45 +715,44 @@ int ITc_nnstreamer_ml_service_model_get_getactivated_optionget_p(void)
 
        // update the model description
        nRetVal = ml_service_model_update_description (key, version, "This is updated description for the mobilenet v1 tflite model.");
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_update_description", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 1U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_update_description", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 0U));
 
        nRetVal = ml_service_model_register (key, g_TestModel_add, false, "this is temp model", &version);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_register", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 1U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_register", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 0U));
        FPRINTF("[Line : %d][%s] version value is [%d]\\n", __LINE__, API_NAMESPACE, version);
        if(version != 2U)
        {
                FPRINTF("[Line : %d][%s] version value mismatched\\n", __LINE__, API_NAMESPACE);
-               ml_service_model_delete(key, 1U);
+               ml_service_model_delete(key, 0U);
                return 1;
        }
 
-       // Activate the model
+       // Get the Activated model
        ml_option_h activated_model_info;
        nRetVal = ml_service_model_get_activated (key, &activated_model_info);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_get_activated", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 1U);ml_service_model_delete(key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_get_activated", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 0U));
 
        // Get the model path value
        nRetVal = ml_option_get (activated_model_info, "path", (void **) &getPathVal);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_get", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 1U);ml_service_model_delete(key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_get", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 0U));
 
        if(strcmp(g_TestModel, getPathVal) != 0)
        {
                FPRINTF("[Line : %d][%s] Path value mismatched, Path1: [%s] and path2: [%s] \\n", __LINE__, API_NAMESPACE, g_TestModel, getPathVal);
                ml_option_destroy (activated_model_info);
-               ml_service_model_delete(key, 1U);
-               ml_service_model_delete(key, 2U);
+               ml_service_model_delete(key, 0U);
                return 1;
        }
 
-    nRetVal = ml_option_destroy (activated_model_info);
+       nRetVal = ml_option_destroy (activated_model_info);
        PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_destroy", NnStreamerGetError(nRetVal), ml_service_model_delete(key, 1U);ml_service_model_delete(key, 2U));
 
        ml_option_h temp_model_info;
        nRetVal = ml_service_model_get (key, 2U, &temp_model_info);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_get", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 1U); ml_service_model_delete (key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_get", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 0U));
 
        nRetVal = ml_option_get (temp_model_info, "path", (void **) &getPathVal);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_get", NnStreamerGetError(nRetVal), ml_option_destroy (temp_model_info); ml_service_model_delete (key, 1U); ml_service_model_delete (key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_get", NnStreamerGetError(nRetVal), ml_option_destroy (temp_model_info); ml_service_model_delete (key, 0U));
 
        if( strcmp(g_TestModel_add, getPathVal) != 0)
        {
@@ -765,10 +764,10 @@ int ITc_nnstreamer_ml_service_model_get_getactivated_optionget_p(void)
        }
 
        nRetVal = ml_option_destroy (temp_model_info);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_destroy", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 1U); ml_service_model_delete (key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_destroy", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 0U));
 
        nRetVal = ml_service_model_delete (key, 1U);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_delete", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_delete", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 0U));
 
        nRetVal = ml_service_model_delete (key, 2U);
        PRINT_RESULT(ML_ERROR_NONE, nRetVal, "ml_service_model_delete", NnStreamerGetError(nRetVal));
@@ -952,29 +951,26 @@ int ITc_nnstreamer_ml_service_model_getall_activate_p(void)
                        info_list = NULL;
        }
 
-       nRetVal = ml_service_model_delete(key, 1U);
-       PRINT_RESULT(ML_ERROR_NONE, nRetVal, "ml_service_model_delete", NnStreamerGetError(nRetVal));
-
        nRetVal = ml_service_model_activate (key, 2U);
        PRINT_RESULT(ML_ERROR_NONE, nRetVal, "ml_service_model_activate", NnStreamerGetError(nRetVal));
 
        nRetVal = ml_service_model_get_activated (key, &activated_model_info);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_get_activated", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_service_model_get_activated", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 0U));
 
        nRetVal = ml_option_get (activated_model_info, "path", (gpointer *) &getPathVal);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_get", NnStreamerGetError(nRetVal), ml_option_destroy (activated_model_info); ml_service_model_delete (key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_get", NnStreamerGetError(nRetVal), ml_option_destroy (activated_model_info); ml_service_model_delete (key, 0U));
        if( strcmp(g_TestModel_add, getPathVal) != 0)
        {
                FPRINTF("[Line : %d][%s] Path value mismatched, Path1: [%s] and path2: [%s] \\n", __LINE__, API_NAMESPACE, g_TestModel_add, getPathVal);
                ml_option_destroy (activated_model_info);
-               ml_service_model_delete (key, 2U);
+               ml_service_model_delete (key, 0U);
                return 1;
        }
 
        nRetVal = ml_option_destroy (activated_model_info);
-       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_destroy", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 2U));
+       PRINT_RESULT_CLEANUP(ML_ERROR_NONE, nRetVal, "ml_option_destroy", NnStreamerGetError(nRetVal), ml_service_model_delete (key, 0U));
 
-       nRetVal = ml_service_model_delete (key, 2U);
+       nRetVal = ml_service_model_delete (key, 0U);
        PRINT_RESULT(ML_ERROR_NONE, nRetVal, "ml_service_model_delete", NnStreamerGetError(nRetVal));
        return 0;
 }
\ No newline at end of file

diff --git a/src/utc/nnstreamer/utc-machine-learning-service.c b/src/utc/nnstreamer/utc-machine-learning-service.c
index edd9c80931d3d57e92e2daa5fdbbe3d727fc620b..9aa5ee0bcdf60d86cdd73ad115c1f80cf8cf0c1d 100644 (file)
--- a/src/utc/nnstreamer/utc-machine-learning-service.c
+++ b/src/utc/nnstreamer/utc-machine-learning-service.c
@@ -815,14 +815,6 @@ int utc_ml_service_model_scenario_p1 (void)
 
   g_free (info_list);
 
-  /* delete the active model */
-  status = ml_service_model_delete (key, 1U);
-  assert_eq (ML_ERROR_NONE, status);
-
-  /* no active model */
-  status = ml_service_model_get_activated (key, &activated_model_info);
-  assert_eq (ML_ERROR_INVALID_PARAMETER, status);
-
   status = ml_service_model_activate (key, 91243U);
   assert_eq (ML_ERROR_INVALID_PARAMETER, status);
 
@@ -839,12 +831,9 @@ int utc_ml_service_model_scenario_p1 (void)
   status = ml_option_destroy (activated_model_info);
   assert_eq (ML_ERROR_NONE, status);
 
-  status = ml_service_model_delete (key, 2U);
+  status = ml_service_model_delete (key, 0U);
   assert_eq (ML_ERROR_NONE, status);
 
-  status = ml_service_model_delete (key, 1U);
-  assert_eq (ML_ERROR_INVALID_PARAMETER, status);
-
   return 0;
 }