ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: Rename delete_target_node to iscsi_delete_target_node

Browse Source 
Change-Id: I94c77c1f897ed780fcb7465776d39782c5320b3e
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467491
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
This commit is contained in:
Pawel Kaminski 2019-09-05 06:52:14 -04:00 committed by Jim Harris
parent 3650a73353
commit a5a296dc9f
13 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/iscsi.md
View File

@ -104,7 +104,7 @@ In addition to the configuration file, the iSCSI target may also be configured v
### Target nodes ### Target nodes
- iscsi_create_target_node -- Add a iSCSI target node. - iscsi_create_target_node -- Add a iSCSI target node.
- delete_target_node -- Delete a iSCSI target node. - iscsi_delete_target_node -- Delete a iSCSI target node.
- iscsi_target_node_add_lun -- Add an LUN to an existing iSCSI target node. - iscsi_target_node_add_lun -- Add an LUN to an existing iSCSI target node.
- iscsi_get_target_nodes -- Show information about all available iSCSI target nodes. - iscsi_get_target_nodes -- Show information about all available iSCSI target nodes.

6
doc/jsonrpc.md
View File

@ -260,7 +260,7 @@ Example response:
"iscsi_delete_portal_group", "iscsi_delete_portal_group",
"iscsi_create_portal_group", "iscsi_create_portal_group",
"iscsi_get_portal_groups", "iscsi_get_portal_groups",
"delete_target_node", "iscsi_delete_target_node",
"iscsi_target_node_remove_pg_ig_maps", "iscsi_target_node_remove_pg_ig_maps",
"iscsi_target_node_add_pg_ig_maps", "iscsi_target_node_add_pg_ig_maps",
"iscsi_create_target_node", "iscsi_create_target_node",
@ -3398,7 +3398,7 @@ Example response:
} }
~~~ ~~~
## delete_target_node method {#rpc_delete_target_node} ## iscsi_delete_target_node method {#rpc_iscsi_delete_target_node}
Delete a iSCSI target node. Delete a iSCSI target node.
@ -3418,7 +3418,7 @@ Example request:
"name": "iqn.2016-06.io.spdk:target1" "name": "iqn.2016-06.io.spdk:target1"
}, },
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "delete_target_node", "method": "iscsi_delete_target_node",
"id": 1 "id": 1
} }
~~~ ~~~

35
lib/iscsi/iscsi_rpc.c
View File

@ -624,32 +624,32 @@ SPDK_RPC_REGISTER("iscsi_target_node_remove_pg_ig_maps",
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_remove_pg_ig_maps, SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_target_node_remove_pg_ig_maps,
delete_pg_ig_maps) delete_pg_ig_maps)
struct rpc_delete_target_node { struct rpc_iscsi_delete_target_node {
char *name; char *name;
}; };
static void static void
free_rpc_delete_target_node(struct rpc_delete_target_node *r) free_rpc_iscsi_delete_target_node(struct rpc_iscsi_delete_target_node *r)
{ {
free(r->name); free(r->name);
} }
static const struct spdk_json_object_decoder rpc_delete_target_node_decoders[] = { static const struct spdk_json_object_decoder rpc_iscsi_delete_target_node_decoders[] = {
{"name", offsetof(struct rpc_delete_target_node, name), spdk_json_decode_string}, {"name", offsetof(struct rpc_iscsi_delete_target_node, name), spdk_json_decode_string},
}; };
struct rpc_delete_target_node_ctx { struct rpc_iscsi_delete_target_node_ctx {
struct rpc_delete_target_node req; struct rpc_iscsi_delete_target_node req;
struct spdk_jsonrpc_request *request; struct spdk_jsonrpc_request *request;
}; };
static void static void
rpc_delete_target_node_done(void *cb_arg, int rc) rpc_iscsi_delete_target_node_done(void *cb_arg, int rc)
{ {
struct rpc_delete_target_node_ctx *ctx = cb_arg; struct rpc_iscsi_delete_target_node_ctx *ctx = cb_arg;
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
free_rpc_delete_target_node(&ctx->req); free_rpc_iscsi_delete_target_node(&ctx->req);
w = spdk_jsonrpc_begin_result(ctx->request); w = spdk_jsonrpc_begin_result(ctx->request);
spdk_json_write_bool(w, rc == 0); spdk_json_write_bool(w, rc == 0);
@ -659,10 +659,10 @@ rpc_delete_target_node_done(void *cb_arg, int rc)
} }
static void static void
spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request, spdk_rpc_iscsi_delete_target_node(struct spdk_jsonrpc_request *request,
const struct spdk_json_val *params) const struct spdk_json_val *params)
{ {
struct rpc_delete_target_node_ctx *ctx; struct rpc_iscsi_delete_target_node_ctx *ctx;
ctx = calloc(1, sizeof(*ctx)); ctx = calloc(1, sizeof(*ctx));
if (!ctx) { if (!ctx) {
@ -671,8 +671,8 @@ spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request,
return; return;
} }
if (spdk_json_decode_object(params, rpc_delete_target_node_decoders, if (spdk_json_decode_object(params, rpc_iscsi_delete_target_node_decoders,
SPDK_COUNTOF(rpc_delete_target_node_decoders), SPDK_COUNTOF(rpc_iscsi_delete_target_node_decoders),
&ctx->req)) { &ctx->req)) {
SPDK_ERRLOG("spdk_json_decode_object failed\n"); SPDK_ERRLOG("spdk_json_decode_object failed\n");
goto invalid; goto invalid;
@ -686,15 +686,16 @@ spdk_rpc_delete_target_node(struct spdk_jsonrpc_request *request,
ctx->request = request; ctx->request = request;
spdk_iscsi_shutdown_tgt_node_by_name(ctx->req.name, spdk_iscsi_shutdown_tgt_node_by_name(ctx->req.name,
rpc_delete_target_node_done, ctx); rpc_iscsi_delete_target_node_done, ctx);
return; return;
invalid: invalid:
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
free_rpc_delete_target_node(&ctx->req); free_rpc_iscsi_delete_target_node(&ctx->req);
free(ctx); free(ctx);
} }
SPDK_RPC_REGISTER("delete_target_node", spdk_rpc_delete_target_node, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("iscsi_delete_target_node", spdk_rpc_iscsi_delete_target_node, SPDK_RPC_RUNTIME)
SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_delete_target_node, delete_target_node)
static void static void
spdk_rpc_iscsi_get_portal_groups(struct spdk_jsonrpc_request *request, spdk_rpc_iscsi_get_portal_groups(struct spdk_jsonrpc_request *request,

8
scripts/rpc.py
View File

@ -1074,15 +1074,15 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False) This parameter can be omitted. Example: '255.255.0.0 255.248.0.0' etc""", required=False)
p.set_defaults(func=iscsi_initiator_group_remove_initiators) p.set_defaults(func=iscsi_initiator_group_remove_initiators)
def delete_target_node(args): def iscsi_delete_target_node(args):
rpc.iscsi.delete_target_node( rpc.iscsi.iscsi_delete_target_node(
args.client, target_node_name=args.target_node_name) args.client, target_node_name=args.target_node_name)
p = subparsers.add_parser('delete_target_node', p = subparsers.add_parser('iscsi_delete_target_node', aliases=['delete_target_node'],
help='Delete a target node') help='Delete a target node')
p.add_argument('target_node_name', p.add_argument('target_node_name',
help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.') help='Target node name to be deleted. Example: iqn.2016-06.io.spdk:disk1.')
p.set_defaults(func=delete_target_node) p.set_defaults(func=iscsi_delete_target_node)
def iscsi_delete_portal_group(args): def iscsi_delete_portal_group(args):
rpc.iscsi.iscsi_delete_portal_group(args.client, tag=args.tag) rpc.iscsi.iscsi_delete_portal_group(args.client, tag=args.tag)

5
scripts/rpc/iscsi.py
View File

@ -452,7 +452,8 @@ def iscsi_initiator_group_remove_initiators(
return client.call('iscsi_initiator_group_remove_initiators', params) return client.call('iscsi_initiator_group_remove_initiators', params)
def delete_target_node(client, target_node_name): @deprecated_alias('delete_target_node')
def iscsi_delete_target_node(client, target_node_name):
"""Delete a target node. """Delete a target node.
Args: Args:
@ -462,7 +463,7 @@ def delete_target_node(client, target_node_name):
True or False True or False
""" """
params = {'name': target_node_name} params = {'name': target_node_name}
return client.call('delete_target_node', params) return client.call('iscsi_delete_target_node', params)
@deprecated_alias('delete_portal_group') @deprecated_alias('delete_portal_group')

2
scripts/spdkcli/ui_node_iscsi.py
View File

@ -71,7 +71,7 @@ class UIISCSIDevices(UINode):
UIISCSIDevice(device, node, self) UIISCSIDevice(device, node, self)
def delete(self, name): def delete(self, name):
self.get_root().delete_target_node(target_node_name=name) self.get_root().iscsi_delete_target_node(target_node_name=name)
def ui_command_create(self, name, alias_name, bdev_name_id_pairs, def ui_command_create(self, name, alias_name, bdev_name_id_pairs,
pg_ig_mappings, queue_depth, g=None, d=None, r=None, pg_ig_mappings, queue_depth, g=None, d=None, r=None,

4
scripts/spdkcli/ui_root.py
View File

@ -387,8 +387,8 @@ class UIRoot(UINode):
rpc.iscsi.iscsi_create_target_node(self.client, **kwargs) rpc.iscsi.iscsi_create_target_node(self.client, **kwargs)
@verbose @verbose
def delete_target_node(self, **kwargs): def iscsi_delete_target_node(self, **kwargs):
rpc.iscsi.delete_target_node(self.client, **kwargs) rpc.iscsi.iscsi_delete_target_node(self.client, **kwargs)
@verbose @verbose
@is_method_available @is_method_available

2
test/iscsi_tgt/ext4test/ext4test.sh
View File

@ -67,7 +67,7 @@ set -e
iscsicleanup iscsicleanup
$rpc_py bdev_error_inject_error EE_Malloc0 'clear' 'failure' $rpc_py bdev_error_inject_error EE_Malloc0 'clear' 'failure'
$rpc_py delete_target_node $node_base:Target0 $rpc_py iscsi_delete_target_node $node_base:Target0
echo "Error injection test done" echo "Error injection test done"
if [ -z "$NO_NVME" ]; then if [ -z "$NO_NVME" ]; then

2
test/iscsi_tgt/fio/fio.sh
View File

@ -142,7 +142,7 @@ else
fi fi
iscsicleanup iscsicleanup
$rpc_py delete_target_node 'iqn.2016-06.io.spdk:Target3' $rpc_py iscsi_delete_target_node 'iqn.2016-06.io.spdk:Target3'
delete_tmp_files delete_tmp_files

2
test/iscsi_tgt/qos/qos.sh
View File

@ -133,7 +133,7 @@ verify_qos_limits $BANDWIDTH_RESULT $READ_BANDWIDTH_LIMIT
echo "I/O bandwidth limiting tests successful" echo "I/O bandwidth limiting tests successful"
iscsicleanup iscsicleanup
$rpc_py delete_target_node 'iqn.2016-06.io.spdk:Target1' $rpc_py iscsi_delete_target_node 'iqn.2016-06.io.spdk:Target1'
rm -f ./local-job0-0-verify.state rm -f ./local-job0-0-verify.state
trap - SIGINT SIGTERM EXIT trap - SIGINT SIGTERM EXIT

8
test/iscsi_tgt/rpc_config/rpc_config.py
View File

@ -127,7 +127,7 @@ def verify_iscsi_connection_rpc_methods(rpc_py):
check_output('iscsiadm -m node -o delete', shell=True) check_output('iscsiadm -m node -o delete', shell=True)
rpc.iscsi_delete_initiator_group(initiator_tag) rpc.iscsi_delete_initiator_group(initiator_tag)
rpc.iscsi_delete_portal_group(portal_tag) rpc.iscsi_delete_portal_group(portal_tag)
rpc.delete_target_node(name) rpc.iscsi_delete_target_node(name)
output = rpc.iscsi_get_connections() output = rpc.iscsi_get_connections()
jsonvalues = json.loads(output) jsonvalues = json.loads(output)
verify(not jsonvalues, 1, verify(not jsonvalues, 1,
@ -168,7 +168,7 @@ def verify_scsi_devices_rpc_methods(rpc_py):
check_output('iscsiadm -m node -o delete', shell=True) check_output('iscsiadm -m node -o delete', shell=True)
rpc.iscsi_delete_initiator_group(initiator_tag) rpc.iscsi_delete_initiator_group(initiator_tag)
rpc.iscsi_delete_portal_group(portal_tag) rpc.iscsi_delete_portal_group(portal_tag)
rpc.delete_target_node(name) rpc.iscsi_delete_target_node(name)
output = rpc.get_scsi_devices() output = rpc.get_scsi_devices()
jsonvalues = json.loads(output) jsonvalues = json.loads(output)
verify(not jsonvalues, 1, verify(not jsonvalues, 1,
@ -381,7 +381,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
verify(jsonvalues[0]['luns'][1]['lun_id'] == 1, 1, verify(jsonvalues[0]['luns'][1]['lun_id'] == 1, 1,
"lun id value is {}, expected 1".format(jsonvalues[0]['luns'][1]['lun_id'])) "lun id value is {}, expected 1".format(jsonvalues[0]['luns'][1]['lun_id']))
rpc.delete_target_node(name) rpc.iscsi_delete_target_node(name)
output = rpc.iscsi_get_target_nodes() output = rpc.iscsi_get_target_nodes()
jsonvalues = json.loads(output) jsonvalues = json.loads(output)
verify(not jsonvalues, 1, verify(not jsonvalues, 1,
@ -392,7 +392,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
rpc.iscsi_delete_portal_group(portal_tag) rpc.iscsi_delete_portal_group(portal_tag)
rpc.iscsi_delete_initiator_group(initiator_tag) rpc.iscsi_delete_initiator_group(initiator_tag)
rpc.delete_target_node(name) rpc.iscsi_delete_target_node(name)
output = rpc.iscsi_get_target_nodes() output = rpc.iscsi_get_target_nodes()
jsonvalues = json.loads(output) jsonvalues = json.loads(output)
if not jsonvalues: if not jsonvalues:

2
test/iscsi_tgt/trace_record/trace_record.sh
View File

@ -85,7 +85,7 @@ iscsicleanup
RPCS= RPCS=
# Delete Malloc blockdevs and targets # Delete Malloc blockdevs and targets
for i in $(seq 0 $CONNECTION_NUMBER); do for i in $(seq 0 $CONNECTION_NUMBER); do
RPCS+="delete_target_node iqn.2016-06.io.spdk:Target$i\n" RPCS+="iscsi_delete_target_node iqn.2016-06.io.spdk:Target$i\n"
RPCS+="bdev_malloc_delete Malloc$i\n" RPCS+="bdev_malloc_delete Malloc$i\n"
done done
echo -e $RPCS | $rpc_py echo -e $RPCS | $rpc_py

2
test/json_config/clear_config.py
View File

@ -88,7 +88,7 @@ def clear_nvmf_subsystem(args, nvmf_config):
def get_iscsi_destroy_method(iscsi): def get_iscsi_destroy_method(iscsi):
delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group", delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group",
'iscsi_create_initiator_group': "iscsi_delete_initiator_group", 'iscsi_create_initiator_group': "iscsi_delete_initiator_group",
'iscsi_create_target_node': "delete_target_node", 'iscsi_create_target_node': "iscsi_delete_target_node",
'iscsi_set_options': None 'iscsi_set_options': None
} }
return delete_method_map[iscsi['method']] return delete_method_map[iscsi['method']]