Provide the entire response object for all methods of the v2 ImageClient. The equivalent change for the v1 ImageClient (change 208045) included the temporary addition of a class method that was to be removed when the equivalent changes were made to the v2 client. However, it turns out that for the method in question the v2 client was already returning the full response object which can be used as-is. The additional class method was therefore removed and a better change was made instead. partially implements: blueprint method-return-value-and-move-service-clients-to-lib Change-Id: I98c6a1685e4f3549faf1b567c6c6b193b6d644a2
185 lines
5.7 KiB
Python
185 lines
5.7 KiB
Python
# Copyright 2013 IBM Corp.
|
|
#
|
|
# 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.
|
|
|
|
from oslo_log import log as logging
|
|
from six import moves
|
|
from tempest_lib import exceptions as lib_exc
|
|
|
|
from tempest.common.utils import data_utils
|
|
from tempest import config
|
|
import tempest.test
|
|
|
|
CONF = config.CONF
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class BaseImageTest(tempest.test.BaseTestCase):
|
|
"""Base test class for Image API tests."""
|
|
|
|
credentials = ['primary']
|
|
|
|
@classmethod
|
|
def skip_checks(cls):
|
|
super(BaseImageTest, cls).skip_checks()
|
|
if not CONF.service_available.glance:
|
|
skip_msg = ("%s skipped as glance is not available" % cls.__name__)
|
|
raise cls.skipException(skip_msg)
|
|
|
|
@classmethod
|
|
def setup_credentials(cls):
|
|
cls.set_network_resources()
|
|
super(BaseImageTest, cls).setup_credentials()
|
|
|
|
@classmethod
|
|
def resource_setup(cls):
|
|
super(BaseImageTest, cls).resource_setup()
|
|
cls.created_images = []
|
|
|
|
@classmethod
|
|
def resource_cleanup(cls):
|
|
for image_id in cls.created_images:
|
|
try:
|
|
cls.client.delete_image(image_id)
|
|
except lib_exc.NotFound:
|
|
pass
|
|
|
|
for image_id in cls.created_images:
|
|
cls.client.wait_for_resource_deletion(image_id)
|
|
super(BaseImageTest, cls).resource_cleanup()
|
|
|
|
@classmethod
|
|
def create_image(cls, **kwargs):
|
|
"""Wrapper that returns a test image."""
|
|
name = data_utils.rand_name(cls.__name__ + "-instance")
|
|
|
|
if 'name' in kwargs:
|
|
name = kwargs.pop('name')
|
|
|
|
container_format = kwargs.pop('container_format')
|
|
disk_format = kwargs.pop('disk_format')
|
|
|
|
image = cls.client.create_image(name, container_format,
|
|
disk_format, **kwargs)
|
|
# Image objects returned by the v1 client have the image
|
|
# data inside a dict that is keyed against 'image'.
|
|
if 'image' in image:
|
|
image = image['image']
|
|
cls.created_images.append(image['id'])
|
|
return image
|
|
|
|
|
|
class BaseV1ImageTest(BaseImageTest):
|
|
|
|
@classmethod
|
|
def skip_checks(cls):
|
|
super(BaseV1ImageTest, cls).skip_checks()
|
|
if not CONF.image_feature_enabled.api_v1:
|
|
msg = "Glance API v1 not supported"
|
|
raise cls.skipException(msg)
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(BaseV1ImageTest, cls).setup_clients()
|
|
cls.client = cls.os.image_client
|
|
|
|
|
|
class BaseV1ImageMembersTest(BaseV1ImageTest):
|
|
|
|
credentials = ['primary', 'alt']
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(BaseV1ImageMembersTest, cls).setup_clients()
|
|
cls.alt_img_cli = cls.os_alt.image_client
|
|
|
|
@classmethod
|
|
def resource_setup(cls):
|
|
super(BaseV1ImageMembersTest, cls).resource_setup()
|
|
cls.alt_tenant_id = cls.alt_img_cli.tenant_id
|
|
|
|
def _create_image(self):
|
|
image_file = moves.cStringIO(data_utils.random_bytes())
|
|
image = self.create_image(container_format='bare',
|
|
disk_format='raw',
|
|
is_public=False,
|
|
data=image_file)
|
|
image_id = image['id']
|
|
return image_id
|
|
|
|
|
|
class BaseV2ImageTest(BaseImageTest):
|
|
|
|
@classmethod
|
|
def skip_checks(cls):
|
|
super(BaseV2ImageTest, cls).skip_checks()
|
|
if not CONF.image_feature_enabled.api_v2:
|
|
msg = "Glance API v2 not supported"
|
|
raise cls.skipException(msg)
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(BaseV2ImageTest, cls).setup_clients()
|
|
cls.client = cls.os.image_client_v2
|
|
|
|
|
|
class BaseV2MemberImageTest(BaseV2ImageTest):
|
|
|
|
credentials = ['primary', 'alt']
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(BaseV2MemberImageTest, cls).setup_clients()
|
|
cls.os_img_client = cls.os.image_client_v2
|
|
cls.alt_img_client = cls.os_alt.image_client_v2
|
|
|
|
@classmethod
|
|
def resource_setup(cls):
|
|
super(BaseV2MemberImageTest, cls).resource_setup()
|
|
cls.alt_tenant_id = cls.alt_img_client.tenant_id
|
|
|
|
def _list_image_ids_as_alt(self):
|
|
image_list = self.alt_img_client.list_images()['images']
|
|
image_ids = map(lambda x: x['id'], image_list)
|
|
return image_ids
|
|
|
|
def _create_image(self):
|
|
name = data_utils.rand_name('image')
|
|
image = self.os_img_client.create_image(name,
|
|
container_format='bare',
|
|
disk_format='raw')
|
|
image_id = image['id']
|
|
self.addCleanup(self.os_img_client.delete_image, image_id)
|
|
return image_id
|
|
|
|
|
|
class BaseV1ImageAdminTest(BaseImageTest):
|
|
credentials = ['admin', 'primary']
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(BaseV1ImageAdminTest, cls).setup_clients()
|
|
cls.client = cls.os.image_client
|
|
cls.admin_client = cls.os_adm.image_client
|
|
|
|
|
|
class BaseV2ImageAdminTest(BaseImageTest):
|
|
credentials = ['admin', 'primary']
|
|
|
|
@classmethod
|
|
def setup_clients(cls):
|
|
super(BaseV2ImageAdminTest, cls).setup_clients()
|
|
cls.client = cls.os.image_client_v2
|
|
cls.admin_client = cls.os_adm.image_client_v2
|