diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-06 18:08:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-06 18:08:56 +0000 |
| commit | cfa666838f4d283a2561c4d731fb5d42d93c3efa (patch) | |
| tree | 04f88959d3b4938d94c719560e8ba6e309776283 /nova | |
| parent | 5f1b486f03aaa12d48d86f48be966a18ff7b7029 (diff) | |
| parent | b4ed5b55be3cce096dd1513ea9ed9d9a70d4fa56 (diff) | |
Merge "refactor: extract _attach_mapped_block_devices"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/virt/xenapi/driver.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index a928bf861..4d032e891 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -181,13 +181,7 @@ class XenAPIDriver(driver.ComputeDriver): """Finish reverting a resize, powering back on the instance""" # NOTE(vish): Xen currently does not use network info. self._vmops.finish_revert_migration(instance) - block_device_mapping = driver.block_device_info_get_mapping( - block_device_info) - for vol in block_device_mapping: - connection_info = vol['connection_info'] - mount_device = vol['mount_device'].rpartition("/")[2] - self.attach_volume(connection_info, - instance['name'], mount_device) + self._attach_mapped_block_devices(instance, block_device_info) def finish_migration(self, context, migration, instance, disk_info, network_info, image_meta, resize_instance=False, @@ -195,6 +189,9 @@ class XenAPIDriver(driver.ComputeDriver): """Completes a resize, turning on the migrated instance""" self._vmops.finish_migration(context, migration, instance, disk_info, network_info, image_meta, resize_instance) + self._attach_mapped_block_devices(instance, block_device_info) + + def _attach_mapped_block_devices(self, instance, block_device_info): block_device_mapping = driver.block_device_info_get_mapping( block_device_info) for vol in block_device_mapping: |