summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorNaveed Massjouni <naveedm9@gmail.com>2011-05-19 10:52:23 -0400
committerNaveed Massjouni <naveedm9@gmail.com>2011-05-19 10:52:23 -0400
commitbeea6545804dc17661eea83b373d74d14cf07c32 (patch)
tree86521834ca85f1cee5fc3bec4de79445cc5dd73e /nova/api
parent64e9aa6daa416662a25eeab0d943b23906695e92 (diff)
Minor cleanup
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/images.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index c2511b99f..ac02d63c5 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -50,8 +50,7 @@ class Controller(common.OpenstackController):
"""
self._compute_service = compute_service or compute.API()
- self._image_service = image_service or \
- utils.get_default_image_service()
+ self._image_service = image_service or utils.get_default_image_service()
def index(self, req):
"""Return an index listing of images available to the request.
@@ -75,14 +74,13 @@ class Controller(common.OpenstackController):
builder = self.get_builder(req).build
return dict(images=[builder(image, detail=True) for image in images])
- def show(self, req, id):
+ def show(self, req, image_id):
"""Return detailed information about a specific image.
:param req: `wsgi.Request` object
- :param id: Image identifier (integer)
+ :param image_id: Image identifier (integer)
"""
context = req.environ['nova.context']
- image_id = id
try:
(image_service, service_image_id) = utils.get_image_service(