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

rpc: Rename add_initiator_group to iscsi_create_initiator_group

Browse Source 
Change-Id: I5ea7daff795340818251aeac2cc21b4b8a7457c6
Signed-off-by: Pawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467222
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Pawel Kaminski 2019-09-03 04:53:37 -04:00 committed by Jim Harris
parent 2b16dcc740
commit 94dd4b9a40
29 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/iscsi.md
View File

@ -92,13 +92,13 @@ In addition to the configuration file, the iSCSI target may also be configured v
### Initiator groups ### 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. - delete_initiator_group -- Delete an existing initiator group.
- iscsi_initiator_group_add_initiators -- Add initiators to 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. - 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 ### 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: 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) Finally construct one target using previously created bdevs as LUN0 (Malloc0) and LUN1 (Malloc1)

6
doc/jsonrpc.md
View File

@ -268,7 +268,7 @@ Example response:
"delete_initiator_group", "delete_initiator_group",
"iscsi_initiator_group_remove_initiators", "iscsi_initiator_group_remove_initiators",
"iscsi_initiator_group_add_initiators", "iscsi_initiator_group_add_initiators",
"add_initiator_group", "iscsi_create_initiator_group",
"iscsi_get_initiator_groups", "iscsi_get_initiator_groups",
"iscsi_set_options", "iscsi_set_options",
"set_bdev_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. Add an initiator group.
@ -3003,7 +3003,7 @@ Example request:
] ]
}, },
"jsonrpc": "2.0", "jsonrpc": "2.0",
"method": "add_initiator_group", "method": "iscsi_create_initiator_group",
"id": 1 "id": 1
} }
~~~ ~~~

2
lib/iscsi/init_grp.c
View File

@ -758,7 +758,7 @@ iscsi_init_grp_config_json(struct spdk_iscsi_init_grp *ig,
{ {
spdk_json_write_object_begin(w); 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"); spdk_json_write_name(w, "params");
iscsi_init_grp_info_json(ig, w); iscsi_init_grp_info_json(ig, w);

8
lib/iscsi/iscsi_rpc.c
View File

@ -135,8 +135,8 @@ static const struct spdk_json_object_decoder rpc_initiator_group_decoders[] = {
}; };
static void 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) const struct spdk_json_val *params)
{ {
struct rpc_initiator_group req = {}; struct rpc_initiator_group req = {};
struct spdk_json_write_ctx *w; struct spdk_json_write_ctx *w;
@ -172,7 +172,9 @@ invalid:
spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters"); spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");
free_rpc_initiator_group(&req); 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[] = { static const struct spdk_json_object_decoder rpc_add_or_delete_initiators_decoders[] = {
{"tag", offsetof(struct rpc_initiator_group, tag), spdk_json_decode_int32}, {"tag", offsetof(struct rpc_initiator_group, tag), spdk_json_decode_int32},

4
scripts/config_converter.py
View File

@ -25,7 +25,7 @@ vhost_dict["construct_vhost_nvme_controller"] = []
iscsi_dict = OrderedDict() iscsi_dict = OrderedDict()
iscsi_dict["iscsi_set_options"] = [] iscsi_dict["iscsi_set_options"] = []
iscsi_dict["iscsi_create_portal_group"] = [] iscsi_dict["iscsi_create_portal_group"] = []
iscsi_dict["add_initiator_group"] = [] iscsi_dict["iscsi_create_initiator_group"] = []
iscsi_dict["iscsi_create_target_node"] = [] iscsi_dict["iscsi_create_target_node"] = []
nvmf_dict = OrderedDict() nvmf_dict = OrderedDict()
@ -559,7 +559,7 @@ def get_iscsi_initiator_group_json(config, name):
"tag": int(re.findall(r'\d+', name)[0]), "tag": int(re.findall(r'\d+', name)[0]),
"netmasks": netmasks "netmasks": netmasks
}, },
"method": "add_initiator_group" "method": "iscsi_create_initiator_group"
} }
return [initiator_group_json] return [initiator_group_json]

8
scripts/rpc.py
View File

@ -987,20 +987,20 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
Example: '192.168.100.100:3260 192.168.100.100:3261 192.168.100.100:3262""") Example: '192.168.100.100:3260 192.168.100.100:3261 192.168.100.100:3262""")
p.set_defaults(func=iscsi_create_portal_group) p.set_defaults(func=iscsi_create_portal_group)
def add_initiator_group(args): def iscsi_create_initiator_group(args):
initiators = [] initiators = []
netmasks = [] netmasks = []
for i in args.initiator_list.strip().split(' '): for i in args.initiator_list.strip().split(' '):
initiators.append(i) initiators.append(i)
for n in args.netmask_list.strip().split(' '): for n in args.netmask_list.strip().split(' '):
netmasks.append(n) netmasks.append(n)
rpc.iscsi.add_initiator_group( rpc.iscsi.iscsi_create_initiator_group(
args.client, args.client,
tag=args.tag, tag=args.tag,
initiators=initiators, initiators=initiators,
netmasks=netmasks) netmasks=netmasks)
p = subparsers.add_parser('add_initiator_group', p = subparsers.add_parser('iscsi_create_initiator_group', aliases=['add_initiator_group'],
help='Add an initiator group') help='Add an initiator group')
p.add_argument( p.add_argument(
'tag', help='Initiator group tag (unique, integer > 0)', type=int) 'tag', help='Initiator group tag (unique, integer > 0)', type=int)
@ -1008,7 +1008,7 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse
enclosed in quotes. Example: 'ANY' or '127.0.0.1 192.168.200.100'""") enclosed in quotes. Example: 'ANY' or '127.0.0.1 192.168.200.100'""")
p.add_argument('netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes. p.add_argument('netmask_list', help="""Whitespace-separated list of initiator netmasks enclosed in quotes.
Example: '255.255.0.0 255.248.0.0' etc""") Example: '255.255.0.0 255.248.0.0' etc""")
p.set_defaults(func=add_initiator_group) p.set_defaults(func=iscsi_create_initiator_group)
def iscsi_initiator_group_add_initiators(args): def iscsi_initiator_group_add_initiators(args):
initiators = None initiators = None

5
scripts/rpc/iscsi.py
View File

@ -388,7 +388,8 @@ def iscsi_create_portal_group(client, portals, tag):
return client.call('iscsi_create_portal_group', params) return client.call('iscsi_create_portal_group', params)
def add_initiator_group(client, tag, initiators, netmasks): @deprecated_alias('add_initiator_group')
def iscsi_create_initiator_group(client, tag, initiators, netmasks):
"""Add an initiator group. """Add an initiator group.
Args: Args:
@ -400,7 +401,7 @@ def add_initiator_group(client, tag, initiators, netmasks):
True or False True or False
""" """
params = {'tag': tag, 'initiators': initiators, 'netmasks': netmasks} params = {'tag': tag, 'initiators': initiators, 'netmasks': netmasks}
return client.call('add_initiator_group', params) return client.call('iscsi_create_initiator_group', params)
@deprecated_alias('add_initiators_to_initiator_group') @deprecated_alias('add_initiators_to_initiator_group')

2
scripts/spdkcli/ui_root.py
View File

@ -414,7 +414,7 @@ class UIRoot(UINode):
@verbose @verbose
def construct_initiator_group(self, **kwargs): def construct_initiator_group(self, **kwargs):
rpc.iscsi.add_initiator_group(self.client, **kwargs) rpc.iscsi.iscsi_create_initiator_group(self.client, **kwargs)
@verbose @verbose
def delete_initiator_group(self, **kwargs): def delete_initiator_group(self, **kwargs):

2
test/config_converter/spdk_config.json
View File

@ -454,7 +454,7 @@
"127.0.0.1/32" "127.0.0.1/32"
] ]
}, },
"method": "add_initiator_group" "method": "iscsi_create_initiator_group"
}, },
{ {
"params": { "params": {

2
test/iscsi_tgt/bdev_io_wait/bdev_io_wait.sh
View File

@ -30,7 +30,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2

2
test/iscsi_tgt/calsoft/calsoft.sh
View File

@ -46,7 +46,7 @@ timing_exit start_iscsi_tgt
$rpc_py iscsi_create_auth_group 1 -c 'user:root secret:tester' $rpc_py iscsi_create_auth_group 1 -c 'user:root secret:tester'
$rpc_py iscsi_set_discovery_auth -g 1 $rpc_py iscsi_set_discovery_auth -g 1
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE $rpc_py bdev_malloc_create -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "MyBdev:0" ==> use MyBdev blockdev for LUN0 # "MyBdev:0" ==> use MyBdev blockdev for LUN0
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2

2
test/iscsi_tgt/digests/digests.sh
View File

@ -81,7 +81,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2

2
test/iscsi_tgt/ext4test/ext4test.sh
View File

@ -32,7 +32,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_error_create 'Malloc0' $rpc_py bdev_error_create 'Malloc0'
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2
# "64" ==> iSCSI queue depth 64 # "64" ==> iSCSI queue depth 64

2
test/iscsi_tgt/filesystem/filesystem.sh
View File

@ -44,7 +44,7 @@ timing_exit start_iscsi_tgt
bdf=$(iter_pci_class_code 01 08 02 | head -1) bdf=$(iter_pci_class_code 01 08 02 | head -1)
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_nvme_attach_controller -b "Nvme0" -t "pcie" -a $bdf $rpc_py bdev_nvme_attach_controller -b "Nvme0" -t "pcie" -a $bdf
ls_guid=$($rpc_py bdev_lvol_create_lvstore Nvme0n1 lvs_0) ls_guid=$($rpc_py bdev_lvol_create_lvstore Nvme0n1 lvs_0)

2
test/iscsi_tgt/fio/fio.sh
View File

@ -79,7 +79,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
# Create a RAID-0 bdev from two malloc bdevs # Create a RAID-0 bdev from two malloc bdevs
malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) " malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "
malloc_bdevs+="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)" malloc_bdevs+="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)"

2
test/iscsi_tgt/initiator/initiator.sh
View File

@ -30,7 +30,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2

2
test/iscsi_tgt/ip_migration/ip_migration.sh
View File

@ -28,7 +28,7 @@ function kill_all_iscsi_target() {
function rpc_config() { function rpc_config() {
# $1 = RPC server address # $1 = RPC server address
# $2 = Netmask # $2 = Netmask
$rpc_py -s $1 add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $2 $rpc_py -s $1 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $2
$rpc_py -s $1 bdev_malloc_create 64 512 $rpc_py -s $1 bdev_malloc_create 64 512
} }

2
test/iscsi_tgt/lvol/iscsi_lvol.sh
View File

@ -45,7 +45,7 @@ $rpc_py iscsi_create_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
# Create remaining LVSs from a malloc bdev, respectively # Create remaining LVSs from a malloc bdev, respectively
for i in $(seq 1 $NUM_LVS); do for i in $(seq 1 $NUM_LVS); do
INITIATOR_TAG=$((i + 2)) INITIATOR_TAG=$((i + 2))
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK $rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
if [ $i -eq 1 ]; then if [ $i -eq 1 ]; then
# construct RAID bdev and put its name in $bdev # construct RAID bdev and put its name in $bdev
malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) " malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "

2
test/iscsi_tgt/multiconnection/multiconnection.sh
View File

@ -49,7 +49,7 @@ $rootdir/scripts/gen_nvme.sh --json | $rpc_py load_subsystem_config
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
echo "Creating an iSCSI target node." echo "Creating an iSCSI target node."
ls_guid=$($rpc_py bdev_lvol_create_lvstore "Nvme0n1" "lvs0" -c 1048576) ls_guid=$($rpc_py bdev_lvol_create_lvstore "Nvme0n1" "lvs0" -c 1048576)

2
test/iscsi_tgt/nvme_remote/fio_remote_nvme.sh
View File

@ -41,7 +41,7 @@ function run_nvme_remote() {
echo "Creating an iSCSI target node." echo "Creating an iSCSI target node."
$rpc_py -s "$iscsi_rpc_addr" iscsi_create_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 $rpc_py -s "$iscsi_rpc_addr" iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
if [ "$1" = "local" ]; then if [ "$1" = "local" ]; then
$rpc_py -s "$iscsi_rpc_addr" bdev_nvme_attach_controller -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1 $rpc_py -s "$iscsi_rpc_addr" bdev_nvme_attach_controller -b "Nvme0" -t "rdma" -f "ipv4" -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT -n nqn.2016-06.io.spdk:cnode1
fi fi

2
test/iscsi_tgt/perf/iscsi_target.sh
View File

@ -98,7 +98,7 @@ elif [ $DISKNO -gt ${#bdevs[@]} ] || [ ! $DISKNO =~ ^[0-9]+$ ]; then
fi fi
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
for (( i=0; i < $DISKNO; i++ )) for (( i=0; i < $DISKNO; i++ ))
do do

2
test/iscsi_tgt/pmem/iscsi_pmem.sh
View File

@ -34,7 +34,7 @@ timing_enter setup
$rpc_py iscsi_create_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 for i in $(seq 1 $TGT_NR); do
INITIATOR_TAG=$((i + 1)) INITIATOR_TAG=$((i + 1))
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK $rpc_py iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
luns="" luns=""
for j in $(seq 1 $PMEM_PER_TGT); do for j in $(seq 1 $PMEM_PER_TGT); do

2
test/iscsi_tgt/qos/qos.sh
View File

@ -66,7 +66,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2

2
test/iscsi_tgt/rbd/rbd.sh
View File

@ -39,7 +39,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
rbd_bdev="$($rpc_py bdev_rbd_create $RBD_POOL $RBD_NAME 4096)" rbd_bdev="$($rpc_py bdev_rbd_create $RBD_POOL $RBD_NAME 4096)"
$rpc_py bdev_get_bdevs $rpc_py bdev_get_bdevs
# "Ceph0:0" ==> use Ceph0 blockdev for LUN0 # "Ceph0:0" ==> use Ceph0 blockdev for LUN0

2
test/iscsi_tgt/reset/reset.sh
View File

@ -37,7 +37,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt timing_exit start_iscsi_tgt
$rpc_py iscsi_create_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 iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
$rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE $rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0 # "Malloc0:0" ==> use Malloc0 blockdev for LUN0
# "1:2" ==> map PortalGroup1 to InitiatorGroup2 # "1:2" ==> map PortalGroup1 to InitiatorGroup2

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

@ -103,7 +103,7 @@ def verify_iscsi_connection_rpc_methods(rpc_py):
rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size']) rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
rpc.iscsi_create_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']) rpc.iscsi_create_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0" lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
net_mapping = portal_tag + ":" + initiator_tag net_mapping = portal_tag + ":" + initiator_tag
@ -145,7 +145,7 @@ def verify_scsi_devices_rpc_methods(rpc_py):
rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size']) rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
rpc.iscsi_create_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']) rpc.iscsi_create_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0" lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
net_mapping = portal_tag + ":" + initiator_tag net_mapping = portal_tag + ":" + initiator_tag
@ -250,7 +250,7 @@ def verify_initiator_groups_rpc_methods(rpc_py, rpc_param):
for idx, value in enumerate(rpc_param['netmask']): for idx, value in enumerate(rpc_param['netmask']):
# The initiator group tag must start at 1 # The initiator group tag must start at 1
tag = idx + 1 tag = idx + 1
rpc.add_initiator_group(tag, rpc_param['initiator_name'], value) rpc.iscsi_create_initiator_group(tag, rpc_param['initiator_name'], value)
output = rpc.iscsi_get_initiator_groups() output = rpc.iscsi_get_initiator_groups()
jsonvalues = json.loads(output) jsonvalues = json.loads(output)
verify(len(jsonvalues) == tag, 1, verify(len(jsonvalues) == tag, 1,
@ -334,7 +334,7 @@ def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size']) rpc.bdev_malloc_create(rpc_param['malloc_bdev_size'], rpc_param['malloc_block_size'])
rpc.iscsi_create_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']) rpc.iscsi_create_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0" lun_mapping = "Malloc" + str(rpc_param['lun_total']) + ":0"
net_mapping = portal_tag + ":" + initiator_tag net_mapping = portal_tag + ":" + initiator_tag

2
test/iscsi_tgt/trace_record/trace_record.sh
View File

@ -59,7 +59,7 @@ echo "Trace record pid: $record_pid"
RPCS= RPCS=
RPCS+="iscsi_create_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" RPCS+="iscsi_create_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK\n"
echo "Create bdevs and target nodes" echo "Create bdevs and target nodes"
CONNECTION_NUMBER=15 CONNECTION_NUMBER=15

2
test/json_config/clear_config.py
View File

@ -87,7 +87,7 @@ def clear_nvmf_subsystem(args, nvmf_config):
def get_iscsi_destroy_method(iscsi): def get_iscsi_destroy_method(iscsi):
delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group", delete_method_map = {'iscsi_create_portal_group': "iscsi_delete_portal_group",
'add_initiator_group': "delete_initiator_group", 'iscsi_create_initiator_group': "delete_initiator_group",
'iscsi_create_target_node': "delete_target_node", 'iscsi_create_target_node': "delete_target_node",
'iscsi_set_options': None 'iscsi_set_options': None
} }

2
test/json_config/json_config.sh
View File

@ -299,7 +299,7 @@ function create_iscsi_subsystem_config() {
timing_enter $FUNCNAME timing_enter $FUNCNAME
tgt_rpc bdev_malloc_create 64 1024 --name MallocForIscsi0 tgt_rpc bdev_malloc_create 64 1024 --name MallocForIscsi0
tgt_rpc iscsi_create_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_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
tgt_rpc iscsi_create_target_node Target3 Target3_alias 'MallocForIscsi0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d tgt_rpc iscsi_create_target_node Target3 Target3_alias 'MallocForIscsi0:0' $PORTAL_TAG:$INITIATOR_TAG 64 -d
timing_exit $FUNCNAME timing_exit $FUNCNAME
} }