clean code: remove unused codes with storage status and metadata

Signed-off-by: Nlifeng68 <lifeng68@huawei.com>

src/image/image.c

@@ -60,8 +60,6 @@ static const struct bim_ops g_embedded_ops = {
     .resolve_image_name = embedded_resolve_image_name,
     .container_fs_usage = embedded_filesystem_usage,
     .get_filesystem_info = NULL,
-    .get_storage_status = NULL,
-    .get_storage_metadata = NULL,
     .image_status = NULL,
     .load_image = embedded_load_image,
     .pull_image = NULL,
@@ -95,8 +93,6 @@ static const struct bim_ops g_oci_ops = {
     .resolve_image_name = oci_resolve_image_name,
     .container_fs_usage = oci_container_filesystem_usage,
     .get_filesystem_info = oci_get_filesystem_info,
-    .get_storage_status = oci_get_storage_status,
-    .get_storage_metadata = oci_get_storage_metadata,
     .image_status = oci_status_image,
     .load_image = oci_load_image,
     .pull_image = oci_pull_rf,
@@ -130,8 +126,6 @@ static const struct bim_ops g_ext_ops = {
     .container_fs_usage = ext_filesystem_usage,
     .image_status = NULL,
     .get_filesystem_info = NULL,
-    .get_storage_status = NULL,
-    .get_storage_metadata = NULL,
     .load_image = ext_load_image,
     .pull_image = NULL,
     .login = ext_login,
@@ -293,66 +287,6 @@ out:
     return ret;
 }
 
-int im_get_storage_status(const char *image_type, im_storage_status_response **response)
-{
-    int ret = -1;
-    const struct bim_type *q = NULL;
-
-    if (image_type == NULL) {
-        ERROR("Image type is required");
-        goto out;
-    }
-    q = get_bim_by_type(image_type);
-    if (q == NULL) {
-        goto out;
-    }
-    if (q->ops->get_storage_status == NULL) {
-        ERROR("Get storage status umimplements");
-        goto out;
-    }
-
-    ret = q->ops->get_storage_status(response);
-    if (ret != 0) {
-        ERROR("Get storage status failed");
-        free_im_storage_status_response(*response);
-        *response = NULL;
-        goto out;
-    }
-
-out:
-    return ret;
-}
-
-int im_get_storage_metadata(const char *image_type, char *id, im_storage_metadata_response **response)
-{
-    int ret = -1;
-    const struct bim_type *q = NULL;
-
-    if (image_type == NULL || response == NULL) {
-        ERROR("Image type or response is NULL");
-        goto out;
-    }
-    q = get_bim_by_type(image_type);
-    if (q == NULL) {
-        goto out;
-    }
-    if (q->ops->get_storage_metadata == NULL) {
-        ERROR("Get storage metadata umimplements");
-        goto out;
-    }
-
-    ret = q->ops->get_storage_metadata(id, response);
-    if (ret != 0) {
-        ERROR("Get storage metadata failed");
-        free_im_storage_metadata_response(*response);
-        *response = NULL;
-        goto out;
-    }
-
-out:
-    return ret;
-}
-
 int im_get_filesystem_info(const char *image_type, im_fs_info_response **response)
 {
     int ret = -1;
@@ -1948,29 +1882,3 @@ void free_im_fs_info_response(im_fs_info_response *ptr)
 
     free(ptr);
 }
-
-void free_im_storage_status_response(im_storage_status_response *ptr)
-{
-    if (ptr == NULL) {
-        return;
-    }
-    free(ptr->backing_fs);
-    ptr->backing_fs = NULL;
-    free(ptr->status);
-    ptr->status = NULL;
-    free(ptr);
-}
-
-void free_im_storage_metadata_response(im_storage_metadata_response *ptr)
-{
-    if (ptr == NULL) {
-        return;
-    }
-    free_json_map_string_string(ptr->metadata);
-    ptr->metadata = NULL;
-    free(ptr->name);
-    ptr->name = NULL;
-    free(ptr->errmsg);
-    ptr->errmsg = NULL;
-    free(ptr);
-}

src/image/image.h

@@ -54,17 +54,6 @@ typedef struct {
 } image_filter;
 #endif
 
-typedef struct {
-    char *backing_fs;
-    char *status;
-} im_storage_status_response;
-
-typedef struct {
-    json_map_string_string *metadata;
-    char *name;
-    char *errmsg;
-} im_storage_metadata_response;
-
 typedef struct {
     imagetool_fs_info *fs_info;
     char *errmsg;
@@ -256,10 +245,6 @@ struct bim_ops {
 
     int (*get_filesystem_info)(im_fs_info_response **response);
 
-    int (*get_storage_status)(im_storage_status_response **response);
-
-    int (*get_storage_metadata)(char *id, im_storage_metadata_response **response);
-
     /* import */
     int (*import)(const im_import_request *request, char **id);
 
@@ -393,14 +378,6 @@ int im_get_filesystem_info(const char *image_type, im_fs_info_response **respons
 
 void free_im_fs_info_response(im_fs_info_response *ptr);
 
-int im_get_storage_status(const char *image_type, im_storage_status_response **response);
-
-void free_im_storage_status_response(im_storage_status_response *ptr);
-
-int im_get_storage_metadata(const char *image_type, char *id, im_storage_metadata_response **response);
-
-void free_im_storage_metadata_response(im_storage_metadata_response *ptr);
-
 size_t im_get_image_count(const im_image_count_request *request);
 
 void free_im_image_count_request(im_image_count_request *ptr);

src/image/oci/oci_image.c

@@ -355,66 +355,6 @@ err_out:
     return -1;
 }
 
-int oci_get_storage_status(im_storage_status_response **response)
-{
-    int ret = -1;
-
-    if (response == NULL) {
-        ERROR("Invalid input arguments");
-        return ret;
-    }
-
-    *response = (im_storage_status_response *)util_common_calloc_s(sizeof(im_storage_status_response));
-    if (*response == NULL) {
-        ERROR("Out of memory");
-        return ret;
-    }
-
-    // TODO call storage image status interface
-    //ret = isula_do_storage_status(*response);
-    if (ret != 0) {
-        ERROR("Get get storage status failed");
-        ret = -1;
-        goto err_out;
-    }
-
-    return 0;
-err_out:
-    free_im_storage_status_response(*response);
-    *response = NULL;
-    return ret;
-}
-
-int oci_get_storage_metadata(char *id, im_storage_metadata_response **response)
-{
-    int ret = -1;
-
-    if (response == NULL || id == NULL) {
-        ERROR("Invalid input arguments");
-        return ret;
-    }
-
-    *response = (im_storage_metadata_response *)util_common_calloc_s(sizeof(im_storage_metadata_response));
-    if (*response == NULL) {
-        ERROR("Out of memory");
-        return ret;
-    }
-
-    // TODO call storage metadata status interface
-    //ret = isula_do_storage_metadata(id, *response);
-    if (ret != 0) {
-        ERROR("Get get storage metadata failed");
-        ret = -1;
-        goto err_out;
-    }
-
-    return 0;
-err_out:
-    free_im_storage_metadata_response(*response);
-    *response = NULL;
-    return ret;
-}
-
 int oci_load_image(const im_load_request *request)
 {
     int ret = 0;

src/image/oci/oci_image.h

@@ -38,10 +38,6 @@ int oci_umount_rf(const im_umount_request *request);
 int oci_delete_rf(const im_delete_request *request);
 int oci_export_rf(const im_export_request *request);
 int oci_container_filesystem_usage(const im_container_fs_usage_request *request, imagetool_fs_info **fs_usage);
-
-int oci_get_storage_status(im_storage_status_response **response);
-int oci_get_storage_metadata(char *id, im_storage_metadata_response **response);
-
 int oci_login(const im_login_request *request);
 int oci_logout(const im_logout_request *request);
 

src/image/oci/storage/layer_store/layer_store.c

@@ -1572,33 +1572,6 @@ unlock:
     return ret;
 }
 
-struct layer_store_status *layer_store_status()
-{
-    struct graphdriver_status *d_status = NULL;
-    struct layer_store_status *result = NULL;
-
-    d_status = graphdriver_get_status();
-
-    if (d_status == NULL) {
-        return NULL;
-    }
-    result = util_common_calloc_s(sizeof(struct layer_store_status));
-    if (result == NULL) {
-        ERROR("Out of memory");
-        goto out;
-    }
-    result->backing_fs = d_status->backing_fs;
-    d_status->backing_fs = NULL;
-    result->status = d_status->status;
-    d_status->status = NULL;
-    result->driver_name = d_status->driver_name;
-    d_status->driver_name = NULL;
-
-out:
-    free_graphdriver_status(d_status);
-    return result;
-}
-
 int layer_store_try_repair_lowers(const char *id)
 {
     layer_t *l = NULL;
@@ -1643,18 +1616,3 @@ void free_layer_store_mount_opts(struct layer_store_mount_opts *ptr)
     ptr->mount_opts = NULL;
     free(ptr);
 }
-
-void free_layer_store_status(struct layer_store_status *ptr)
-{
-    if (ptr == NULL) {
-        return;
-    }
-    free(ptr->backing_fs);
-    ptr->backing_fs = NULL;
-    free(ptr->driver_name);
-    ptr->driver_name = NULL;
-    free(ptr->status);
-    ptr->status = NULL;
-    free(ptr);
-}
-

src/image/oci/storage/layer_store/layer_store.h

@@ -41,12 +41,6 @@ struct layer_opts {
     struct layer_store_mount_opts *opts;
 };
 
-struct layer_store_status {
-    char *driver_name;
-    char *backing_fs;
-    char *status;
-};
-
 int layer_store_init(const struct storage_module_init_options *conf);
 
 bool layer_store_check(const char *id);
@@ -63,12 +57,10 @@ char *layer_store_mount(const char *id, const struct layer_store_mount_opts *opt
 int layer_store_umount(const char *id, bool force);
 int layer_store_mounted(const char *id);
 int layer_store_set_names(const char *id, const char * const* names, size_t names_len);
-struct layer_store_status* layer_store_status();
 int layer_store_try_repair_lowers(const char *id);
 
 void free_layer_store_mount_opts(struct layer_store_mount_opts *ptr);
 void free_layer_opts(struct layer_opts *opts);
-void free_layer_store_status(struct layer_store_status *ptr);
 
 #ifdef __cplusplus
 }

test/mocks/image_mock.cc

@@ -24,23 +24,6 @@ void MockImage_SetMock(MockImage* mock)
     g_image_mock = mock;
 }
 
-int im_get_storage_status(const char *image_type, im_storage_status_response **response)
-{
-    if (g_image_mock != nullptr) {
-        return g_image_mock->ImGetStorageStatus(image_type, response);
-    }
-    return -1;
-}
-
-void free_im_storage_status_response(im_storage_status_response *ptr)
-{
-    if (g_image_mock != nullptr) {
-        g_image_mock->FreeImStorageStatusResponse(ptr);
-        return;
-    }
-    return;
-}
-
 int im_container_export(const im_export_request *request)
 {
     if (g_image_mock != nullptr) {

test/mocks/image_mock.h

@@ -22,8 +22,6 @@
 class MockImage {
 public:
     virtual ~MockImage() = default;
-    MOCK_METHOD2(ImGetStorageStatus, int(const char *, im_storage_status_response **));
-    MOCK_METHOD1(FreeImStorageStatusResponse, void(im_storage_status_response *));
     MOCK_METHOD1(ImContainerExport, int(const im_export_request *request));
     MOCK_METHOD1(FreeImExportRequest, void(im_export_request *ptr));
     MOCK_METHOD3(ImGetStorageMetadata, int(const char *image_type, char *id, im_storage_metadata_response **response));