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/virt | |
| parent | df47c6d27b40a77f74f87c83e27e7fff404165cf (diff) | |
| parent | e2f2d10e1a59a6688c6f9763fff0fd45578da5eb (diff) | |
Merge "Avoid db lookup in info_from_instance()."
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 52a5f37b2..582a9320a 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -196,13 +196,6 @@ class ImageType(object): }.get(image_type_id) -def _system_metadata_to_dict(system_metadata): - result = {} - for item in system_metadata: - result[item['key']] = item['value'] - return result - - def create_vm(session, instance, name_label, kernel, ramdisk, use_pv_kernel=False): """Create a VM record. Returns new VM reference. @@ -994,7 +987,7 @@ def _create_image(context, session, instance, name_label, image_id, elif cache_images == 'all': cache = True elif cache_images == 'some': - sys_meta = _system_metadata_to_dict(instance['system_metadata']) + sys_meta = utils.metadata_to_dict(instance['system_metadata']) try: cache = utils.bool_from_str(sys_meta['image_cache_in_nova']) except KeyError: @@ -1087,7 +1080,7 @@ def _image_uses_bittorrent(context, instance): if xenapi_torrent_images == 'all': bittorrent = True elif xenapi_torrent_images == 'some': - sys_meta = _system_metadata_to_dict(instance['system_metadata']) + sys_meta = utils.metadata_to_dict(instance['system_metadata']) try: bittorrent = utils.bool_from_str(sys_meta['image_bittorrent']) except KeyError: |