summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/utils/tests
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-05-03 11:47:17 -0600
committerspisarski <s.pisarski@cablelabs.com>2017-05-03 13:37:32 -0600
commit40c96233ca4c27de1b3d8b53187c302ddd6208a2 (patch)
treee2e208e55195a5c306f876da2f19cfab301e1de6 /snaps/openstack/utils/tests
parent58be22735be31d6af00236f36f57dd10e0f9560c (diff)
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 <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/utils/tests')
-rw-r--r--snaps/openstack/utils/tests/glance_utils_tests.py4
1 files changed, 2 insertions, 2 deletions
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)