Commit 94dd4b9a authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

rpc: Rename add_initiator_group to iscsi_create_initiator_group 



Change-Id: I5ea7daff795340818251aeac2cc21b4b8a7457c6
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467222


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 2b16dcc7

doc/iscsi.md

+3 −3
Original line number Diff line number Diff line
@@ -92,13 +92,13 @@ In addition to the configuration file, the iSCSI target may also be configured v 


### Initiator groups



 - add_initiator_group -- Add an initiator group.

 - iscsi_create_initiator_group -- Add an initiator group.

 - delete_initiator_group -- Delete an existing initiator group.

 - iscsi_initiator_group_add_initiators -- Add initiators to an existing initiator group.

 - iscsi_get_initiator_groups -- Show information about all available initiator groups.



~~~

/path/to/spdk/scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32

/path/to/spdk/scripts/rpc.py iscsi_create_initiator_group 2 ANY 10.0.0.2/32

~~~



### Target nodes
@@ -246,7 +246,7 @@ $ ./scripts/rpc.py iscsi_create_portal_group 1 10.0.0.1:3260 
Create one initiator group with id 2 to accept any connection from 10.0.0.2/32:



```

$ ./scripts/rpc.py add_initiator_group 2 ANY 10.0.0.2/32

$ ./scripts/rpc.py iscsi_create_initiator_group 2 ANY 10.0.0.2/32

```



Finally construct one target using previously created bdevs as LUN0 (Malloc0) and LUN1 (Malloc1)

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ Example response: 
    "delete_initiator_group",

    "iscsi_initiator_group_remove_initiators",

    "iscsi_initiator_group_add_initiators",

    "add_initiator_group",

    "iscsi_create_initiator_group",

    "iscsi_get_initiator_groups",

    "iscsi_set_options",

    "set_bdev_options",
@@ -2974,7 +2974,7 @@ Example response: 
}

~~~



## add_initiator_group method {#rpc_add_initiator_group}

## iscsi_create_initiator_group method {#rpc_iscsi_create_initiator_group}



Add an initiator group.
@@ -3003,7 +3003,7 @@ Example request: 
    ]

  },

  "jsonrpc": "2.0",

  "method": "add_initiator_group",

  "method": "iscsi_create_initiator_group",

  "id": 1

}

~~~

lib/iscsi/init_grp.c

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ iscsi_init_grp_config_json(struct spdk_iscsi_init_grp *ig, 
{

	spdk_json_write_object_begin(w);



	spdk_json_write_named_string(w, "method", "add_initiator_group");

	spdk_json_write_named_string(w, "method", "iscsi_create_initiator_group");



	spdk_json_write_name(w, "params");

	iscsi_init_grp_info_json(ig, w);

lib/iscsi/iscsi_rpc.c

+5 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static const struct spdk_json_object_decoder rpc_initiator_group_decoders[] = { 
};



static void

spdk_rpc_add_initiator_group(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_create_initiator_group(struct spdk_jsonrpc_request *request,

				      const struct spdk_json_val *params)

{

	struct rpc_initiator_group req = {};
@@ -172,7 +172,9 @@ invalid: 
	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");

	free_rpc_initiator_group(&req);

}

SPDK_RPC_REGISTER("add_initiator_group", spdk_rpc_add_initiator_group, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_create_initiator_group", spdk_rpc_iscsi_create_initiator_group,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_initiator_group, add_initiator_group)



static const struct spdk_json_object_decoder rpc_add_or_delete_initiators_decoders[] = {

	{"tag", offsetof(struct rpc_initiator_group, tag), spdk_json_decode_int32},

scripts/config_converter.py

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ vhost_dict["construct_vhost_nvme_controller"] = [] 
iscsi_dict = OrderedDict()

iscsi_dict["iscsi_set_options"] = []

iscsi_dict["iscsi_create_portal_group"] = []

iscsi_dict["add_initiator_group"] = []

iscsi_dict["iscsi_create_initiator_group"] = []

iscsi_dict["iscsi_create_target_node"] = []



nvmf_dict = OrderedDict()
@@ -559,7 +559,7 @@ def get_iscsi_initiator_group_json(config, name): 
            "tag": int(re.findall(r'\d+', name)[0]),

            "netmasks": netmasks

        },

        "method": "add_initiator_group"

        "method": "iscsi_create_initiator_group"

    }



    return [initiator_group_json]