diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-25 20:12:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-25 20:12:55 +0000 |
| commit | 2f97345472a8bafa17c425bccfb7b81b46b8d6d5 (patch) | |
| tree | 4d400630a804abc00d1e9586667cfac0516758c9 /nova/compute | |
| parent | df47c6d27b40a77f74f87c83e27e7fff404165cf (diff) | |
| parent | e2f2d10e1a59a6688c6f9763fff0fd45578da5eb (diff) | |
Merge "Avoid db lookup in info_from_instance()."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 6 | ||||
| -rw-r--r-- | nova/compute/utils.py | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index d1cffea7d..275611cdf 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1132,8 +1132,7 @@ class ComputeManager(manager.SchedulerDependentManager): vm_state=vm_states.DELETED, task_state=None, terminated_at=timeutils.utcnow()) - system_meta = compute_utils.metadata_to_dict( - instance['system_metadata']) + system_meta = utils.metadata_to_dict(instance['system_metadata']) self.conductor_api.instance_destroy(context, instance) # ensure block device mappings are not leaked @@ -1675,8 +1674,7 @@ class ComputeManager(manager.SchedulerDependentManager): def _get_rescue_image_ref(self, context, instance): """Determine what image should be used to boot the rescue VM.""" - system_meta = compute_utils.metadata_to_dict( - instance['system_metadata']) + system_meta = utils.metadata_to_dict(instance['system_metadata']) rescue_image_ref = system_meta.get('image_base_image_ref') diff --git a/nova/compute/utils.py b/nova/compute/utils.py index 2b1286e16..1874e886f 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -37,13 +37,6 @@ CONF.import_opt('host', 'nova.netconf') LOG = log.getLogger(__name__) -def metadata_to_dict(metadata): - result = {} - for item in metadata: - result[item['key']] = item['value'] - return result - - def add_instance_fault_from_exc(context, instance, fault, exc_info=None): """Adds the specified fault to the database.""" @@ -159,7 +152,8 @@ def notify_usage_exists(context, instance_ref, current_period=False, ignore_missing_network_data) if system_metadata is None: - system_metadata = metadata_to_dict(instance_ref['system_metadata']) + system_metadata = utils.metadata_to_dict( + instance_ref['system_metadata']) # add image metadata to the notification: image_meta = notifications.image_meta(system_metadata) |