Rename compute images_client to compute_images_client
We have two image client one from nova and another from glance. Nove- cls.images_client glance- cls.image_client Both names are very confusing to use or debug. This commit rename the nova images_client to compute_images_client in Manager and in test cases too. Partially implements blueprint consistent-service-method-names Change-Id: I5d67a8ef91b522b5d96011e3039f784caec76b03
This commit is contained in:
parent
a805a7d3a2
commit
ae76c1208f
@ -63,7 +63,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
|
||||
cls.servers_client = cls.os.servers_client
|
||||
cls.server_groups_client = cls.os.server_groups_client
|
||||
cls.flavors_client = cls.os.flavors_client
|
||||
cls.images_client = cls.os.images_client
|
||||
cls.compute_images_client = cls.os.compute_images_client
|
||||
cls.extensions_client = cls.os.extensions_client
|
||||
cls.floating_ip_pools_client = cls.os.floating_ip_pools_client
|
||||
cls.floating_ips_client = cls.os.compute_floating_ips_client
|
||||
@ -170,7 +170,7 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
|
||||
LOG.debug('Clearing images: %s', ','.join(cls.images))
|
||||
for image_id in cls.images:
|
||||
try:
|
||||
cls.images_client.delete_image(image_id)
|
||||
cls.compute_images_client.delete_image(image_id)
|
||||
except lib_exc.NotFound:
|
||||
# The image may have already been deleted which is OK.
|
||||
pass
|
||||
@ -295,14 +295,14 @@ class BaseV2ComputeTest(api_version_utils.BaseMicroversionTest,
|
||||
if 'name' in kwargs:
|
||||
name = kwargs.pop('name')
|
||||
|
||||
image = cls.images_client.create_image(server_id, name=name)
|
||||
image = cls.compute_images_client.create_image(server_id, name=name)
|
||||
image_id = data_utils.parse_image_id(image.response['location'])
|
||||
cls.images.append(image_id)
|
||||
|
||||
if 'wait_until' in kwargs:
|
||||
waiters.wait_for_image_status(cls.images_client,
|
||||
waiters.wait_for_image_status(cls.compute_images_client,
|
||||
image_id, kwargs['wait_until'])
|
||||
image = cls.images_client.show_image(image_id)['image']
|
||||
image = cls.compute_images_client.show_image(image_id)['image']
|
||||
|
||||
if kwargs['wait_until'] == 'ACTIVE':
|
||||
if kwargs.get('wait_for_server', True):
|
||||
|
@ -37,7 +37,7 @@ class ImagesMetadataTestJSON(base.BaseV2ComputeTest):
|
||||
def setup_clients(cls):
|
||||
super(ImagesMetadataTestJSON, cls).setup_clients()
|
||||
cls.glance_client = cls.os.image_client
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
|
@ -25,7 +25,7 @@ class ImagesMetadataTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ImagesMetadataTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
|
||||
@test.attr(type=['negative'])
|
||||
@test.idempotent_id('94069db2-792f-4fa8-8bd3-2271a6e0c095')
|
||||
|
@ -37,7 +37,7 @@ class ImagesTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ImagesTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
cls.servers_client = cls.servers_client
|
||||
|
||||
@test.idempotent_id('aa06b52b-2db5-4807-b218-9441f75d74e3')
|
||||
|
@ -39,7 +39,7 @@ class ImagesNegativeTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ImagesNegativeTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
cls.servers_client = cls.servers_client
|
||||
|
||||
@test.attr(type=['negative'])
|
||||
|
@ -62,7 +62,7 @@ class ImagesOneServerTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ImagesOneServerTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
|
@ -76,7 +76,7 @@ class ImagesOneServerNegativeTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ImagesOneServerNegativeTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
|
||||
@classmethod
|
||||
def resource_setup(cls):
|
||||
|
@ -42,7 +42,7 @@ class ListImageFiltersTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ListImageFiltersTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
cls.glance_client = cls.os.image_client
|
||||
|
||||
@classmethod
|
||||
|
@ -34,7 +34,7 @@ class ListImageFiltersNegativeTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ListImageFiltersNegativeTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
|
||||
@test.attr(type=['negative'])
|
||||
@test.idempotent_id('391b0440-432c-4d4b-b5da-c5096aa247eb')
|
||||
|
@ -32,7 +32,7 @@ class ListImagesTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def setup_clients(cls):
|
||||
super(ListImagesTestJSON, cls).setup_clients()
|
||||
cls.client = cls.images_client
|
||||
cls.client = cls.compute_images_client
|
||||
|
||||
@test.idempotent_id('490d0898-e12a-463f-aef0-c50156b9f789')
|
||||
def test_get_image(self):
|
||||
|
@ -43,7 +43,7 @@ class ListServerFiltersTestJSON(base.BaseV2ComputeTest):
|
||||
super(ListServerFiltersTestJSON, cls).resource_setup()
|
||||
|
||||
# Check to see if the alternate image ref actually exists...
|
||||
images_client = cls.images_client
|
||||
images_client = cls.compute_images_client
|
||||
images = images_client.list_images()['images']
|
||||
|
||||
if cls.image_ref != cls.image_ref_alt and \
|
||||
@ -56,13 +56,13 @@ class ListServerFiltersTestJSON(base.BaseV2ComputeTest):
|
||||
# Do some sanity checks here. If one of the images does
|
||||
# not exist, fail early since the tests won't work...
|
||||
try:
|
||||
cls.images_client.show_image(cls.image_ref)
|
||||
cls.compute_images_client.show_image(cls.image_ref)
|
||||
except lib_exc.NotFound:
|
||||
raise RuntimeError("Image %s (image_ref) was not found!" %
|
||||
cls.image_ref)
|
||||
|
||||
try:
|
||||
cls.images_client.show_image(cls.image_ref_alt)
|
||||
cls.compute_images_client.show_image(cls.image_ref_alt)
|
||||
except lib_exc.NotFound:
|
||||
raise RuntimeError("Image %s (image_ref_alt) was not found!" %
|
||||
cls.image_ref_alt)
|
||||
|
@ -453,7 +453,7 @@ class ServerActionsTestJSON(base.BaseV2ComputeTest):
|
||||
server = self.client.show_server(self.server_id)['server']
|
||||
image_name = server['name'] + '-shelved'
|
||||
params = {'name': image_name}
|
||||
images = self.images_client.list_images(**params)['images']
|
||||
images = self.compute_images_client.list_images(**params)['images']
|
||||
self.assertEqual(1, len(images))
|
||||
self.assertEqual(image_name, images[0]['name'])
|
||||
|
||||
|
@ -490,7 +490,7 @@ class ServersNegativeTestJSON(base.BaseV2ComputeTest):
|
||||
server = self.client.show_server(self.server_id)['server']
|
||||
image_name = server['name'] + '-shelved'
|
||||
params = {'name': image_name}
|
||||
images = self.images_client.list_images(**params)['images']
|
||||
images = self.compute_images_client.list_images(**params)['images']
|
||||
self.assertEqual(1, len(images))
|
||||
self.assertEqual(image_name, images[0]['name'])
|
||||
|
||||
|
@ -48,14 +48,14 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
def setup_clients(cls):
|
||||
super(AuthorizationTestJSON, cls).setup_clients()
|
||||
cls.client = cls.os.servers_client
|
||||
cls.images_client = cls.os.images_client
|
||||
cls.compute_images_client = cls.os.compute_images_client
|
||||
cls.glance_client = cls.os.image_client
|
||||
cls.keypairs_client = cls.os.keypairs_client
|
||||
cls.security_client = cls.os.compute_security_groups_client
|
||||
cls.rule_client = cls.os.security_group_rules_client
|
||||
|
||||
cls.alt_client = cls.alt_manager.servers_client
|
||||
cls.alt_images_client = cls.alt_manager.images_client
|
||||
cls.alt_compute_images_client = cls.alt_manager.compute_images_client
|
||||
cls.alt_keypairs_client = cls.alt_manager.keypairs_client
|
||||
cls.alt_security_client = (
|
||||
cls.alt_manager.compute_security_groups_client)
|
||||
@ -77,7 +77,7 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
body = cls.glance_client.update_image(image_id,
|
||||
data=image_file)['image']
|
||||
cls.glance_client.wait_for_image_status(image_id, 'active')
|
||||
cls.image = cls.images_client.show_image(image_id)['image']
|
||||
cls.image = cls.compute_images_client.show_image(image_id)['image']
|
||||
|
||||
cls.keypairname = data_utils.rand_name('keypair')
|
||||
cls.keypairs_client.create_keypair(name=cls.keypairname)
|
||||
@ -98,7 +98,7 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
@classmethod
|
||||
def resource_cleanup(cls):
|
||||
if hasattr(cls, 'image'):
|
||||
cls.images_client.delete_image(cls.image['id'])
|
||||
cls.compute_images_client.delete_image(cls.image['id'])
|
||||
if hasattr(cls, 'keypairname'):
|
||||
cls.keypairs_client.delete_keypair(cls.keypairname)
|
||||
if hasattr(cls, 'security_group'):
|
||||
@ -175,7 +175,7 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
def test_create_image_for_alt_account_fails(self):
|
||||
# A create image request for another user's server should fail
|
||||
self.assertRaises(lib_exc.NotFound,
|
||||
self.alt_images_client.create_image,
|
||||
self.alt_compute_images_client.create_image,
|
||||
self.server['id'], name='testImage')
|
||||
|
||||
@test.idempotent_id('95d445f6-babc-4f2e-aea3-aa24ec5e7f0d')
|
||||
@ -261,13 +261,14 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
def test_get_image_for_alt_account_fails(self):
|
||||
# A GET request for an image on another user's account should fail
|
||||
self.assertRaises(lib_exc.NotFound,
|
||||
self.alt_images_client.show_image, self.image['id'])
|
||||
self.alt_compute_images_client.show_image,
|
||||
self.image['id'])
|
||||
|
||||
@test.idempotent_id('9facb962-f043-4a9d-b9ee-166a32dea098')
|
||||
def test_delete_image_for_alt_account_fails(self):
|
||||
# A DELETE request for another user's image should fail
|
||||
self.assertRaises(lib_exc.NotFound,
|
||||
self.alt_images_client.delete_image,
|
||||
self.alt_compute_images_client.delete_image,
|
||||
self.image['id'])
|
||||
|
||||
@test.idempotent_id('752c917e-83be-499d-a422-3559127f7d3c')
|
||||
@ -390,7 +391,7 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
# A set metadata for another user's image should fail
|
||||
req_metadata = {'meta1': 'value1', 'meta2': 'value2'}
|
||||
self.assertRaises(lib_exc.NotFound,
|
||||
self.alt_images_client.set_image_metadata,
|
||||
self.alt_compute_images_client.set_image_metadata,
|
||||
self.image['id'], req_metadata)
|
||||
|
||||
@test.idempotent_id('dea1936a-473d-49f2-92ad-97bb7aded22e')
|
||||
@ -408,13 +409,14 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
def test_get_metadata_of_alt_account_image_fails(self):
|
||||
# A get metadata for another user's image should fail
|
||||
req_metadata = {'meta1': 'value1'}
|
||||
self.addCleanup(self.images_client.delete_image_metadata_item,
|
||||
self.addCleanup(self.compute_images_client.delete_image_metadata_item,
|
||||
self.image['id'], 'meta1')
|
||||
self.images_client.set_image_metadata(self.image['id'],
|
||||
req_metadata)
|
||||
self.assertRaises(lib_exc.NotFound,
|
||||
self.alt_images_client.show_image_metadata_item,
|
||||
self.image['id'], 'meta1')
|
||||
self.compute_images_client.set_image_metadata(self.image['id'],
|
||||
req_metadata)
|
||||
self.assertRaises(
|
||||
lib_exc.NotFound,
|
||||
self.alt_compute_images_client.show_image_metadata_item,
|
||||
self.image['id'], 'meta1')
|
||||
|
||||
@test.idempotent_id('79531e2e-e721-493c-8b30-a35db36fdaa6')
|
||||
def test_delete_metadata_of_alt_account_server_fails(self):
|
||||
@ -431,13 +433,14 @@ class AuthorizationTestJSON(base.BaseV2ComputeTest):
|
||||
def test_delete_metadata_of_alt_account_image_fails(self):
|
||||
# A delete metadata for another user's image should fail
|
||||
req_metadata = {'meta1': 'data1'}
|
||||
self.addCleanup(self.images_client.delete_image_metadata_item,
|
||||
self.addCleanup(self.compute_images_client.delete_image_metadata_item,
|
||||
self.image['id'], 'meta1')
|
||||
self.images_client.set_image_metadata(self.image['id'],
|
||||
req_metadata)
|
||||
self.assertRaises(lib_exc.NotFound,
|
||||
self.alt_images_client.delete_image_metadata_item,
|
||||
self.image['id'], 'meta1')
|
||||
self.compute_images_client.set_image_metadata(self.image['id'],
|
||||
req_metadata)
|
||||
self.assertRaises(
|
||||
lib_exc.NotFound,
|
||||
self.alt_compute_images_client.delete_image_metadata_item,
|
||||
self.image['id'], 'meta1')
|
||||
|
||||
@test.idempotent_id('b0c1e7a0-8853-40fd-8384-01f93d116cae')
|
||||
def test_get_console_output_of_alt_account_server_fails(self):
|
||||
|
@ -62,7 +62,7 @@ class BaseVolumeTest(tempest.test.BaseTestCase):
|
||||
super(BaseVolumeTest, cls).setup_clients()
|
||||
cls.servers_client = cls.os.servers_client
|
||||
cls.compute_networks_client = cls.os.compute_networks_client
|
||||
cls.images_client = cls.os.images_client
|
||||
cls.compute_images_client = cls.os.compute_images_client
|
||||
|
||||
if cls._api_version == 1:
|
||||
cls.snapshots_client = cls.os.snapshots_client
|
||||
|
@ -133,7 +133,8 @@ class VolumesV2GetTest(base.BaseVolumeTest):
|
||||
@test.idempotent_id('54a01030-c7fc-447c-86ee-c1182beae638')
|
||||
@test.services('image')
|
||||
def test_volume_create_get_update_delete_from_image(self):
|
||||
image = self.images_client.show_image(CONF.compute.image_ref)['image']
|
||||
image = self.compute_images_client.show_image(
|
||||
CONF.compute.image_ref)['image']
|
||||
min_disk = image.get('minDisk')
|
||||
disk_size = max(min_disk, CONF.volume.volume_size)
|
||||
self._volume_create_get_update_delete(
|
||||
|
@ -346,7 +346,8 @@ class Manager(manager.Manager):
|
||||
self.server_groups_client = ServerGroupsClient(
|
||||
self.auth_provider, **params)
|
||||
self.limits_client = LimitsClient(self.auth_provider, **params)
|
||||
self.images_client = ComputeImagesClient(self.auth_provider, **params)
|
||||
self.compute_images_client = ComputeImagesClient(self.auth_provider,
|
||||
**params)
|
||||
self.keypairs_client = KeyPairsClient(self.auth_provider, **params)
|
||||
self.quotas_client = QuotasClient(self.auth_provider, **params)
|
||||
self.quota_classes_client = QuotaClassesClient(self.auth_provider,
|
||||
|
@ -774,7 +774,7 @@ class FlavorService(BaseService):
|
||||
class ImageService(BaseService):
|
||||
def __init__(self, manager, **kwargs):
|
||||
super(ImageService, self).__init__(kwargs)
|
||||
self.client = manager.images_client
|
||||
self.client = manager.compute_images_client
|
||||
|
||||
def list(self):
|
||||
client = self.client
|
||||
|
@ -52,7 +52,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
|
||||
# Glance image client v1
|
||||
cls.image_client = cls.manager.image_client
|
||||
# Compute image client
|
||||
cls.images_client = cls.manager.images_client
|
||||
cls.compute_images_client = cls.manager.compute_images_client
|
||||
cls.keypairs_client = cls.manager.keypairs_client
|
||||
# Nova security groups client
|
||||
cls.compute_security_groups_client = (
|
||||
@ -470,7 +470,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
|
||||
# Glance client
|
||||
_image_client = self.image_client
|
||||
# Compute client
|
||||
_images_client = self.images_client
|
||||
_images_client = self.compute_images_client
|
||||
if name is None:
|
||||
name = data_utils.rand_name('scenario-snapshot')
|
||||
LOG.debug("Creating a snapshot image for server: %s", server['name'])
|
||||
|
@ -40,11 +40,11 @@ class ImageUtils(object):
|
||||
self.non_ssh_image_pattern = \
|
||||
CONF.input_scenario.non_ssh_image_regex
|
||||
# Setup clients
|
||||
self.images_client = os.images_client
|
||||
self.compute_images_client = os.compute_images_client
|
||||
self.flavors_client = os.flavors_client
|
||||
|
||||
def ssh_user(self, image_id):
|
||||
_image = self.images_client.show_image(image_id)['image']
|
||||
_image = self.compute_images_client.show_image(image_id)['image']
|
||||
for regex, user in self.ssh_users:
|
||||
# First match wins
|
||||
if re.match(regex, _image['name']) is not None:
|
||||
@ -57,14 +57,14 @@ class ImageUtils(object):
|
||||
string=str(image['name']))
|
||||
|
||||
def is_sshable_image(self, image_id):
|
||||
_image = self.images_client.show_image(image_id)['image']
|
||||
_image = self.compute_images_client.show_image(image_id)['image']
|
||||
return self._is_sshable_image(_image)
|
||||
|
||||
def _is_flavor_enough(self, flavor, image):
|
||||
return image['minDisk'] <= flavor['disk']
|
||||
|
||||
def is_flavor_enough(self, flavor_id, image_id):
|
||||
_image = self.images_client.show_image(image_id)['image']
|
||||
_image = self.compute_images_client.show_image(image_id)['image']
|
||||
_flavor = self.flavors_client.show_flavor(flavor_id)['flavor']
|
||||
return self._is_flavor_enough(_flavor, _image)
|
||||
|
||||
@ -108,7 +108,7 @@ class InputScenarioUtils(object):
|
||||
identity_version=CONF.identity.auth_version,
|
||||
network_resources=network_resources)
|
||||
os = clients.Manager(self.cred_provider.get_primary_creds())
|
||||
self.images_client = os.images_client
|
||||
self.compute_images_client = os.compute_images_client
|
||||
self.flavors_client = os.flavors_client
|
||||
self.image_pattern = CONF.input_scenario.image_regex
|
||||
self.flavor_pattern = CONF.input_scenario.flavor_regex
|
||||
@ -128,7 +128,7 @@ class InputScenarioUtils(object):
|
||||
return []
|
||||
if not hasattr(self, '_scenario_images'):
|
||||
try:
|
||||
images = self.images_client.list_images()['images']
|
||||
images = self.compute_images_client.list_images()['images']
|
||||
self._scenario_images = [
|
||||
(self._normalize_name(i['name']), dict(image_ref=i['id']))
|
||||
for i in images if re.search(self.image_pattern,
|
||||
|
Loading…
Reference in New Issue
Block a user