diff options
| author | Mate Lakat <mate.lakat@citrix.com> | 2012-10-29 14:52:01 +0000 |
|---|---|---|
| committer | Mate Lakat <mate.lakat@citrix.com> | 2012-10-30 13:42:07 +0000 |
| commit | c08a105b8e71f1010ec88715c2f04b84d2a0d5bd (patch) | |
| tree | 7c10572347fe382edc4bfe2a673762e12a0daeaf | |
| parent | 0882acd3644161086019407db818aa860b96f561 (diff) | |
| download | nova-c08a105b8e71f1010ec88715c2f04b84d2a0d5bd.tar.gz nova-c08a105b8e71f1010ec88715c2f04b84d2a0d5bd.tar.xz nova-c08a105b8e71f1010ec88715c2f04b84d2a0d5bd.zip | |
refactor: extract _terminate_volume_connections
Extract _terminate_volume_connections method, to remove code
duplication.
Change-Id: Ib9bede24d051700fe297fdd5a619f4a3a21bb88e
| -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 24a040d7e..9515d223c 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1502,14 +1502,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) @@ -1681,14 +1676,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, @@ -1711,6 +1699,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 |