From b8831091a8d097bb55a0e65c3af254a8bfa88811 Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Tue, 11 Dec 2012 10:02:28 -0600 Subject: Remove lxc attaching/detaching of volumes Remove lxc attach and detach of volumes since this will be handled by libvirt in upcoming versions of libvirt. This is expected to be in libvirt 1.0.1 or 1.0.2. This resolves (LP: #1067638) and (LP: #1009701) This removes a non-functional feature of the lxc driver with functionalilty that is coming with newer versions of libvirt. Change-Id: Iaf4bc2769632ba2e7dcfc67892dded7b4dfbb3ae Signed-off-by: Chuck Short --- nova/tests/test_libvirt.py | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'nova/tests') diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index 6e941cb45..6dcf49803 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -406,22 +406,6 @@ class LibvirtVolumeTestCase(test.TestCase): self.assertEqual(tree.find('./auth/secret').get('uuid'), flags_uuid) libvirt_driver.disconnect_volume(connection_info, mount_device) - def test_libvirt_lxc_volume(self): - self.stubs.Set(os.path, 'exists', lambda x: True) - libvirt_driver = volume.LibvirtISCSIVolumeDriver(self.fake_conn) - name = 'volume-00000001' - location = '10.0.2.15:3260' - iqn = 'iqn.2010-10.org.openstack:%s' % name - vol = {'id': 1, 'name': name} - connection_info = self.iscsi_connection(vol, location, iqn) - mount_device = "vde" - conf = libvirt_driver.connect_volume(connection_info, mount_device) - tree = conf.format_dom() - dev_str = '/dev/disk/by-path/ip-%s-iscsi-%s-lun-1' % (location, iqn) - self.assertEqual(tree.get('type'), 'block') - self.assertEqual(tree.find('./source').get('dev'), dev_str) - libvirt_driver.disconnect_volume(connection_info, mount_device) - def test_libvirt_nfs_driver(self): # NOTE(vish) exists is to make driver assume connecting worked mnt_base = '/mnt' -- cgit