libvirt: use instance object for attach_volume

The compute manager uses a instance object here. Add support to the driver. Change-Id: I32bc269ce392f1e41f0ddb88b912a5a4bfb7bad8
openstack · Oct 21, 2014 · ec6efc5 · ec6efc5
1 parent 6a27dfe
commit ec6efc5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/nova/tests/virt/libvirt/test_driver.py b/nova/tests/virt/libvirt/test_driver.py
@@ -4889,18 +4889,22 @@ def test_get_volume_config(self, get_config, connect_volume):
     def test_attach_invalid_volume_type(self):
         self.create_fake_libvirt_mock()
         libvirt_driver.LibvirtDriver._conn.lookupByName = self.fake_lookup
+        instance = fake_instance.fake_instance_obj(
+            self.context, **self.test_instance)
         self.mox.ReplayAll()
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
         self.assertRaises(exception.VolumeDriverNotFound,
                           conn.attach_volume, None,
                           {"driver_volume_type": "badtype"},
-                          {"name": "fake-instance"},
+                          instance,
                           "/dev/sda")
 
     def test_attach_blockio_invalid_hypervisor(self):
         self.flags(virt_type='fake_type', group='libvirt')
         self.create_fake_libvirt_mock()
         libvirt_driver.LibvirtDriver._conn.lookupByName = self.fake_lookup
+        instance = fake_instance.fake_instance_obj(
+            self.context, **self.test_instance)
         self.mox.ReplayAll()
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
         self.assertRaises(exception.InvalidHypervisorType,
@@ -4909,7 +4913,7 @@ def test_attach_blockio_invalid_hypervisor(self):
                            "data": {"logical_block_size": "4096",
                                     "physical_block_size": "4096"}
                           },
-                          {"name": "fake-instance"},
+                          instance,
                           "/dev/sda")
 
     def test_attach_blockio_invalid_version(self):
@@ -4918,6 +4922,8 @@ def get_lib_version_stub():
         self.flags(virt_type='qemu', group='libvirt')
         self.create_fake_libvirt_mock()
         libvirt_driver.LibvirtDriver._conn.lookupByName = self.fake_lookup
+        instance = fake_instance.fake_instance_obj(
+            self.context, **self.test_instance)
         self.mox.ReplayAll()
         conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
         self.stubs.Set(self.conn, "getLibVersion", get_lib_version_stub)
@@ -4927,7 +4933,7 @@ def get_lib_version_stub():
                            "data": {"logical_block_size": "4096",
                                     "physical_block_size": "4096"}
                           },
-                          {"name": "fake-instance"},
+                          instance,
                           "/dev/sda")
 
     @mock.patch('nova.virt.libvirt.blockinfo.get_info_from_bdm')

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
@@ -1329,7 +1329,7 @@ def _get_volume_encryptor(self, connection_info, encryption):
 
     def attach_volume(self, context, connection_info, instance, mountpoint,
                       disk_bus=None, device_type=None, encryption=None):
-        instance_name = instance['name']
+        instance_name = instance.name
         virt_dom = self._lookup_by_name(instance_name)
         disk_dev = mountpoint.rpartition("/")[2]
         bdm = {