Stop looking for v2 image in container

The v2 API no longer returns images in JSON containers like
'{"image": {...}}', so stop trying to decode the responses
as if it does.

Fix bug 1031185

Change-Id: I5209fe76445d4195b12944146a0ef190883f363f
This commit is contained in:
Brian Waldon
2012-07-30 20:50:27 -07:00
parent 5189d58d63
commit c24ea3f848
2 changed files with 4 additions and 6 deletions

View File

@@ -52,5 +52,5 @@ class Controller(object):
resp, body = self.http_client.json_request('GET', url)
#NOTE(bcwaldon): remove 'self' for now until we have an elegant
# way to pass it into the model constructor without conflict
body['image'].pop('self', None)
return self.model(**body['image'])
body.pop('self', None)
return self.model(**body)

View File

@@ -67,11 +67,9 @@ fixtures = {
'GET': (
{},
{
'image': {
'id': '3a4560a1-e585-443e-9b39-553b46ec92d1',
'name': 'image-1',
},
},
),
},
}