d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/iscsi: parametrize iSCSI configuration in rpc_config

Browse Source 
Previously values for iSCSI configuration were hardcoded
within the rpc_config script. Now it takes arguments
from bash script above.

This is base for making iSCSI configuration
common among all test scripts.

Change-Id: I1fecdd87bc11fe053590a4e25c9020cb9085eb30
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/405543
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:
Tomasz Zawadzki 2018-03-27 12:50:41 -04:00 committed by Jim Harris
parent bb237f0f0c
commit 49b546290a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,11 +10,21 @@ import json
import random
from subprocess import check_call, call, check_output, Popen, PIPE, CalledProcessError
netmask = '127.0.0.1/32'
if (len(sys.argv) == 6):
target_ip = sys.argv[2]
initiator_ip = sys.argv[3]
port = sys.argv[4]
netmask = sys.argv[5]
other_ip = '127.0.0.6'
initiator_name = 'ANY'
portal_tag = '1'
initiator_tag = '1'
rpc_param = {
'target_ip': '127.0.0.1',
'port': 3260,
'initiator_name': 'ANY',
'target_ip': target_ip,
'port': port,
'initiator_name': initiator_name,
'netmask': netmask,
'lun_total': 3,
'malloc_bdev_size': 64,
@ -86,8 +96,6 @@ def verify_iscsi_connection_rpc_methods(rpc_py):
verify(not jsonvalue, 1,
"get_iscsi_connections returned {}, expected empty".format(jsonvalue))
portal_tag = '1'
initiator_tag = '1'
rpc.construct_malloc_bdev(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.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
@ -129,8 +137,6 @@ def verify_scsi_devices_rpc_methods(rpc_py):
verify(not jsonvalue, 1,
"get_scsi_devices returned {}, expected empty".format(jsonvalue))
portal_tag = '1'
initiator_tag = '1'
rpc.construct_malloc_bdev(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.add_initiator_group(initiator_tag, rpc_param['initiator_name'], rpc_param['netmask'])
@ -180,7 +186,7 @@ def verify_portal_groups_rpc_methods(rpc_py, rpc_param):
verify(not jsonvalues, 1,
"get_portal_groups returned {} groups, expected empty".format(jsonvalues))
lo_ip = ('127.0.0.1', '127.0.0.6')
lo_ip = (target_ip, other_ip)
nics = json.loads(rpc.get_interfaces())
for x in nics:
if x["ifc_index"] == 'lo':
@ -315,8 +321,6 @@ def verify_initiator_groups_rpc_methods(rpc_py, rpc_param):
def verify_target_nodes_rpc_methods(rpc_py, rpc_param):
rpc = spdk_rpc(rpc_py)
portal_tag = '1'
initiator_tag = '1'
output = rpc.get_iscsi_global_params()
jsonvalues = json.loads(output)
nodebase = jsonvalues['node_base']

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

@ -31,7 +31,7 @@ echo "iscsi_tgt is listening. Running tests..."
timing_exit start_iscsi_tgt
$rpc_config_py $rpc_py
$rpc_config_py $rpc_py $TARGET_IP $INITIATOR_IP $PORT $NETMASK
$rpc_py get_bdevs