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

iscsi/rpc: Configure Header/Data digest through JSON-RPC

Browse Source 
This patch makes possible to set and get Header Digest and Data
Digest of target.

Change-Id: I1d1b892f9dfb747c0f5ad8fc4fddef40929b4143
Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-on: https://review.gerrithub.io/394482
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Shuhei Matsumoto 2018-01-12 14:48:39 +09:00 committed by Jim Harris
parent de70d712fb
commit afc97ddcf7
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/iscsi/iscsi_rpc.c
View File

@ -333,6 +333,12 @@ spdk_rpc_get_target_nodes(struct spdk_jsonrpc_request *request,
spdk_json_write_name(w, "chap_auth_group");
spdk_json_write_int32(w, tgtnode->auth_group);
spdk_json_write_name(w, "header_digest");
spdk_json_write_int32(w, tgtnode->header_digest);
spdk_json_write_name(w, "data_digest");
spdk_json_write_int32(w, tgtnode->data_digest);
spdk_json_write_object_end(w);
}
spdk_json_write_array_end(w);
@ -426,6 +432,9 @@ struct rpc_target_node {
int32_t chap_required;
int32_t chap_mutual;
int32_t chap_auth_group;
int32_t header_digest;
int32_t data_digest;
};
static void
@ -448,6 +457,8 @@ static const struct spdk_json_object_decoder rpc_target_node_decoders[] = {
{"chap_required", offsetof(struct rpc_target_node, chap_required), spdk_json_decode_int32},
{"chap_mutual", offsetof(struct rpc_target_node, chap_mutual), spdk_json_decode_int32},
{"chap_auth_group", offsetof(struct rpc_target_node, chap_auth_group), spdk_json_decode_int32},
{"header_digest", offsetof(struct rpc_target_node, header_digest), spdk_json_decode_int32, true},
{"data_digest", offsetof(struct rpc_target_node, data_digest), spdk_json_decode_int32, true},
};
static void
@ -458,6 +469,9 @@ spdk_rpc_construct_target_node(struct spdk_jsonrpc_request *request,
struct spdk_json_write_ctx *w;
struct spdk_iscsi_tgt_node *target;
req.header_digest = 0;
req.data_digest = 0;
if (spdk_json_decode_object(params, rpc_target_node_decoders,
SPDK_COUNTOF(rpc_target_node_decoders),
&req)) {
@ -493,7 +507,8 @@ spdk_rpc_construct_target_node(struct spdk_jsonrpc_request *request,
req.chap_required,
req.chap_mutual,
req.chap_auth_group,
0, 0);
req.header_digest,
req.data_digest);
if (target == NULL) {
goto invalid;

6
scripts/rpc.py
View File

@ -130,6 +130,10 @@ def construct_target_node(args):
'chap_mutual': args.chap_mutual,
'chap_auth_group': args.chap_auth_group,
}
if args.header_digest:
params['header_digest'] = args.header_digest
if args.data_digest:
params['data_digest'] = args.data_digest
jsonrpc_call('construct_target_node', params)
p = subparsers.add_parser('construct_target_node', help='Add a target node')
@ -154,6 +158,8 @@ p.add_argument('chap_required', help="""CHAP authentication should be required f
p.add_argument('chap_mutual', help='CHAP authentication should be mutual/bidirectional.', type=int)
p.add_argument('chap_auth_group', help="""Authentication group ID for this target node.
*** Authentication group must be precreated ***""", type=int)
p.add_argument('-H', dest='header_digest', help='Header Digest should be required for this target node.', type=int, required=False)
p.add_argument('-D', dest='data_digest', help='Data Digest should be required for this target node.', type=int, required=False)
p.set_defaults(func=construct_target_node)

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

@ -26,6 +26,8 @@ rpc_param = {
'chap_mutal': 0,
'chap_required': 0,
'chap_auth_group': 0,
'header_digest': 0,
'data_digest': 0,
'trace_flag': 'rpc'
}
@ -288,7 +290,8 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
net_mapping = portal_tag + ":" + initiator_tag
rpc.construct_target_node(rpc_param['target_name'], rpc_param['alias_name'], lun_mapping, net_mapping, rpc_param['queue_depth'],
rpc_param['chap_disable'], rpc_param['chap_mutal'], rpc_param['chap_required'], rpc_param['chap_auth_group'])
rpc_param['chap_disable'], rpc_param['chap_mutal'], rpc_param['chap_required'], rpc_param['chap_auth_group'],
"-H", rpc_param['header_digest'], "-D", rpc_param['data_digest'])
output = rpc.get_target_nodes()
jsonvalues = json.loads(output)
verify(len(jsonvalues) == 1, 1,
@ -317,6 +320,10 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
"chap required value is {}, expected {}".format(jsonvalues[0]['chap_required'], rpc_param['chap_required']))
verify(jsonvalues[0]['chap_auth_group'] == rpc_param['chap_auth_group'], 1,
"chap auth group value is {}, expected {}".format(jsonvalues[0]['chap_auth_group'], rpc_param['chap_auth_group']))
verify(jsonvalues[0]['header_digest'] == rpc_param['header_digest'], 1,
"header digest value is {}, expected {}".format(jsonvalues[0]['header_digest'], rpc_param['header_digest']))
verify(jsonvalues[0]['data_digest'] == rpc_param['data_digest'], 1,
"data digest value is {}, expected {}".format(jsonvalues[0]['data_digest'], rpc_param['data_digest']))
lun_id = '1'
rpc.target_node_add_lun(name, bdev_name, "-i", lun_id)
output = rpc.get_target_nodes()