diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-04 01:50:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-04 01:50:33 +0000 |
| commit | 7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2 (patch) | |
| tree | d1b34b646f95d8378760cff6cc642d247251b8fc /nova/api | |
| parent | dae70c8f446aa04d76051716a0730a5a520fc463 (diff) | |
| parent | b957a3553e9274043e6ad55a92ceb91c22ca2265 (diff) | |
| download | nova-7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2.tar.gz nova-7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2.tar.xz nova-7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2.zip | |
Merge "Add API samples to images api"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/image_metadata.py | 2 | ||||
| -rw-r--r-- | nova/api/openstack/compute/views/images.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py index 516b25d88..4273e40cd 100644 --- a/nova/api/openstack/compute/image_metadata.py +++ b/nova/api/openstack/compute/image_metadata.py @@ -66,7 +66,7 @@ class Controller(object): image['properties'][key] = value common.check_img_metadata_properties_quota(context, image['properties']) - self.image_service.update(context, image_id, image, None) + image = self.image_service.update(context, image_id, image, None) return dict(metadata=image['properties']) @wsgi.serializers(xml=common.MetaItemTemplate) diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index 5d16ac1de..c0ea71385 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -120,7 +120,7 @@ class ViewBuilder(common.ViewBuilder): }] def _get_alternate_link(self, request, identifier): - """Create an alternate link for a specific flavor id.""" + """Create an alternate link for a specific image id.""" glance_url = utils.generate_glance_url() glance_url = self._update_link_prefix(glance_url, FLAGS.osapi_glance_link_prefix) |