From 40c96233ca4c27de1b3d8b53187c302ddd6208a2 Mon Sep 17 00:00:00 2001 From: spisarski Date: Wed, 3 May 2017 11:47:17 -0600 Subject: Changed image metadata to support cirros, ubuntu, and centos. The image metadata that was designed for multi-part form support did not take into account tests that require ubuntu or centos tests. JIRA: SNAPS-76 Change-Id: I95c7b74b8f7d7b78c3842b5e716fd7b466107c9c Signed-off-by: spisarski --- snaps/openstack/tests/create_image_tests.py | 66 ++++++------- snaps/openstack/tests/create_instance_tests.py | 23 ++--- snaps/openstack/tests/openstack_tests.py | 111 +++++++++++++--------- snaps/openstack/utils/tests/glance_utils_tests.py | 4 +- snaps/provisioning/tests/ansible_utils_tests.py | 6 +- 5 files changed, 114 insertions(+), 96 deletions(-) diff --git a/snaps/openstack/tests/create_image_tests.py b/snaps/openstack/tests/create_image_tests.py index 1fb4e29..6b8c1c0 100644 --- a/snaps/openstack/tests/create_image_tests.py +++ b/snaps/openstack/tests/create_image_tests.py @@ -218,6 +218,9 @@ class CreateImageSuccessTests(OSIntegrationTestCase): if not os.path.exists(self.tmp_dir): os.makedirs(self.tmp_dir) + self.image_settings = openstack_tests.cirros_image_settings(name=self.image_name, + image_metadata=self.image_metadata) + def tearDown(self): """ Cleans the image and downloaded image file @@ -236,16 +239,15 @@ class CreateImageSuccessTests(OSIntegrationTestCase): """ # Create Image # Set the default image settings, then set any custom parameters sent from the app - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name, image_metadata=self.image_metadata) - self.image_creator = create_image.OpenStackImage(self.os_creds, os_image_settings) + self.image_creator = create_image.OpenStackImage(self.os_creds, self.image_settings) created_image = self.image_creator.create() self.assertIsNotNone(created_image) - retrieved_image = glance_utils.get_image(self.glance, os_image_settings.name) + retrieved_image = glance_utils.get_image(self.glance, self.image_settings.name) self.assertIsNotNone(retrieved_image) self.assertEquals(created_image.size, retrieved_image.size) - self.assertEquals(get_image_size(os_image_settings), retrieved_image.size) + self.assertEquals(get_image_size(self.image_settings), retrieved_image.size) self.assertEquals(created_image.name, retrieved_image.name) self.assertEquals(created_image.id, retrieved_image.id) @@ -255,16 +257,14 @@ class CreateImageSuccessTests(OSIntegrationTestCase): """ # Create Image # Set the default image settings, then set any custom parameters sent from the app - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name, image_metadata=self.image_metadata) - - self.image_creator = create_image.OpenStackImage(self.os_creds, os_image_settings) + self.image_creator = create_image.OpenStackImage(self.os_creds, self.image_settings) created_image = self.image_creator.create() self.assertIsNotNone(created_image) - retrieved_image = glance_utils.get_image(self.glance, os_image_settings.name) + retrieved_image = glance_utils.get_image(self.glance, self.image_settings.name) self.assertIsNotNone(retrieved_image) self.assertEquals(self.image_creator.get_image().size, retrieved_image.size) - self.assertEquals(get_image_size(os_image_settings), retrieved_image.size) + self.assertEquals(get_image_size(self.image_settings), retrieved_image.size) self.assertEquals(created_image.name, retrieved_image.name) self.assertEquals(created_image.id, retrieved_image.id) self.assertEquals(created_image.properties, retrieved_image.properties) @@ -275,13 +275,11 @@ class CreateImageSuccessTests(OSIntegrationTestCase): """ # Create Image - # Set the default image settings, then set any custom parameters sent from the app - url_image_settings = openstack_tests.cirros_url_image(self.image_name, image_metadata=self.image_metadata) # Download the file of the image - image_file = file_utils.download(url_image_settings.url, self.tmp_dir) + image_file = file_utils.download(self.image_settings.url, self.tmp_dir) file_image_settings = openstack_tests.file_image_test_settings( - name=self.image_name, file_path=image_file.name, image_metadata=self.image_metadata) + name=self.image_name, file_path=image_file.name) self.image_creator = create_image.OpenStackImage(self.os_creds, file_image_settings) created_image = self.image_creator.create() @@ -301,17 +299,14 @@ class CreateImageSuccessTests(OSIntegrationTestCase): Tests the creation then deletion of an OpenStack image to ensure clean() does not raise an Exception. """ # Create Image - # Set the default image settings, then set any custom parameters sent from the app - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name, image_metadata=self.image_metadata) - - self.image_creator = create_image.OpenStackImage(self.os_creds, os_image_settings) + self.image_creator = create_image.OpenStackImage(self.os_creds, self.image_settings) created_image = self.image_creator.create() self.assertIsNotNone(created_image) - retrieved_image = glance_utils.get_image(self.glance, os_image_settings.name) + retrieved_image = glance_utils.get_image(self.glance, self.image_settings.name) self.assertIsNotNone(retrieved_image) self.assertEquals(self.image_creator.get_image().size, retrieved_image.size) - self.assertEquals(get_image_size(os_image_settings), retrieved_image.size) + self.assertEquals(get_image_size(self.image_settings), retrieved_image.size) # Delete Image manually glance_utils.delete_image(self.glance, created_image) @@ -327,22 +322,19 @@ class CreateImageSuccessTests(OSIntegrationTestCase): Tests the creation of an OpenStack image when the image already exists. """ # Create Image - # Set the default image settings, then set any custom parameters sent from the app - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name, image_metadata=self.image_metadata) - - self.image_creator = create_image.OpenStackImage(self.os_creds, os_image_settings) + self.image_creator = create_image.OpenStackImage(self.os_creds, self.image_settings) image1 = self.image_creator.create() - retrieved_image = glance_utils.get_image(self.glance, os_image_settings.name) + retrieved_image = glance_utils.get_image(self.glance, self.image_settings.name) self.assertIsNotNone(retrieved_image) self.assertEquals(self.image_creator.get_image().size, retrieved_image.size) - self.assertEquals(get_image_size(os_image_settings), retrieved_image.size) + self.assertEquals(get_image_size(self.image_settings), retrieved_image.size) self.assertEquals(image1.name, retrieved_image.name) self.assertEquals(image1.id, retrieved_image.id) self.assertEquals(image1.properties, retrieved_image.properties) # Should be retrieving the instance data - os_image_2 = create_image.OpenStackImage(self.os_creds, os_image_settings) + os_image_2 = create_image.OpenStackImage(self.os_creds, self.image_settings) image2 = os_image_2.create() self.assertEquals(image1.id, image2.id) @@ -368,7 +360,7 @@ class CreateImageNegativeTests(OSIntegrationTestCase): """ Expect an exception when the image name is None """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) with self.assertRaises(Exception): self.image_creator = create_image.OpenStackImage( self.os_creds, create_image.ImageSettings( @@ -381,7 +373,7 @@ class CreateImageNegativeTests(OSIntegrationTestCase): """ Expect an exception when the image download url is bad """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) self.image_creator = create_image.OpenStackImage(self.os_creds, create_image.ImageSettings( name=os_image_settings.name, image_user=os_image_settings.image_user, img_format=os_image_settings.format, url="http://foo.bar")) @@ -392,7 +384,7 @@ class CreateImageNegativeTests(OSIntegrationTestCase): """ Expect an exception when the image file does not exist """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) self.image_creator = create_image.OpenStackImage( self.os_creds, create_image.ImageSettings(name=os_image_settings.name, image_user=os_image_settings.image_user, @@ -404,7 +396,7 @@ class CreateImageNegativeTests(OSIntegrationTestCase): """ Expect an exception when the project name is None """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) with self.assertRaises(Exception): self.image_creator = create_image.OpenStackImage( os_credentials.OSCreds(self.os_creds.username, self.os_creds.password, self.os_creds.auth_url, None, @@ -416,7 +408,7 @@ class CreateImageNegativeTests(OSIntegrationTestCase): """ Expect an exception when the project name is None """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) with self.assertRaises(Exception): self.image_creator = create_image.OpenStackImage( os_credentials.OSCreds(self.os_creds.username, self.os_creds.password, None, @@ -428,7 +420,7 @@ class CreateImageNegativeTests(OSIntegrationTestCase): """ Expect an exception when the project name is None """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) with self.assertRaises(Exception): self.image_creator = create_image.OpenStackImage( os_credentials.OSCreds(self.os_creds.username, None, self.os_creds.os_auth_url, @@ -439,7 +431,7 @@ class CreateImageNegativeTests(OSIntegrationTestCase): """ Expect an exception when the project name is None """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) with self.assertRaises(Exception): self.image_creator = create_image.OpenStackImage( os_credentials.OSCreds(None, self.os_creds.password, self.os_creds.os_auth_url, @@ -485,7 +477,7 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): Tests the creation of a 3-part OpenStack image from a URL. """ # Create the kernel image - image_settings = openstack_tests.cirros_url_image( + image_settings = openstack_tests.cirros_image_settings( name=self.image_name, image_metadata={'disk_url': 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img', 'kernel_url': 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-kernel', @@ -576,7 +568,7 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): properties = self.image_metadata['extra_properties'] # Create the kernel image - kernel_image_settings = openstack_tests.cirros_url_image( + kernel_image_settings = openstack_tests.cirros_image_settings( name=self.image_name+'_kernel', url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-kernel') @@ -589,7 +581,7 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): self.assertEquals(get_image_size(kernel_image_settings), kernel_image.size) # Create the ramdisk image - ramdisk_image_settings = openstack_tests.cirros_url_image( + ramdisk_image_settings = openstack_tests.cirros_image_settings( name=self.image_name+'_ramdisk', url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-initramfs') if self.image_metadata: @@ -601,7 +593,7 @@ class CreateMultiPartImageTests(OSIntegrationTestCase): self.assertEquals(get_image_size(ramdisk_image_settings), ramdisk_image.size) # Create the main image - os_image_settings = openstack_tests.cirros_url_image( + os_image_settings = openstack_tests.cirros_image_settings( name=self.image_name, url='http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img') if self.image_metadata: diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index ff24efb..977d33b 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") # and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -255,7 +255,7 @@ class SimpleHealthCheck(OSIntegrationTestCase): # Create Image # Set the default image settings, then set any custom parameters sent from the app - self.os_image_settings = openstack_tests.cirros_url_image( + self.os_image_settings = openstack_tests.cirros_image_settings( name=guid + '-image', image_metadata=self.image_metadata) try: @@ -364,7 +364,7 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase): guid = self.__class__.__name__ + '-' + str(uuid.uuid4()) self.vm_inst_name = guid + '-inst' self.nova = nova_utils.nova_client(self.os_creds) - self.os_image_settings = openstack_tests.cirros_url_image( + self.os_image_settings = openstack_tests.cirros_image_settings( name=guid + '-image', image_metadata=self.image_metadata) net_config = openstack_tests.get_priv_net_config( @@ -485,7 +485,7 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase): self.pub_net_config = openstack_tests.get_pub_net_config( net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet', router_name=guid + '-pub-router', external_net=self.ext_net_name) - self.os_image_settings = openstack_tests.cirros_url_image( + self.os_image_settings = openstack_tests.cirros_image_settings( name=guid + '-image', image_metadata=self.image_metadata) try: # Create Image @@ -669,7 +669,7 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase): self.net_config = openstack_tests.get_priv_net_config( net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet', router_name=guid + '-pub-router', external_net=self.ext_net_name) - self.os_image_settings = openstack_tests.cirros_url_image( + self.os_image_settings = openstack_tests.cirros_image_settings( name=guid + '-image', image_metadata=self.image_metadata) try: @@ -903,7 +903,7 @@ class CreateInstanceOnComputeHost(OSIntegrationTestCase): self.priv_net_config = openstack_tests.get_priv_net_config( net_name=guid + '-priv-net', subnet_name=guid + '-priv-subnet') - self.os_image_settings = openstack_tests.cirros_url_image( + self.os_image_settings = openstack_tests.cirros_image_settings( name=guid + '-image', image_metadata=self.image_metadata) try: @@ -1028,7 +1028,8 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase): router_name=self.guid + '-pub-router', external_net=self.ext_net_name) image_name = self.__class__.__name__ + '-' + str(uuid.uuid4()) - self.os_image_settings = openstack_tests.centos_url_image(name=image_name, image_metadata=self.image_metadata) + self.os_image_settings = openstack_tests.centos_image_settings(name=image_name, + image_metadata=self.image_metadata) try: # Create Image @@ -1175,7 +1176,7 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase): self.guid = self.__class__.__name__ + '-' + str(uuid.uuid4()) self.vm_inst_name = self.guid + '-inst' self.nova = nova_utils.nova_client(self.os_creds) - self.os_image_settings = openstack_tests.cirros_url_image( + self.os_image_settings = openstack_tests.cirros_image_settings( name=self.guid + '-image', image_metadata=self.image_metadata) self.vm_inst_name = self.guid + '-inst' @@ -1461,7 +1462,7 @@ class CreateInstanceFromThreePartImage(OSIntegrationTestCase): self.inst_creator = None try: - image_settings = openstack_tests.cirros_url_image( + image_settings = openstack_tests.cirros_image_settings( name=self.image_name, image_metadata={'disk_url': 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img', 'kernel_url': 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-kernel', @@ -1510,7 +1511,7 @@ class CreateInstanceFromThreePartImage(OSIntegrationTestCase): if self.image_creator: try: - self.image_creator.clean() + self.image_creator.clean() except Exception as e: logger.error('Unexpected exception cleaning image with message - ' + e.message) @@ -1529,4 +1530,4 @@ class CreateInstanceFromThreePartImage(OSIntegrationTestCase): vm_inst = self.inst_creator.create() self.assertIsNotNone(vm_inst) - self.assertTrue(self.inst_creator.vm_active(block=True)) \ No newline at end of file + self.assertTrue(self.inst_creator.vm_active(block=True)) diff --git a/snaps/openstack/tests/openstack_tests.py b/snaps/openstack/tests/openstack_tests.py index 81e49ee..c11d1aa 100644 --- a/snaps/openstack/tests/openstack_tests.py +++ b/snaps/openstack/tests/openstack_tests.py @@ -97,27 +97,41 @@ def get_credentials(os_env_file=None, proxy_settings_str=None, ssh_proxy_cmd=Non return os_creds -def cirros_url_image(name, url=None, image_metadata=None, kernel_settings=None, ramdisk_settings=None): - if image_metadata and 'disk_url' in image_metadata: - url = image_metadata['disk_url'] +def cirros_image_settings(name, url=None, image_metadata=None, kernel_settings=None, ramdisk_settings=None): + """ + Returns the image settings for a Cirros QCOW2 image + :param name: the name of the image + :param url: the image's URL + :param image_metadata: dict() values to override URLs for disk, kernel, and ramdisk + :param kernel_settings: override to the kernel settings from the image_metadata + :param ramdisk_settings: override to the ramdisk settings from the image_metadata + :return: + """ + if image_metadata and 'cirros' in image_metadata: + metadata = image_metadata['cirros'] + else: + metadata = image_metadata + + if metadata and 'disk_url' in metadata: + url = metadata['disk_url'] if not url: url = 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img' - if image_metadata and 'kernel_url' in image_metadata and kernel_settings is None: + if metadata and 'kernel_url' in metadata and kernel_settings is None: kernel_image_settings = ImageSettings(name=name + '-kernel', image_user='cirros', img_format='qcow2', - url=image_metadata['kernel_url']) + url=metadata['kernel_url']) else: kernel_image_settings = kernel_settings - if image_metadata and 'ramdisk_url' in image_metadata and ramdisk_settings is None: + if metadata and 'ramdisk_url' in metadata and ramdisk_settings is None: ramdisk_image_settings = ImageSettings(name=name + '-ramdisk', image_user='cirros', img_format='qcow2', - url=image_metadata['ramdisk_url']) + url=metadata['ramdisk_url']) else: ramdisk_image_settings = ramdisk_settings extra_properties = None - if image_metadata and 'extra_properties' in image_metadata: - extra_properties = image_metadata['extra_properties'] + if metadata and 'extra_properties' in metadata: + extra_properties = metadata['extra_properties'] return ImageSettings(name=name, image_user='cirros', img_format='qcow2', url=url, extra_properties=extra_properties, @@ -125,41 +139,40 @@ def cirros_url_image(name, url=None, image_metadata=None, kernel_settings=None, ramdisk_image_settings=ramdisk_image_settings) -def file_image_test_settings(name, file_path, image_user='cirros', image_metadata=None): - kernel_image_settings = None - if image_metadata and 'kernel_url' in image_metadata: - kernel_image_settings = ImageSettings(name=name + '-kernel', url=image_metadata['kernel_url']) - ramdisk_image_settings = None - if image_metadata and 'ramdisk_url' in image_metadata: - ramdisk_image_settings = ImageSettings(name=name + '-ramdisk', url=image_metadata['ramdisk_url']) - - extra_properties = None - if image_metadata and 'extra_properties' in image_metadata: - extra_properties = image_metadata['extra_properties'] +def file_image_test_settings(name, file_path, image_user='cirros'): + return ImageSettings(name=name, image_user=image_user, img_format='qcow2', image_file=file_path) - return ImageSettings(name=name, image_user=image_user, img_format='qcow2', - extra_properties=extra_properties, - image_file=file_path, - kernel_image_settings=kernel_image_settings, - ramdisk_image_settings=ramdisk_image_settings) +def centos_image_settings(name, url=None, image_metadata=None): + """ + Returns the image settings for a Centos QCOW2 image + :param name: the name of the image + :param url: the image's URL + :param image_metadata: dict() values to override URLs for disk, kernel, and ramdisk + :return: + """ + if image_metadata and 'centos' in image_metadata: + metadata = image_metadata['centos'] + else: + metadata = image_metadata -def centos_url_image(name, url=None, image_metadata=None): - if image_metadata and 'disk_url' in image_metadata: - url = image_metadata['disk_url'] + if metadata and 'disk_url' in metadata: + url = metadata['disk_url'] if not url: url = 'http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2' kernel_image_settings = None - if image_metadata and 'kernel_url' in image_metadata: - kernel_image_settings = ImageSettings(name=name + '-kernel', url=image_metadata['kernel_url']) + if metadata and 'kernel_url' in metadata: + kernel_image_settings = ImageSettings(name=name + '-kernel', image_user='centos', img_format='qcow2', + url=metadata['kernel_url']) ramdisk_image_settings = None - if image_metadata and 'ramdisk_url' in image_metadata: - ramdisk_image_settings = ImageSettings(name=name + '-ramdisk', url=image_metadata['ramdisk_url']) + if metadata and 'ramdisk_url' in metadata: + ramdisk_image_settings = ImageSettings(name=name + '-ramdisk', image_user='centos', img_format='qcow2', + url=metadata['ramdisk_url']) extra_properties = None - if image_metadata and 'extra_properties' in image_metadata: - extra_properties = image_metadata['extra_properties'] + if metadata and 'extra_properties' in metadata: + extra_properties = metadata['extra_properties'] return ImageSettings( name=name, image_user='centos', img_format='qcow2', @@ -169,22 +182,34 @@ def centos_url_image(name, url=None, image_metadata=None): ramdisk_image_settings=ramdisk_image_settings) -def ubuntu_url_image(name, url=None, image_metadata=None): - if image_metadata and 'disk_url' in image_metadata: - url = image_metadata['disk_url'] +def ubuntu_image_settings(name, url=None, image_metadata=None): + """ + Returns the image settings for a Ubuntu QCOW2 image + :param name: the name of the image + :param url: the image's URL + :param image_metadata: dict() values to override URLs for disk, kernel, and ramdisk + :return: + """ + if image_metadata and 'ubuntu' in image_metadata: + metadata = image_metadata['ubuntu'] + else: + metadata = image_metadata + + if metadata and 'disk_url' in metadata: + url = metadata['disk_url'] if not url: url = 'http://uec-images.ubuntu.com/releases/trusty/14.04/ubuntu-14.04-server-cloudimg-amd64-disk1.img' kernel_image_settings = None - if image_metadata and 'kernel_url' in image_metadata: - kernel_image_settings = ImageSettings(name=name + '-kernel', url=image_metadata['kernel_url']) + if metadata and 'kernel_url' in metadata: + kernel_image_settings = ImageSettings(name=name + '-kernel', url=metadata['kernel_url']) ramdisk_image_settings = None - if image_metadata and 'ramdisk_url' in image_metadata: - ramdisk_image_settings = ImageSettings(name=name + '-ramdisk', url=image_metadata['ramdisk_url']) + if metadata and 'ramdisk_url' in metadata: + ramdisk_image_settings = ImageSettings(name=name + '-ramdisk', url=metadata['ramdisk_url']) extra_properties = None - if image_metadata and 'extra_properties' in image_metadata: - extra_properties = image_metadata['extra_properties'] + if metadata and 'extra_properties' in metadata: + extra_properties = metadata['extra_properties'] return ImageSettings( name=name, image_user='ubuntu', img_format='qcow2', diff --git a/snaps/openstack/utils/tests/glance_utils_tests.py b/snaps/openstack/utils/tests/glance_utils_tests.py index 23c741a..eb8e291 100644 --- a/snaps/openstack/utils/tests/glance_utils_tests.py +++ b/snaps/openstack/utils/tests/glance_utils_tests.py @@ -83,7 +83,7 @@ class GlanceUtilsTests(OSComponentTestCase): """ Tests the glance_utils.create_image() function with a URL """ - os_image_settings = openstack_tests.cirros_url_image(name=self.image_name) + os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name) self.image = glance_utils.create_image(self.glance, os_image_settings) self.assertIsNotNone(self.image) @@ -99,7 +99,7 @@ class GlanceUtilsTests(OSComponentTestCase): """ Tests the glance_utils.create_image() function with a file """ - url_image_settings = openstack_tests.cirros_url_image('foo') + url_image_settings = openstack_tests.cirros_image_settings('foo') image_file = file_utils.download(url_image_settings.url, self.tmp_dir) file_image_settings = openstack_tests.file_image_test_settings(name=self.image_name, file_path=image_file.name) diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 4cd17c7..41bc199 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") # and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -65,8 +65,8 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): try: # Create Image - os_image_settings = openstack_tests.ubuntu_url_image(name=guid + '-' + '-image', - image_metadata=self.image_metadata) + os_image_settings = openstack_tests.ubuntu_image_settings(name=guid + '-' + '-image', + image_metadata=self.image_metadata) self.image_creator = create_image.OpenStackImage(self.os_creds, os_image_settings) self.image_creator.create() -- cgit 1.2.3-korg