diff --git a/lib/iscsi/tgt_node.c b/lib/iscsi/tgt_node.c index 6c93a0bcaa..6f165be0ff 100644 --- a/lib/iscsi/tgt_node.c +++ b/lib/iscsi/tgt_node.c @@ -920,9 +920,8 @@ spdk_iscsi_tgt_node_construct(int target_index, } } - target->dev = spdk_scsi_dev_construct(name, lun_name_list, lun_id_list, num_luns, + target->dev = spdk_scsi_dev_construct(fullname, lun_name_list, lun_id_list, num_luns, SPDK_SPC_PROTOCOL_IDENTIFIER_ISCSI, NULL, NULL); - if (!target->dev) { SPDK_ERRLOG("Could not construct SCSI device\n"); spdk_iscsi_tgt_node_destruct(target); diff --git a/test/iscsi_tgt/rpc_config/rpc_config.py b/test/iscsi_tgt/rpc_config/rpc_config.py index f70af5e60d..41f8552b8c 100755 --- a/test/iscsi_tgt/rpc_config/rpc_config.py +++ b/test/iscsi_tgt/rpc_config/rpc_config.py @@ -138,9 +138,12 @@ def verify_scsi_devices_rpc_methods(rpc_py): check_output('iscsiadm -m discovery -t st -p {}'.format(rpc_param['target_ip']), shell=True) check_output('iscsiadm -m node --login', shell=True) name = json.loads(rpc.get_target_nodes())[0]['name'] + output = rpc.get_iscsi_global_params() + jsonvalues = json.loads(output) + nodebase = jsonvalues['node_base'] output = rpc.get_scsi_devices() jsonvalues = json.loads(output) - verify(jsonvalues[0]['device_name'] == rpc_param['target_name'], 1, + verify(jsonvalues[0]['device_name'] == nodebase + ":" + rpc_param['target_name'], 1, "device name vaule is {}, expected {}".format(jsonvalues[0]['device_name'], rpc_param['target_name'])) verify(jsonvalues[0]['id'] == 0, 1, "device id value is {}, expected 0".format(jsonvalues[0]['id']))