summaryrefslogtreecommitdiffstats
path: root/nova/image
diff options
context:
space:
mode:
authorBrian Waldon <bcwaldon@gmail.com>2012-06-27 11:00:14 -0700
committerBrian Waldon <bcwaldon@gmail.com>2012-06-27 15:20:54 -0700
commit2861952ef7acd0d7cff8f039ee14105f12bea717 (patch)
treec6deb94c0f17e7ac7d44ecc51dcdff3fb633dd12 /nova/image
parent0ca1c1943e6a07e7a107f38f56227768022de3dc (diff)
downloadnova-2861952ef7acd0d7cff8f039ee14105f12bea717.tar.gz
nova-2861952ef7acd0d7cff8f039ee14105f12bea717.tar.xz
nova-2861952ef7acd0d7cff8f039ee14105f12bea717.zip
Remove GlanceImageService.index in favor of detail
Since there is no difference in index vs detail in the v2 API, let's drop that as a requirement in the GlanceImageService. Related to bp integrate-python-glanceclient Change-Id: If98cf68e7e18fa78a2f9c09526ca9e80d2e27c1b
Diffstat (limited to 'nova/image')
-rw-r--r--nova/image/glance.py15
-rw-r--r--nova/image/s3.py6
2 files changed, 0 insertions, 21 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py
index 3a4099338..c01a7b957 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -156,21 +156,6 @@ class GlanceImageService(object):
raise exception.GlanceConnectionFailed(
reason=_('Maximum attempts reached'))
- def index(self, context, **kwargs):
- """Calls out to Glance for a list of images available."""
- params = self._extract_query_params(kwargs)
- image_metas = self._get_images(context, **params)
-
- images = []
- for image_meta in image_metas:
- # NOTE(sirp): We need to use `get_images_detailed` and not
- # `get_images` here because we need `is_public` and `properties`
- # included so we can filter by user
- if self._is_image_available(context, image_meta):
- meta_subset = utils.subset_dict(image_meta, ('id', 'name'))
- images.append(meta_subset)
- return images
-
def detail(self, context, **kwargs):
"""Calls out to Glance for a list of detailed image information."""
params = self._extract_query_params(kwargs)
diff --git a/nova/image/s3.py b/nova/image/s3.py
index 318847791..df2758b3a 100644
--- a/nova/image/s3.py
+++ b/nova/image/s3.py
@@ -136,12 +136,6 @@ class S3ImageService(object):
image = self.service.update(context, image_uuid, metadata, data)
return self._translate_uuid_to_id(context, image)
- def index(self, context):
- #NOTE(bcwaldon): sort asc to make sure we assign lower ids
- # to older images
- images = self.service.index(context, sort_dir='asc')
- return self._translate_uuids_to_ids(context, images)
-
def detail(self, context, **kwargs):
#NOTE(bcwaldon): sort asc to make sure we assign lower ids
# to older images