diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-05-17 19:10:11 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-05-17 19:10:11 -0400 |
| commit | dacb4899ea631840fd95ee0bd25d999fbb16b8b4 (patch) | |
| tree | 67c75f06630fde31722f9ef6d8c886dd1b946e2e | |
| parent | 5d35b548316eccd5a8454ccf7424ebe60aaf54e6 (diff) | |
use utils.get_image_service in compute_api
| -rw-r--r-- | nova/compute/api.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index a12f8d515..930e4efaa 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -156,7 +156,8 @@ class API(base.Base): self._check_metadata_properties_quota(context, metadata) self._check_injected_file_quota(context, injected_files) - image = self.image_service.show(context, image_id) + (image_service, service_image_id) = utils.get_image_service(image_id) + image = image_service.show(context, service_image_id) os_type = None if 'properties' in image and 'os_type' in image['properties']: @@ -176,9 +177,9 @@ class API(base.Base): logging.debug("Using Kernel=%s, Ramdisk=%s" % (kernel_id, ramdisk_id)) if kernel_id: - self.image_service.show(context, kernel_id) + image_service.show(context, kernel_id) if ramdisk_id: - self.image_service.show(context, ramdisk_id) + image_service.show(context, ramdisk_id) if security_group is None: security_group = ['default'] @@ -515,6 +516,8 @@ class API(base.Base): 'user_id': str(context.user_id)} sent_meta = {'name': name, 'is_public': False, 'properties': properties} + # TODO(wwolf): not sure if we need to use + # utils.get_image_service() here ? recv_meta = self.image_service.create(context, sent_meta) params = {'image_id': recv_meta['id']} self._cast_compute_message('snapshot_instance', context, instance_id, |