diff options
Diffstat (limited to 'snaps/openstack/utils/tests/glance_utils_tests.py')
| -rw-r--r-- | snaps/openstack/utils/tests/glance_utils_tests.py | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/snaps/openstack/utils/tests/glance_utils_tests.py b/snaps/openstack/utils/tests/glance_utils_tests.py index 5fa585c..85b59ab 100644 --- a/snaps/openstack/utils/tests/glance_utils_tests.py +++ b/snaps/openstack/utils/tests/glance_utils_tests.py @@ -50,7 +50,9 @@ class GlanceSmokeTests(OSComponentTestCase): from snaps.openstack.os_credentials import OSCreds with self.assertRaises(Exception): - glance = glance_utils.glance_client(OSCreds('user', 'pass', 'url', 'project')) + glance = glance_utils.glance_client(OSCreds( + username='user', password='pass', auth_url='url', + project_name='project')) glance_utils.get_image(glance, 'foo') @@ -61,8 +63,8 @@ class GlanceUtilsTests(OSComponentTestCase): def setUp(self): """ - Instantiates the CreateImage object that is responsible for downloading and creating an OS image file - within OpenStack + Instantiates the CreateImage object that is responsible for downloading + and creating an OS image file within OpenStack """ guid = uuid.uuid4() self.image_name = self.__class__.__name__ + '-' + str(guid) @@ -89,14 +91,15 @@ class GlanceUtilsTests(OSComponentTestCase): def test_create_image_minimal_url(self): """ - Tests the glance_utils.create_image() function with a URL unless the self.glance_test_meta has configured a - file to be used. + Tests the glance_utils.create_image() function with a URL unless the + self.glance_test_meta has configured a file to be used. """ if 'disk_file' not in self.glance_test_meta: - os_image_settings = openstack_tests.cirros_image_settings(name=self.image_name, - image_metadata=self.glance_test_meta) + os_image_settings = openstack_tests.cirros_image_settings( + name=self.image_name, image_metadata=self.glance_test_meta) - self.image = glance_utils.create_image(self.glance, os_image_settings) + self.image = glance_utils.create_image(self.glance, + os_image_settings) self.assertIsNotNone(self.image) self.assertEqual(self.image_name, self.image.name) @@ -106,21 +109,26 @@ class GlanceUtilsTests(OSComponentTestCase): validation_utils.objects_equivalent(self.image, image) else: - logger.warn('Test not executed as the image metadata requires image files') + logger.warn('Test not executed as the image metadata requires ' + 'image files') def test_create_image_minimal_file(self): """ Tests the glance_utils.create_image() function with a file """ if 'disk_file' not in self.glance_test_meta: - url_image_settings = openstack_tests.cirros_image_settings(name='foo', image_metadata=self.glance_test_meta) - image_file_name = file_utils.download(url_image_settings.url, self.tmp_dir).name + url_image_settings = openstack_tests.cirros_image_settings( + name='foo', image_metadata=self.glance_test_meta) + image_file_name = file_utils.download( + url_image_settings.url, self.tmp_dir).name else: image_file_name = self.glance_test_meta['disk_file'] - file_image_settings = openstack_tests.file_image_test_settings(name=self.image_name, file_path=image_file_name) + file_image_settings = openstack_tests.file_image_test_settings( + name=self.image_name, file_path=image_file_name) - self.image = glance_utils.create_image(self.glance, file_image_settings) + self.image = glance_utils.create_image(self.glance, + file_image_settings) self.assertIsNotNone(self.image) self.assertEqual(self.image_name, self.image.name) |