f92973d7f8
The current Image can only receive the basics returned by a GET /images, which is just name, id, and links. A call to /images/detail gives a number of added details, some of which were already in the Image resource but not set. This change follows with how a few other basic/detail requests were done, and exposes it through the proxy with details coming by default (since they're likely expected, and most useful). Change-Id: Iadc98cd0f679777b1c6e14711ad00787142221e2
84 lines
3.0 KiB
Python
84 lines
3.0 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import testtools
|
|
|
|
from openstack.compute.v2 import image
|
|
|
|
IDENTIFIER = 'IDENTIFIER'
|
|
BASIC_EXAMPLE = {
|
|
'id': IDENTIFIER,
|
|
'links': '2',
|
|
'name': '3',
|
|
}
|
|
|
|
DETAILS = {
|
|
'created': '1',
|
|
'metadata': {'key': '2'},
|
|
'minDisk': 3,
|
|
'minRam': 4,
|
|
'progress': 5,
|
|
'status': '6',
|
|
'updated': '7',
|
|
'OS-EXT-IMG-SIZE:size': 8
|
|
}
|
|
|
|
DETAIL_EXAMPLE = BASIC_EXAMPLE.copy()
|
|
DETAIL_EXAMPLE.update(DETAILS)
|
|
|
|
|
|
class TestImage(testtools.TestCase):
|
|
|
|
def test_basic(self):
|
|
sot = image.Image()
|
|
self.assertEqual('image', sot.resource_key)
|
|
self.assertEqual('images', sot.resources_key)
|
|
self.assertEqual('/images', sot.base_path)
|
|
self.assertEqual('compute', sot.service.service_type)
|
|
self.assertFalse(sot.allow_create)
|
|
self.assertTrue(sot.allow_retrieve)
|
|
self.assertFalse(sot.allow_update)
|
|
self.assertTrue(sot.allow_delete)
|
|
self.assertTrue(sot.allow_list)
|
|
|
|
def test_make_basic(self):
|
|
sot = image.Image(BASIC_EXAMPLE)
|
|
self.assertEqual(BASIC_EXAMPLE['id'], sot.id)
|
|
self.assertEqual(BASIC_EXAMPLE['links'], sot.links)
|
|
self.assertEqual(BASIC_EXAMPLE['name'], sot.name)
|
|
|
|
def test_detail(self):
|
|
sot = image.ImageDetail()
|
|
self.assertEqual('image', sot.resource_key)
|
|
self.assertEqual('images', sot.resources_key)
|
|
self.assertEqual('/images/detail', sot.base_path)
|
|
self.assertEqual('compute', sot.service.service_type)
|
|
self.assertFalse(sot.allow_create)
|
|
self.assertFalse(sot.allow_retrieve)
|
|
self.assertFalse(sot.allow_update)
|
|
self.assertFalse(sot.allow_delete)
|
|
self.assertTrue(sot.allow_list)
|
|
|
|
def test_make_detail(self):
|
|
sot = image.ImageDetail(DETAIL_EXAMPLE)
|
|
self.assertEqual(DETAIL_EXAMPLE['created'], sot.created)
|
|
self.assertEqual(DETAIL_EXAMPLE['id'], sot.id)
|
|
self.assertEqual(DETAIL_EXAMPLE['links'], sot.links)
|
|
self.assertEqual(DETAIL_EXAMPLE['metadata'], sot.metadata)
|
|
self.assertEqual(DETAIL_EXAMPLE['minDisk'], sot.min_disk)
|
|
self.assertEqual(DETAIL_EXAMPLE['minRam'], sot.min_ram)
|
|
self.assertEqual(DETAIL_EXAMPLE['name'], sot.name)
|
|
self.assertEqual(DETAIL_EXAMPLE['progress'], sot.progress)
|
|
self.assertEqual(DETAIL_EXAMPLE['status'], sot.status)
|
|
self.assertEqual(DETAIL_EXAMPLE['updated'], sot.updated)
|
|
self.assertEqual(DETAIL_EXAMPLE['OS-EXT-IMG-SIZE:size'], sot.size)
|