From 81f26f822d66c71c29ea25fd4158ac41fc162964 Mon Sep 17 00:00:00 2001 From: Chris M Date: Mon, 5 Aug 2019 18:13:33 +0000 Subject: [PATCH] Fix bad argument to iscsiadm in iSCSI discovery Fix a call to _iscsiadm_update() in which a list was being passed as the target_iqn connection property. This property is used directly as an argument to the iscsiadm -T option, so it must be a plain string. Change-Id: I9c2ff1de1f89fb49dd6c5a90679d5c4238d5476a Closes-bug: 1838820 --- os_brick/initiator/connectors/iscsi.py | 2 +- os_brick/tests/initiator/connectors/test_iscsi.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/os_brick/initiator/connectors/iscsi.py b/os_brick/initiator/connectors/iscsi.py index a875b76da..c428772d6 100644 --- a/os_brick/initiator/connectors/iscsi.py +++ b/os_brick/initiator/connectors/iscsi.py @@ -1178,7 +1178,7 @@ class ISCSIConnector(base.BaseLinuxConnector, base_iscsi.BaseISCSIConnector): # as discovering target. # So target_iqn is updated, and other values aren't updated. recover_connection = copy.deepcopy(connection_properties) - recover_connection['target_iqn'] = [iqn] + recover_connection['target_iqn'] = iqn self._iscsiadm_update(recover_connection, "node.startup", old_node_startup) diff --git a/os_brick/tests/initiator/connectors/test_iscsi.py b/os_brick/tests/initiator/connectors/test_iscsi.py index 7f0dcc944..25b73cb96 100644 --- a/os_brick/tests/initiator/connectors/test_iscsi.py +++ b/os_brick/tests/initiator/connectors/test_iscsi.py @@ -1665,8 +1665,8 @@ Setting up iSCSI targets: unused iqn1 = 'iqn.2010-10.org.openstack:%s' % name1 iqn2 = 'iqn.2010-10.org.openstack:%s' % name2 iqn3 = 'iqn.2010-10.org.openstack:%s' % name3 - connection_properties = self.iscsi_connection(vol, [location], [iqn1]) - recover_connection = self.iscsi_connection(vol, [location], [iqn2]) + connection_properties = self.iscsi_connection(vol, [location], iqn1) + recover_connection = self.iscsi_connection(vol, [location], iqn2) node_startup1 = "manual" node_startup2 = "automatic"