Merge "Expose 'host' field via image API"
This commit is contained in:
commit
697ec79b5a
@ -23,7 +23,8 @@ _basic_keys = (
|
|||||||
'tag',
|
'tag',
|
||||||
'size',
|
'size',
|
||||||
'project_id',
|
'project_id',
|
||||||
'image_pull_policy'
|
'image_pull_policy',
|
||||||
|
'host'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -125,6 +125,8 @@ class TestImageController(api_base.FunctionalTest):
|
|||||||
self.assertEqual(1, len(actual_images))
|
self.assertEqual(1, len(actual_images))
|
||||||
self.assertEqual(test_image['uuid'],
|
self.assertEqual(test_image['uuid'],
|
||||||
actual_images[0].get('uuid'))
|
actual_images[0].get('uuid'))
|
||||||
|
self.assertEqual(test_image['host'],
|
||||||
|
actual_images[0].get('host'))
|
||||||
|
|
||||||
@patch('zun.common.policy.enforce')
|
@patch('zun.common.policy.enforce')
|
||||||
@patch('zun.objects.Image.get_by_uuid')
|
@patch('zun.objects.Image.get_by_uuid')
|
||||||
@ -141,6 +143,8 @@ class TestImageController(api_base.FunctionalTest):
|
|||||||
self.assertEqual(200, response.status_int)
|
self.assertEqual(200, response.status_int)
|
||||||
self.assertEqual(test_image['uuid'],
|
self.assertEqual(test_image['uuid'],
|
||||||
response.json['uuid'])
|
response.json['uuid'])
|
||||||
|
self.assertEqual(test_image['host'],
|
||||||
|
response.json['host'])
|
||||||
|
|
||||||
@mock.patch('zun.common.policy.enforce', return_value=True)
|
@mock.patch('zun.common.policy.enforce', return_value=True)
|
||||||
@patch('zun.objects.Image.list')
|
@patch('zun.objects.Image.list')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user