From 0f4b349089e14d54148a587ff05a7aec25c52332 Mon Sep 17 00:00:00 2001 From: Pawel Kaminski Date: Mon, 9 Sep 2019 06:35:30 -0400 Subject: [PATCH] rpc: Rename add_portal_group to iscsi_create_portal_group Change-Id: I71ba12d81404e50201375f8f347e0ab30b0dec8a Signed-off-by: Pawel Kaminski Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467836 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- doc/iscsi.md | 6 +++--- doc/jsonrpc.md | 6 +++--- lib/iscsi/iscsi_rpc.c | 7 ++++--- lib/iscsi/portal_grp.c | 2 +- scripts/config_converter.py | 4 ++-- scripts/rpc.py | 9 +++++---- scripts/rpc/iscsi.py | 5 +++-- scripts/spdkcli/ui_root.py | 2 +- test/config_converter/spdk_config.json | 2 +- test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh | 2 +- test/iscsi_tgt/calsoft/calsoft.sh | 2 +- test/iscsi_tgt/digests/digests.sh | 2 +- test/iscsi_tgt/ext4test/ext4test.sh | 2 +- test/iscsi_tgt/filesystem/filesystem.sh | 2 +- test/iscsi_tgt/fio/fio.sh | 2 +- test/iscsi_tgt/initiator/initiator.sh | 2 +- test/iscsi_tgt/ip_migration/ip_migration.sh | 2 +- test/iscsi_tgt/lvol/iscsi_lvol.sh | 2 +- test/iscsi_tgt/multiconnection/multiconnection.sh | 2 +- test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh | 2 +- test/iscsi_tgt/perf/iscsi_target.sh | 2 +- test/iscsi_tgt/pmem/iscsi_pmem.sh | 2 +- test/iscsi_tgt/qos/qos.sh | 2 +- test/iscsi_tgt/rbd/rbd.sh | 2 +- test/iscsi_tgt/reset/reset.sh | 2 +- test/iscsi_tgt/rpc_config/rpc_config.py | 8 ++++---- test/iscsi_tgt/trace_record/trace_record.sh | 2 +- test/json_config/clear_config.py | 2 +- test/json_config/json_config.sh | 2 +- test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c | 6 +++--- 30 files changed, 49 insertions(+), 46 deletions(-) diff --git a/doc/iscsi.md b/doc/iscsi.md index 715b1f047..1763e99d9 100644 --- a/doc/iscsi.md +++ b/doc/iscsi.md @@ -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: diff --git a/doc/jsonrpc.md b/doc/jsonrpc.md index 5db989d65..b9e1251f0 100644 --- a/doc/jsonrpc.md +++ b/doc/jsonrpc.md @@ -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 } ~~~ diff --git a/lib/iscsi/iscsi_rpc.c b/lib/iscsi/iscsi_rpc.c index fcb71b38f..69259409e 100644 --- a/lib/iscsi/iscsi_rpc.c +++ b/lib/iscsi/iscsi_rpc.c @@ -779,8 +779,8 @@ static const struct spdk_json_object_decoder rpc_portal_group_decoders[] = { }; static void -spdk_rpc_add_portal_group(struct spdk_jsonrpc_request *request, - const struct spdk_json_val *params) +spdk_rpc_iscsi_create_portal_group(struct spdk_jsonrpc_request *request, + const struct spdk_json_val *params) { struct rpc_portal_group req = {}; struct spdk_iscsi_portal_grp *pg = NULL; @@ -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; diff --git a/lib/iscsi/portal_grp.c b/lib/iscsi/portal_grp.c index acc8b94f6..e9d5e0e3c 100644 --- a/lib/iscsi/portal_grp.c +++ b/lib/iscsi/portal_grp.c @@ -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); diff --git a/scripts/config_converter.py b/scripts/config_converter.py index a9202cf2e..e2308213a 100755 --- a/scripts/config_converter.py +++ b/scripts/config_converter.py @@ -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 diff --git a/scripts/rpc.py b/scripts/rpc.py index 9eeb3c291..d1addde4b 100755 --- a/scripts/rpc.py +++ b/scripts/rpc.py @@ -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 = [] diff --git a/scripts/rpc/iscsi.py b/scripts/rpc/iscsi.py index 332098eca..37962a756 100644 --- a/scripts/rpc/iscsi.py +++ b/scripts/rpc/iscsi.py @@ -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): diff --git a/scripts/spdkcli/ui_root.py b/scripts/spdkcli/ui_root.py index 6c80d295d..fb2601863 100644 --- a/scripts/spdkcli/ui_root.py +++ b/scripts/spdkcli/ui_root.py @@ -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): diff --git a/test/config_converter/spdk_config.json b/test/config_converter/spdk_config.json index f29ad857c..deae275ba 100644 --- a/test/config_converter/spdk_config.json +++ b/test/config_converter/spdk_config.json @@ -442,7 +442,7 @@ ], "tag": 1 }, - "method": "add_portal_group" + "method": "iscsi_create_portal_group" }, { "params": { diff --git a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh index b4a3ee474..82f17bbca 100755 --- a/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh +++ b/test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh @@ -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 diff --git a/test/iscsi_tgt/calsoft/calsoft.sh b/test/iscsi_tgt/calsoft/calsoft.sh index 7514b0cd5..175c61870 100755 --- a/test/iscsi_tgt/calsoft/calsoft.sh +++ b/test/iscsi_tgt/calsoft/calsoft.sh @@ -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 diff --git a/test/iscsi_tgt/digests/digests.sh b/test/iscsi_tgt/digests/digests.sh index 9ef90d639..e8a215c07 100755 --- a/test/iscsi_tgt/digests/digests.sh +++ b/test/iscsi_tgt/digests/digests.sh @@ -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 diff --git a/test/iscsi_tgt/ext4test/ext4test.sh b/test/iscsi_tgt/ext4test/ext4test.sh index c025b8b15..ef8bdff48 100755 --- a/test/iscsi_tgt/ext4test/ext4test.sh +++ b/test/iscsi_tgt/ext4test/ext4test.sh @@ -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 diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh index ce570c006..3f25c1f0e 100755 --- a/test/iscsi_tgt/filesystem/filesystem.sh +++ b/test/iscsi_tgt/filesystem/filesystem.sh @@ -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 diff --git a/test/iscsi_tgt/fio/fio.sh b/test/iscsi_tgt/fio/fio.sh index 40a530e9e..351aba43b 100755 --- a/test/iscsi_tgt/fio/fio.sh +++ b/test/iscsi_tgt/fio/fio.sh @@ -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) " diff --git a/test/iscsi_tgt/initiator/initiator.sh b/test/iscsi_tgt/initiator/initiator.sh index 7f03ad7b8..05d79019a 100755 --- a/test/iscsi_tgt/initiator/initiator.sh +++ b/test/iscsi_tgt/initiator/initiator.sh @@ -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 diff --git a/test/iscsi_tgt/ip_migration/ip_migration.sh b/test/iscsi_tgt/ip_migration/ip_migration.sh index 4272b3c2e..6bc10e481 100755 --- a/test/iscsi_tgt/ip_migration/ip_migration.sh +++ b/test/iscsi_tgt/ip_migration/ip_migration.sh @@ -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 } diff --git a/test/iscsi_tgt/lvol/iscsi_lvol.sh b/test/iscsi_tgt/lvol/iscsi_lvol.sh index dfd77c5bd..423adf5d6 100755 --- a/test/iscsi_tgt/lvol/iscsi_lvol.sh +++ b/test/iscsi_tgt/lvol/iscsi_lvol.sh @@ -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 diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh index b6196cddf..8b4ded342 100755 --- a/test/iscsi_tgt/multiconnection/multiconnection.sh +++ b/test/iscsi_tgt/multiconnection/multiconnection.sh @@ -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." diff --git a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh index 0fb4d6bd2..aa50f06c8 100755 --- a/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh +++ b/test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh @@ -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 diff --git a/test/iscsi_tgt/perf/iscsi_target.sh b/test/iscsi_tgt/perf/iscsi_target.sh index ff12c5a66..3b8610dcd 100755 --- a/test/iscsi_tgt/perf/iscsi_target.sh +++ b/test/iscsi_tgt/perf/iscsi_target.sh @@ -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++ )) diff --git a/test/iscsi_tgt/pmem/iscsi_pmem.sh b/test/iscsi_tgt/pmem/iscsi_pmem.sh index 68da6a1e3..13ac3fabb 100755 --- a/test/iscsi_tgt/pmem/iscsi_pmem.sh +++ b/test/iscsi_tgt/pmem/iscsi_pmem.sh @@ -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 diff --git a/test/iscsi_tgt/qos/qos.sh b/test/iscsi_tgt/qos/qos.sh index 40badca59..46a6e7614 100755 --- a/test/iscsi_tgt/qos/qos.sh +++ b/test/iscsi_tgt/qos/qos.sh @@ -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 diff --git a/test/iscsi_tgt/rbd/rbd.sh b/test/iscsi_tgt/rbd/rbd.sh index cec9c68a1..d229e26b9 100755 --- a/test/iscsi_tgt/rbd/rbd.sh +++ b/test/iscsi_tgt/rbd/rbd.sh @@ -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 diff --git a/test/iscsi_tgt/reset/reset.sh b/test/iscsi_tgt/reset/reset.sh index 9ddbe94f1..91a5f51a6 100755 --- a/test/iscsi_tgt/reset/reset.sh +++ b/test/iscsi_tgt/reset/reset.sh @@ -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 diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py index 587cf9192..b859b19df 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.py +++ b/test/iscsi_tgt/rpc_config/rpc_config.py @@ -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" diff --git a/test/iscsi_tgt/trace_record/trace_record.sh b/test/iscsi_tgt/trace_record/trace_record.sh index f7470e350..4da13484b 100755 --- a/test/iscsi_tgt/trace_record/trace_record.sh +++ b/test/iscsi_tgt/trace_record/trace_record.sh @@ -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" diff --git a/test/json_config/clear_config.py b/test/json_config/clear_config.py index 207238f8e..b10c24264 100755 --- a/test/json_config/clear_config.py +++ b/test/json_config/clear_config.py @@ -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 diff --git a/test/json_config/json_config.sh b/test/json_config/json_config.sh index e85c237ca..c19fe44f3 100755 --- a/test/json_config/json_config.sh +++ b/test/json_config/json_config.sh @@ -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 diff --git a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c index 1cbd6903a..3bfc08110 100644 --- a/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c +++ b/test/unit/lib/iscsi/portal_grp.c/portal_grp_ut.c @@ -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);