From 3ba0c171c0b6f3516662bc0ab660b14cd6d34d8a Mon Sep 17 00:00:00 2001 From: Xavier Queralt Date: Mon, 10 Jun 2013 16:06:40 +0200 Subject: Don't make nova-compute depend on iSCSI Because not all volume drivers require iSCSI it makes sense to not set the initiator in the connector and let the volume drivers return an error if iSCSI is required. bug #1007084 Change-Id: I5da472e5013fdc0c733ecb12b919c1068873bdc6 --- nova/tests/virt/libvirt/test_libvirt.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'nova/tests') diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py index 77744cfc2..cc5d3fe2a 100644 --- a/nova/tests/virt/libvirt/test_libvirt.py +++ b/nova/tests/virt/libvirt/test_libvirt.py @@ -4520,6 +4520,17 @@ class LibvirtUtilsTestCase(test.TestCase): result = libvirt_utils.get_iscsi_initiator() self.assertEqual(initiator, result) + def test_get_missing_iscsi_initiator(self): + self.mox.StubOutWithMock(utils, 'execute') + file_path = '/etc/iscsi/initiatorname.iscsi' + utils.execute('cat', file_path, run_as_root=True).AndRaise( + exception.FileNotFound(file_path=file_path) + ) + # Start test + self.mox.ReplayAll() + result = libvirt_utils.get_iscsi_initiator() + self.assertIsNone(result) + def test_create_image(self): self.mox.StubOutWithMock(utils, 'execute') utils.execute('qemu-img', 'create', '-f', 'raw', -- cgit