diff --git a/nova/tests/virt/libvirt/test_volume.py b/nova/tests/virt/libvirt/test_volume.py index bbd7cef3dac7..6b8647cdccfd 100644 --- a/nova/tests/virt/libvirt/test_volume.py +++ b/nova/tests/virt/libvirt/test_volume.py @@ -241,6 +241,12 @@ class LibvirtVolumeTestCase(test.NoDBTestCase): } } + def test_rescan_multipath(self): + libvirt_driver = volume.LibvirtISCSIVolumeDriver(self.fake_conn) + libvirt_driver._rescan_multipath() + expected_multipath_cmd = ('multipath', '-r') + self.assertIn(expected_multipath_cmd, self.executes) + def test_libvirt_iscsi_driver(self): # NOTE(vish) exists is to make driver assume connecting worked self.stubs.Set(os.path, 'exists', lambda x: True) diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index 3daf3554d772..8e10271c157d 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -587,7 +587,7 @@ class LibvirtISCSIVolumeDriver(LibvirtBaseVolumeDriver): check_exit_code=[0, 1, 21, 255]) def _rescan_multipath(self): - self._run_multipath('-r', check_exit_code=[0, 1, 21]) + self._run_multipath(['-r'], check_exit_code=[0, 1, 21]) def _get_host_device(self, iscsi_properties): return ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-%s" %