openstack/nova-powervm
Code Issues Proposed changes

Fix newline character on iscsi initiator

Browse Source 
Certain iscsi initiator calls return a new line.  This can interfere
with some cinder drivers.

Change-Id: I7cdc7f1280d441baa0f0af6a4cf120ee4f50ebaa
This commit is contained in:
Drew Thorstensen 2017-05-02 14:00:48 -04:00 committed by Chhavi Agarwal
parent dedc355805
commit 8547e68851
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova_powervm/tests/virt/powervm/volume/test_driver.py
View File

@ -77,6 +77,11 @@ class TestInitMethods(test.TestCase):
volume.get_iscsi_initiator(mock_adpt))
self.assertEqual(1, mock_mgmt.call_count)
# Check if initiator returned does not have newline character
mock_iscsi_init.return_value = 'test_initiator\n'
self.assertEqual('test_initiator',
volume.get_iscsi_initiator(mock_adpt))
def test_get_volume_class(self):
for vol_type, class_type in six.iteritems(self.volume_drivers):
self.assertEqual(class_type, volume.get_volume_class(vol_type))

2
nova_powervm/virt/powervm/volume/__init__.py
View File

@ -102,7 +102,7 @@ def get_iscsi_initiator(adapter):
mgmt_w = partition.get_mgmt_partition(adapter)
if isinstance(mgmt_w, pvm_vios.VIOS):
_ISCSI_INITIATOR = hdisk.discover_iscsi_initiator(
adapter, mgmt_w.uuid)
adapter, mgmt_w.uuid).strip()
_ISCSI_LOOKUP_COMPLETE = True
return _ISCSI_INITIATOR