test/iscsi: parametrize PORTAL_TAG
Change-Id: I58b53634fea07db219b20ee5b74cf31e708279a1 Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Reviewed-on: https://review.gerrithub.io/405548 Tested-by: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
parent
016cfd3b69
commit
80d2e164ba
@ -35,7 +35,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
$rpc_py construct_malloc_bdev -b MyBdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
|
||||
# "MyBdev:0" ==> use MyBdev blockdev for LUN0
|
||||
|
@ -5,5 +5,6 @@ ISCSI_PORT=3260
|
||||
NETMASK=$INITIATOR_IP/32
|
||||
INITIATOR_TAG=2
|
||||
INITIATOR_NAME=ANY
|
||||
PORTAL_TAG=1
|
||||
ISCSI_APP="./app/iscsi_tgt/iscsi_tgt -i 0"
|
||||
ISCSI_TEST_CORE_MASK=0xFF
|
||||
|
@ -78,7 +78,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
|
||||
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0
|
||||
|
@ -30,7 +30,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
$rpc_py construct_error_bdev 'Malloc0'
|
||||
# "1:2" ==> map PortalGroup1 to InitiatorGroup2
|
||||
|
@ -35,7 +35,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 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_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
|
||||
|
||||
|
@ -65,7 +65,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
|
||||
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0
|
||||
|
@ -25,7 +25,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
|
||||
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0
|
||||
|
@ -28,7 +28,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 1 $MIGRATION_ADDRESS:$ISCSI_PORT
|
||||
$rpc_py -s $1 add_portal_group $PORTAL_TAG $MIGRATION_ADDRESS:$ISCSI_PORT
|
||||
$rpc_py -s $1 construct_target_node target1 target1_alias 'Malloc0:0' '1:1' 64 -d
|
||||
}
|
||||
|
||||
|
@ -34,7 +34,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
timing_enter setup
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
for i in `seq 1 $NUM_MALLOC`; do
|
||||
INITIATOR_TAG=$((i+2))
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
|
@ -56,7 +56,7 @@ trap "remove_backends; iscsicleanup; killprocess $iscsipid; exit 1" SIGINT SIGTE
|
||||
waitforlisten $iscsipid
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group 1 ANY $INITIATOR_IP/32
|
||||
|
||||
echo "Creating an iSCSI target node."
|
||||
|
@ -53,7 +53,7 @@ echo "iSCSI target has started."
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
echo "Creating an iSCSI target node."
|
||||
$rpc_py -s "$iscsi_rpc_addr" add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py -s "$iscsi_rpc_addr" add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py -s "$iscsi_rpc_addr" add_initiator_group 1 ANY $INITIATOR_IP/32
|
||||
if [ $1 -eq 0 ]; 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
|
||||
|
@ -29,7 +29,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
timing_exit start_iscsi_target
|
||||
|
||||
timing_enter setup
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_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
|
||||
|
@ -28,7 +28,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
$rpc_py construct_rbd_bdev $RBD_POOL $RBD_NAME 4096
|
||||
$rpc_py get_bdevs
|
||||
|
@ -32,7 +32,7 @@ echo "iscsi_tgt is listening. Running tests..."
|
||||
|
||||
timing_exit start_iscsi_tgt
|
||||
|
||||
$rpc_py add_portal_group 1 $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_portal_group $PORTAL_TAG $TARGET_IP:$ISCSI_PORT
|
||||
$rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
|
||||
$rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE
|
||||
# "Malloc0:0" ==> use Malloc0 blockdev for LUN0
|
||||
|
Loading…
Reference in New Issue
Block a user