diff --git a/nova/tests/unit/virt/libvirt/volume/test_fibrechannel.py b/nova/tests/unit/virt/libvirt/volume/test_fibrechannel.py index 338bb6b58dd8..4289ac5aefb6 100644 --- a/nova/tests/unit/virt/libvirt/volume/test_fibrechannel.py +++ b/nova/tests/unit/virt/libvirt/volume/test_fibrechannel.py @@ -24,10 +24,15 @@ class LibvirtFibreChannelVolumeDriverTestCase( test_volume.LibvirtVolumeBaseTestCase): def test_libvirt_fibrechan_driver(self): - libvirt_driver = fibrechannel.LibvirtFibreChannelVolumeDriver( - self.fake_host) - self.assertIsInstance(libvirt_driver.connector, - connector.FibreChannelConnector) + for multipath in (True, False): + self.flags(volume_use_multipath=multipath, group='libvirt') + libvirt_driver = fibrechannel.LibvirtFibreChannelVolumeDriver( + self.fake_host) + self.assertIsInstance(libvirt_driver.connector, + connector.FibreChannelConnector) + if hasattr(libvirt_driver.connector, 'use_multipath'): + self.assertEqual( + multipath, libvirt_driver.connector.use_multipath) def _test_libvirt_fibrechan_driver_s390(self): libvirt_driver = fibrechannel.LibvirtFibreChannelVolumeDriver( diff --git a/nova/tests/unit/virt/libvirt/volume/test_iscsi.py b/nova/tests/unit/virt/libvirt/volume/test_iscsi.py index edf42f7ce0c0..2991ef1ac9b1 100644 --- a/nova/tests/unit/virt/libvirt/volume/test_iscsi.py +++ b/nova/tests/unit/virt/libvirt/volume/test_iscsi.py @@ -22,9 +22,14 @@ class LibvirtISCSIVolumeDriverTestCase( test_volume.LibvirtISCSIVolumeBaseTestCase): def test_libvirt_iscsi_driver(self, transport=None): - libvirt_driver = iscsi.LibvirtISCSIVolumeDriver(self.fake_host) - self.assertIsInstance(libvirt_driver.connector, - connector.ISCSIConnector) + for multipath in (True, False): + self.flags(volume_use_multipath=multipath, group='libvirt') + libvirt_driver = iscsi.LibvirtISCSIVolumeDriver(self.fake_host) + self.assertIsInstance(libvirt_driver.connector, + connector.ISCSIConnector) + if hasattr(libvirt_driver.connector, 'use_multipath'): + self.assertEqual( + multipath, libvirt_driver.connector.use_multipath) def test_libvirt_iscsi_driver_get_config(self): libvirt_driver = iscsi.LibvirtISCSIVolumeDriver(self.fake_host)