diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-30 18:25:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-30 18:25:34 +0000 |
| commit | 7aea941005deda6f057e1e1692018d81c4aebcdc (patch) | |
| tree | 3a53caa06dadabf12e7d343d7570257ffade6d65 | |
| parent | 774a28a20aec1a853f29e586682b9a33a6bbad60 (diff) | |
| parent | c08a105b8e71f1010ec88715c2f04b84d2a0d5bd (diff) | |
Merge "refactor: extract _terminate_volume_connections"
| -rw-r--r-- | nova/compute/manager.py | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 4a40c9f42..407e26c8a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1497,14 +1497,9 @@ class ComputeManager(manager.SchedulerDependentManager): self.driver.destroy(instance, self._legacy_nw_info(network_info), block_device_info) - # Terminate volume connections. - bdms = self._get_instance_volume_bdms(context, instance['uuid']) - if bdms: - connector = self.driver.get_volume_connector(instance) - for bdm in bdms: - volume = self.volume_api.get(context, bdm['volume_id']) - self.volume_api.terminate_connection(context, volume, - connector) + + self._terminate_volume_connections(context, instance) + self.compute_rpcapi.finish_revert_resize(context, instance, migration_ref['id'], migration_ref['source_compute'], reservations) @@ -1676,14 +1671,7 @@ class ComputeManager(manager.SchedulerDependentManager): instance_type_ref, self._legacy_nw_info(network_info), block_device_info) - # Terminate volume connections. - bdms = self._get_instance_volume_bdms(context, instance['uuid']) - if bdms: - connector = self.driver.get_volume_connector(instance) - for bdm in bdms: - volume = self.volume_api.get(context, bdm['volume_id']) - self.volume_api.terminate_connection(context, volume, - connector) + self._terminate_volume_connections(context, instance) if migration['dest_compute'] != migration['source_compute']: self.network_api.migrate_instance_start(context, instance, @@ -1706,6 +1694,15 @@ class ComputeManager(manager.SchedulerDependentManager): self._notify_about_instance_usage(context, instance, "resize.end", network_info=network_info) + def _terminate_volume_connections(self, context, instance): + bdms = self._get_instance_volume_bdms(context, instance['uuid']) + if bdms: + connector = self.driver.get_volume_connector(instance) + for bdm in bdms: + volume = self.volume_api.get(context, bdm['volume_id']) + self.volume_api.terminate_connection(context, volume, + connector) + def _finish_resize(self, context, instance, migration, disk_info, image): resize_instance = False |