160850f0a6
Construct calls that create single new bdev, now return a string instead of array with single element. Change-Id: Iad841b8e5eab0265693efb6be472354ea616c562 Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-on: https://review.gerrithub.io/416081 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Maciej Szwed <maciej.szwed@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
174 lines
5.1 KiB
C
174 lines
5.1 KiB
C
/*-
|
|
* BSD LICENSE
|
|
*
|
|
* Copyright (c) Intel Corporation.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
* * Neither the name of Intel Corporation nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "bdev_iscsi.h"
|
|
#include "spdk/rpc.h"
|
|
#include "spdk/util.h"
|
|
#include "spdk/string.h"
|
|
|
|
#include "spdk_internal/log.h"
|
|
|
|
struct rpc_construct_iscsi_bdev {
|
|
char *name;
|
|
char *initiator_iqn;
|
|
char *url;
|
|
};
|
|
|
|
static const struct spdk_json_object_decoder rpc_construct_iscsi_bdev_decoders[] = {
|
|
{"name", offsetof(struct rpc_construct_iscsi_bdev, name), spdk_json_decode_string},
|
|
{"initiator_iqn", offsetof(struct rpc_construct_iscsi_bdev, initiator_iqn), spdk_json_decode_string},
|
|
{"url", offsetof(struct rpc_construct_iscsi_bdev, url), spdk_json_decode_string},
|
|
};
|
|
|
|
static void
|
|
free_rpc_construct_iscsi_bdev(struct rpc_construct_iscsi_bdev *req)
|
|
{
|
|
free(req->name);
|
|
free(req->initiator_iqn);
|
|
free(req->url);
|
|
}
|
|
|
|
static void
|
|
construct_iscsi_bdev_cb(void *cb_arg, struct spdk_bdev *bdev, int status)
|
|
{
|
|
struct spdk_jsonrpc_request *request = cb_arg;
|
|
struct spdk_json_write_ctx *w;
|
|
|
|
if (status > 0) {
|
|
spdk_jsonrpc_send_error_response_fmt(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
"iSCSI error (%d).", status);
|
|
} else if (status < 0) {
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,
|
|
spdk_strerror(-status));
|
|
} else {
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
if (w == NULL) {
|
|
return;
|
|
}
|
|
|
|
spdk_json_write_string(w, spdk_bdev_get_name(bdev));
|
|
spdk_jsonrpc_end_result(request, w);
|
|
}
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_construct_iscsi_bdev(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_construct_iscsi_bdev req = {};
|
|
int rc = 0;
|
|
|
|
if (spdk_json_decode_object(params, rpc_construct_iscsi_bdev_decoders,
|
|
SPDK_COUNTOF(rpc_construct_iscsi_bdev_decoders),
|
|
&req)) {
|
|
SPDK_ERRLOG("spdk_json_decode_object failed\n");
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
rc = create_iscsi_disk(req.name, req.url, req.initiator_iqn, construct_iscsi_bdev_cb, request);
|
|
if (rc) {
|
|
goto invalid;
|
|
}
|
|
|
|
free_rpc_construct_iscsi_bdev(&req);
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_construct_iscsi_bdev(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
|
|
}
|
|
SPDK_RPC_REGISTER("construct_iscsi_bdev", spdk_rpc_construct_iscsi_bdev, SPDK_RPC_RUNTIME)
|
|
|
|
struct rpc_delete_iscsi {
|
|
char *name;
|
|
};
|
|
|
|
static void
|
|
free_rpc_delete_iscsi(struct rpc_delete_iscsi *r)
|
|
{
|
|
free(r->name);
|
|
}
|
|
|
|
static const struct spdk_json_object_decoder rpc_delete_iscsi_decoders[] = {
|
|
{"name", offsetof(struct rpc_delete_iscsi, name), spdk_json_decode_string},
|
|
};
|
|
|
|
static void
|
|
_spdk_rpc_delete_iscsi_bdev_cb(void *cb_arg, int bdeverrno)
|
|
{
|
|
struct spdk_jsonrpc_request *request = cb_arg;
|
|
struct spdk_json_write_ctx *w;
|
|
|
|
w = spdk_jsonrpc_begin_result(request);
|
|
if (w == NULL) {
|
|
return;
|
|
}
|
|
|
|
spdk_json_write_bool(w, bdeverrno == 0);
|
|
spdk_jsonrpc_end_result(request, w);
|
|
}
|
|
|
|
static void
|
|
spdk_rpc_delete_iscsi_bdev(struct spdk_jsonrpc_request *request,
|
|
const struct spdk_json_val *params)
|
|
{
|
|
struct rpc_delete_iscsi req = {NULL};
|
|
struct spdk_bdev *bdev;
|
|
int rc;
|
|
|
|
if (spdk_json_decode_object(params, rpc_delete_iscsi_decoders,
|
|
SPDK_COUNTOF(rpc_delete_iscsi_decoders),
|
|
&req)) {
|
|
rc = -EINVAL;
|
|
goto invalid;
|
|
}
|
|
|
|
bdev = spdk_bdev_get_by_name(req.name);
|
|
if (bdev == NULL) {
|
|
rc = -ENODEV;
|
|
goto invalid;
|
|
}
|
|
|
|
delete_iscsi_disk(bdev, _spdk_rpc_delete_iscsi_bdev_cb, request);
|
|
|
|
free_rpc_delete_iscsi(&req);
|
|
|
|
return;
|
|
|
|
invalid:
|
|
free_rpc_delete_iscsi(&req);
|
|
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, spdk_strerror(-rc));
|
|
}
|
|
SPDK_RPC_REGISTER("delete_iscsi_bdev", spdk_rpc_delete_iscsi_bdev, SPDK_RPC_RUNTIME)
|