diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-05-25 08:34:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-05-25 08:34:43 +0000 |
| commit | b2f875cd10883c8edfaac7eb9492bec68fcd7f72 (patch) | |
| tree | aea089f8d490698924986cc4f09dc765e894fe6c /nova/api | |
| parent | 76d6dee94df6a73062b5e4254139c2d4968cfb82 (diff) | |
| parent | 5122269147252d3f83b782b9909a07a99152dc95 (diff) | |
| download | nova-b2f875cd10883c8edfaac7eb9492bec68fcd7f72.tar.gz | |
Merge "Align internal image API with volume and network"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/plugins/v3/servers.py | 6 | ||||
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index 70c0523be5..b324a4c1f7 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -903,13 +903,11 @@ class ServersController(wsgi.Controller): img = instance['image_ref'] if not img: props = bdms.root_metadata( - context, self.compute_api.image_service, + context, self.compute_api.image_api, self.compute_api.volume_api) image_meta = {'properties': props} else: - src_image = self.compute_api.\ - image_service.show(context, img) - image_meta = dict(src_image) + image_meta = self.compute_api.image_api.get(context, img) image = self.compute_api.snapshot_volume_backed( context, diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index b11db3b0bd..831eb9ff9b 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -1443,13 +1443,11 @@ class Controller(wsgi.Controller): img = instance['image_ref'] if not img: props = bdms.root_metadata( - context, self.compute_api.image_service, + context, self.compute_api.image_api, self.compute_api.volume_api) image_meta = {'properties': props} else: - src_image = self.compute_api.image_service.\ - show(context, img) - image_meta = dict(src_image) + image_meta = self.compute_api.image_api.get(context, img) image = self.compute_api.snapshot_volume_backed( context, |