Commit 0f4b3490 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

rpc: Rename add_portal_group to iscsi_create_portal_group 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 1a6c41a9

doc/iscsi.md

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


### Portal groups



 - add_portal_group -- Add a portal group.

 - iscsi_create_portal_group -- Add a portal group.

 - delete_portal_group -- Delete an existing portal group.

 - add_pg_ig_maps -- Add initiator group to portal group mappings to an existing iSCSI target node.

 - delete_pg_ig_maps -- Delete initiator group to portal group mappings from an existing iSCSI target node.

 - iscsi_get_portal_groups -- Show information about all available portal groups.



~~~

/path/to/spdk/scripts/rpc.py add_portal_group 1 10.0.0.1:3260

/path/to/spdk/scripts/rpc.py iscsi_create_portal_group 1 10.0.0.1:3260

~~~



### Initiator groups
@@ -240,7 +240,7 @@ $ ./scripts/rpc.py bdev_malloc_create -b Malloc1 64 512 
Create new portal group with id 1, and address 10.0.0.1:3260:



```

$ ./scripts/rpc.py add_portal_group 1 10.0.0.1:3260

$ ./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:

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ Example response: 
    "target_node_add_lun",

    "get_iscsi_connections",

    "delete_portal_group",

    "add_portal_group",

    "iscsi_create_portal_group",

    "iscsi_get_portal_groups",

    "delete_target_node",

    "delete_pg_ig_maps",
@@ -3466,7 +3466,7 @@ Example response: 
}

~~~



## add_portal_group method {#rpc_add_portal_group}

## iscsi_create_portal_group method {#rpc_iscsi_create_portal_group}



Add a portal group.
@@ -3500,7 +3500,7 @@ Example request: 
    "tag": 1

  },

  "jsonrpc": "2.0",

  "method": "add_portal_group",

  "method": "iscsi_create_portal_group",

  "id": 1

}

~~~

lib/iscsi/iscsi_rpc.c

+4 −3
Original line number Diff line number Diff line
@@ -779,7 +779,7 @@ static const struct spdk_json_object_decoder rpc_portal_group_decoders[] = { 
};



static void

spdk_rpc_add_portal_group(struct spdk_jsonrpc_request *request,

spdk_rpc_iscsi_create_portal_group(struct spdk_jsonrpc_request *request,

				   const struct spdk_json_val *params)

{

	struct rpc_portal_group req = {};
@@ -841,7 +841,8 @@ out: 
	}

	free_rpc_portal_group(&req);

}

SPDK_RPC_REGISTER("add_portal_group", spdk_rpc_add_portal_group, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("iscsi_create_portal_group", spdk_rpc_iscsi_create_portal_group, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(iscsi_create_portal_group, add_portal_group)



struct rpc_delete_portal_group {

	int32_t tag;

lib/iscsi/portal_grp.c

+1 −1
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ iscsi_portal_grp_config_json(struct spdk_iscsi_portal_grp *pg, 
{

	spdk_json_write_object_begin(w);



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

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



	spdk_json_write_name(w, "params");

	iscsi_portal_grp_info_json(pg, w);

scripts/config_converter.py

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ vhost_dict["construct_vhost_nvme_controller"] = [] 


iscsi_dict = OrderedDict()

iscsi_dict["set_iscsi_options"] = []

iscsi_dict["add_portal_group"] = []

iscsi_dict["iscsi_create_portal_group"] = []

iscsi_dict["add_initiator_group"] = []

iscsi_dict["iscsi_create_target_node"] = []
@@ -538,7 +538,7 @@ def get_iscsi_portal_group_json(config, name): 
            "portals": portals,

            "tag": int(re.findall(r'\d+', name)[0])

        },

        "method": "add_portal_group"

        "method": "iscsi_create_portal_group"

    })



    return portal_group_json