rpc: Rename add_portal_group to iscsi_create_portal_group

Change-Id: I71ba12d81404e50201375f8f347e0ab30b0dec8a
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467836
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Pawel Kaminski 2019-09-09 06:35:30 -04:00 committed by Ben Walker
parent 1a6c41a938
commit 0f4b349089
30 changed files with 49 additions and 46 deletions

View File

@ -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:

View File

@ -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
}
~~~

View File

@ -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;

View File

@ -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);

View File

@ -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

View File

@ -931,7 +931,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
*** The Portal/Initiator Groups must be precreated ***""")
p.set_defaults(func=delete_pg_ig_maps)
def add_portal_group(args):
def iscsi_create_portal_group(args):
portals = []
for p in args.portal_list.strip().split(' '):
ip, separator, port_cpumask = p.rpartition(':')
@ -944,17 +944,18 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
cpumask = split_port_cpumask[1]
portals.append({'host': ip, 'port': port})
print("WARNING: Specifying a portal group with a CPU mask is no longer supported. Ignoring it.")
rpc.iscsi.add_portal_group(
rpc.iscsi.iscsi_create_portal_group(
args.client,
portals=portals,
tag=args.tag)
p = subparsers.add_parser('add_portal_group', help='Add a portal group')
p = subparsers.add_parser('iscsi_create_portal_group', aliases=['add_portal_group'],
help='Add a portal group')
p.add_argument(
'tag', help='Portal group tag (unique, integer > 0)', type=int)
p.add_argument('portal_list', help="""List of portals in host:port format, separated by whitespace
Example: '192.168.100.100:3260 192.168.100.100:3261 192.168.100.100:3262""")
p.set_defaults(func=add_portal_group)
p.set_defaults(func=iscsi_create_portal_group)
def add_initiator_group(args):
initiators = []

View File

@ -362,7 +362,8 @@ def add_pg_ig_maps(client, pg_ig_maps, name):
return client.call('add_pg_ig_maps', params)
def add_portal_group(client, portals, tag):
@deprecated_alias('add_portal_group')
def iscsi_create_portal_group(client, portals, tag):
"""Add a portal group.
Args:
@ -373,7 +374,7 @@ def add_portal_group(client, portals, tag):
True or False
"""
params = {'tag': tag, 'portals': portals}
return client.call('add_portal_group', params)
return client.call('iscsi_create_portal_group', params)
def add_initiator_group(client, tag, initiators, netmasks):

View File

@ -406,7 +406,7 @@ class UIRoot(UINode):
@verbose
def construct_portal_group(self, **kwargs):
rpc.iscsi.add_portal_group(self.client, **kwargs)
rpc.iscsi.iscsi_create_portal_group(self.client, **kwargs)
@verbose
def delete_portal_group(self, **kwargs):

View File

@ -442,7 +442,7 @@
],
"tag": 1
},
"method": "add_portal_group"
"method": "iscsi_create_portal_group"
},
{
"params": {

View File

@ -29,7 +29,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

View File

@ -45,7 +45,7 @@ timing_exit start_iscsi_tgt
$rpc_py add_iscsi_auth_group 1 -c 'user:root secret:tester'
$rpc_py set_iscsi_discovery_auth -g 1
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "MyBdev:0" ==> use MyBdev blockdev for LUN0

View File

@ -80,7 +80,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

View File

@ -31,7 +31,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_error_create 'Malloc0'
# "1:2" ==> map PortalGroup1 to InitiatorGroup2

View File

@ -43,7 +43,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
bdf=$(iter_pci_class_code 01 08 02 | head -1)
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py construct_nvme_bdev -b "Nvme0" -t "pcie" -a $bdf

View File

@ -78,7 +78,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
# Create a RAID-0 bdev from two malloc bdevs
malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "

View File

@ -29,7 +29,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

View File

@ -34,7 +34,7 @@ function rpc_config() {
function rpc_add_target_node() {
$rpc_py -s $1 add_ip_address 1 $MIGRATION_ADDRESS
$rpc_py -s $1 add_portal_group $PORTAL_TAG $MIGRATION_ADDRESS:$ISCSI_PORT
$rpc_py -s $1 iscsi_create_portal_group $PORTAL_TAG $MIGRATION_ADDRESS:$ISCSI_PORT
$rpc_py -s $1 iscsi_create_target_node target1 target1_alias 'Malloc0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
}

View File

@ -40,7 +40,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
timing_enter setup
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
# Create the first LVS from a Raid-0 bdev, which is created from two malloc bdevs
# Create remaining LVSs from a malloc bdev, respectively
for i in $(seq 1 $NUM_LVS); do

View File

@ -48,7 +48,7 @@ $rpc_py start_subsystem_init
$rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
echo "Creating an iSCSI target node."

View File

@ -40,7 +40,7 @@ function run_nvme_remote() {
timing_exit start_iscsi_tgt
echo "Creating an iSCSI target node."
$rpc_py -s "$iscsi_rpc_addr" add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py -s "$iscsi_rpc_addr" iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py -s "$iscsi_rpc_addr" add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
if [ "$1" = "local" ]; then
$rpc_py -s "$iscsi_rpc_addr" construct_nvme_bdev -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1

View File

@ -97,7 +97,7 @@ elif [ $DISKNO -gt ${#bdevs[@]} ] || [ ! $DISKNO =~ ^[0-9]+$ ]; then
error "Required device number ($DISKNO) is not a valid number or it's larger than the number of devices found (${#bdevs[@]})"
fi
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
for (( i=0; i < $DISKNO; i++ ))

View File

@ -31,7 +31,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_target
timing_enter setup
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
for i in $(seq 1 $TGT_NR); do
INITIATOR_TAG=$((i + 1))
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK

View File

@ -65,7 +65,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

View File

@ -38,7 +38,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
rbd_bdev="$($rpc_py construct_rbd_bdev $RBD_POOL $RBD_NAME 4096)"
$rpc_py get_bdevs

View File

@ -36,7 +36,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0

View File

@ -102,7 +102,7 @@ def verify_iscsi_connection_rpc_methods(rpc_py):
"get_iscsi_connections returned {}, expected empty".format(jsonvalue))
rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
rpc.add_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
rpc.iscsi_create_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
rpc.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
@ -144,7 +144,7 @@ def verify_scsi_devices_rpc_methods(rpc_py):
"get_scsi_devices returned {}, expected empty".format(jsonvalue))
rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
rpc.add_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
rpc.iscsi_create_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
rpc.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
@ -201,7 +201,7 @@ def verify_portal_groups_rpc_methods(rpc_py, rpc_param):
for idx, value in enumerate(lo_ip):
# The portal group tag must start at 1
tag = idx + 1
rpc.add_portal_group(tag, "{}:{}".format(value, rpc_param['port']))
rpc.iscsi_create_portal_group(tag, "{}:{}".format(value, rpc_param['port']))
output = rpc.iscsi_get_portal_groups()
jsonvalues = json.loads(output)
verify(len(jsonvalues) == tag, 1,
@ -333,7 +333,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
"iscsi_get_target_nodes returned {}, expected empty".format(jsonvalues))
rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
rpc.add_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
rpc.iscsi_create_portal_group(portal_tag, "{}:{}".format(rpc_param['target_ip'], str(rpc_param['port'])))
rpc.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"

View File

@ -58,7 +58,7 @@ record_pid=$!
echo "Trace record pid: $record_pid"
RPCS=
RPCS+="add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT\n"
RPCS+="iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT\n"
RPCS+="add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK\n"
echo "Create bdevs and target nodes"

View File

@ -86,7 +86,7 @@ def clear_nvmf_subsystem(args, nvmf_config):
def get_iscsi_destroy_method(iscsi):
destroy_method_map = {'add_portal_group': "delete_portal_group",
destroy_method_map = {'iscsi_create_portal_group': "delete_portal_group",
'add_initiator_group': "delete_initiator_group",
'iscsi_create_target_node': "delete_target_node",
'set_iscsi_options': None

View File

@ -298,7 +298,7 @@ function create_vhost_subsystem_config() {
function create_iscsi_subsystem_config() {
timing_enter $FUNCNAME
tgt_rpc bdev_malloc_create 64 1024 --name MallocForIscsi0
tgt_rpc add_portal_group $PORTAL_TAG 127.0.0.1:$ISCSI_PORT
tgt_rpc iscsi_create_portal_group $PORTAL_TAG 127.0.0.1:$ISCSI_PORT
tgt_rpc add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
tgt_rpc iscsi_create_target_node Target3 Target3_alias 'MallocForIscsi0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
timing_exit $FUNCNAME

View File

@ -346,7 +346,7 @@ portal_grp_add_delete_case(void)
spdk_io_device_register(&g_spdk_iscsi, ut_poll_group_create, ut_poll_group_destroy,
sizeof(struct spdk_iscsi_poll_group), "ut_portal_grp");
/* internal of add_portal_group */
/* internal of iscsi_create_portal_group */
pg1 = spdk_iscsi_portal_grp_create(1);
CU_ASSERT(pg1 != NULL);
@ -397,7 +397,7 @@ portal_grp_add_delete_twice_case(void)
spdk_io_device_register(&g_spdk_iscsi, ut_poll_group_create, ut_poll_group_destroy,
sizeof(struct spdk_iscsi_poll_group), "ut_portal_grp");
/* internal of add_portal_group related */
/* internal of iscsi_create_portal_group related */
pg1 = spdk_iscsi_portal_grp_create(1);
CU_ASSERT(pg1 != NULL);
@ -413,7 +413,7 @@ portal_grp_add_delete_twice_case(void)
rc = spdk_iscsi_portal_grp_register(pg1);
CU_ASSERT(rc == 0);
/* internal of add_portal_group related */
/* internal of iscsi_create_portal_group related */
pg2 = spdk_iscsi_portal_grp_create(2);
CU_ASSERT(pg2 != NULL);