Modified code to support both Python 2.7 and 3.x

[snaps.git] / snaps / openstack / tests / create_image_tests.py

diff --git a/snaps/openstack/tests/create_image_tests.py b/snaps/openstack/tests/create_image_tests.py
index 1fb4e29..87e7bdf 100644 (file)
--- a/snaps/openstack/tests/create_image_tests.py
+++ b/snaps/openstack/tests/create_image_tests.py
@@ -20,7 +20,7 @@ import unittest
 from snaps import file_utils
 from snaps.openstack.create_image import ImageSettings
 
-import openstack_tests
+from snaps.openstack.tests import openstack_tests
 from snaps.openstack.utils import glance_utils
 from snaps.openstack import create_image
 from snaps.openstack import os_credentials
@@ -78,10 +78,10 @@ class ImageSettingsUnitTests(unittest.TestCase):
 
     def test_name_user_format_url_only(self):
         settings = ImageSettings(name='foo', image_user='bar', img_format='qcow2', url='http://foo.com')
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
-        self.assertEquals('http://foo.com', settings.url)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
+        self.assertEqual('http://foo.com', settings.url)
         self.assertIsNone(settings.image_file)
         self.assertIsNone(settings.nic_config_pb_loc)
 
@@ -89,41 +89,41 @@ class ImageSettingsUnitTests(unittest.TestCase):
         properties = {'hw_video_model': 'vga'}
         settings = ImageSettings(name='foo', image_user='bar', img_format='qcow2', url='http://foo.com',
                                  extra_properties=properties)
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
-        self.assertEquals('http://foo.com', settings.url)
-        self.assertEquals(properties, settings.extra_properties)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
+        self.assertEqual('http://foo.com', settings.url)
+        self.assertEqual(properties, settings.extra_properties)
         self.assertIsNone(settings.image_file)
         self.assertIsNone(settings.nic_config_pb_loc)
 
     def test_config_with_name_user_format_url_only(self):
         settings = ImageSettings(config={'name': 'foo', 'image_user': 'bar', 'format': 'qcow2',
                                          'download_url': 'http://foo.com'})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
-        self.assertEquals('http://foo.com', settings.url)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
+        self.assertEqual('http://foo.com', settings.url)
         self.assertIsNone(settings.image_file)
         self.assertIsNone(settings.nic_config_pb_loc)
 
     def test_name_user_format_file_only(self):
         settings = ImageSettings(name='foo', image_user='bar', img_format='qcow2', image_file='/foo/bar.qcow')
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
         self.assertIsNone(settings.url)
-        self.assertEquals('/foo/bar.qcow', settings.image_file)
+        self.assertEqual('/foo/bar.qcow', settings.image_file)
         self.assertIsNone(settings.nic_config_pb_loc)
 
     def test_config_with_name_user_format_file_only(self):
         settings = ImageSettings(config={'name': 'foo', 'image_user': 'bar', 'format': 'qcow2',
                                          'image_file': '/foo/bar.qcow'})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
         self.assertIsNone(settings.url)
-        self.assertEquals('/foo/bar.qcow', settings.image_file)
+        self.assertEqual('/foo/bar.qcow', settings.image_file)
         self.assertIsNone(settings.nic_config_pb_loc)
 
     def test_all_url(self):
@@ -133,21 +133,21 @@ class ImageSettingsUnitTests(unittest.TestCase):
         settings = ImageSettings(name='foo', image_user='bar', img_format='qcow2', url='http://foo.com',
                                  extra_properties=properties, nic_config_pb_loc='/foo/bar',
                                  kernel_image_settings=kernel_settings, ramdisk_image_settings=ramdisk_settings)
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
-        self.assertEquals('http://foo.com', settings.url)
-        self.assertEquals(properties, settings.extra_properties)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
+        self.assertEqual('http://foo.com', settings.url)
+        self.assertEqual(properties, settings.extra_properties)
         self.assertIsNone(settings.image_file)
-        self.assertEquals('/foo/bar', settings.nic_config_pb_loc)
-        self.assertEquals('kernel', settings.kernel_image_settings.name)
-        self.assertEquals('http://kernel.com', settings.kernel_image_settings.url)
-        self.assertEquals('bar', settings.kernel_image_settings.image_user)
-        self.assertEquals('qcow2', settings.kernel_image_settings.format)
-        self.assertEquals('ramdisk', settings.ramdisk_image_settings.name)
-        self.assertEquals('http://ramdisk.com', settings.ramdisk_image_settings.url)
-        self.assertEquals('bar', settings.ramdisk_image_settings.image_user)
-        self.assertEquals('qcow2', settings.ramdisk_image_settings.format)
+        self.assertEqual('/foo/bar', settings.nic_config_pb_loc)
+        self.assertEqual('kernel', settings.kernel_image_settings.name)
+        self.assertEqual('http://kernel.com', settings.kernel_image_settings.url)
+        self.assertEqual('bar', settings.kernel_image_settings.image_user)
+        self.assertEqual('qcow2', settings.kernel_image_settings.format)
+        self.assertEqual('ramdisk', settings.ramdisk_image_settings.name)
+        self.assertEqual('http://ramdisk.com', settings.ramdisk_image_settings.url)
+        self.assertEqual('bar', settings.ramdisk_image_settings.image_user)
+        self.assertEqual('qcow2', settings.ramdisk_image_settings.format)
 
     def test_config_all_url(self):
         settings = ImageSettings(
@@ -159,42 +159,42 @@ class ImageSettingsUnitTests(unittest.TestCase):
                                               'image_user': 'bar', 'format': 'qcow2'},
                     'ramdisk_image_settings': {'name': 'ramdisk', 'download_url': 'http://ramdisk.com',
                                                'image_user': 'bar', 'format': 'qcow2'}})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
-        self.assertEquals('http://foo.com', settings.url)
-        self.assertEquals('{\'hw_video_model\': \'vga\'}', settings.extra_properties)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
+        self.assertEqual('http://foo.com', settings.url)
+        self.assertEqual('{\'hw_video_model\': \'vga\'}', settings.extra_properties)
         self.assertIsNone(settings.image_file)
-        self.assertEquals('/foo/bar', settings.nic_config_pb_loc)
-        self.assertEquals('kernel', settings.kernel_image_settings.name)
-        self.assertEquals('http://kernel.com', settings.kernel_image_settings.url)
-        self.assertEquals('ramdisk', settings.ramdisk_image_settings.name)
-        self.assertEquals('http://ramdisk.com', settings.ramdisk_image_settings.url)
+        self.assertEqual('/foo/bar', settings.nic_config_pb_loc)
+        self.assertEqual('kernel', settings.kernel_image_settings.name)
+        self.assertEqual('http://kernel.com', settings.kernel_image_settings.url)
+        self.assertEqual('ramdisk', settings.ramdisk_image_settings.name)
+        self.assertEqual('http://ramdisk.com', settings.ramdisk_image_settings.url)
 
     def test_all_file(self):
         properties = {'hw_video_model': 'vga'}
         settings = ImageSettings(name='foo', image_user='bar', img_format='qcow2', image_file='/foo/bar.qcow',
                                  extra_properties=properties, nic_config_pb_loc='/foo/bar')
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
         self.assertIsNone(settings.url)
-        self.assertEquals('/foo/bar.qcow', settings.image_file)
-        self.assertEquals(properties, settings.extra_properties)
-        self.assertEquals('/foo/bar', settings.nic_config_pb_loc)
+        self.assertEqual('/foo/bar.qcow', settings.image_file)
+        self.assertEqual(properties, settings.extra_properties)
+        self.assertEqual('/foo/bar', settings.nic_config_pb_loc)
 
     def test_config_all_file(self):
         settings = ImageSettings(config={'name': 'foo', 'image_user': 'bar', 'format': 'qcow2',
                                          'image_file': '/foo/bar.qcow',
                                          'extra_properties': '{\'hw_video_model\' : \'vga\'}',
                                          'nic_config_pb_loc': '/foo/bar'})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.image_user)
-        self.assertEquals('qcow2', settings.format)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.image_user)
+        self.assertEqual('qcow2', settings.format)
         self.assertIsNone(settings.url)
-        self.assertEquals('/foo/bar.qcow', settings.image_file)
-        self.assertEquals('{\'hw_video_model\' : \'vga\'}', settings.extra_properties)
-        self.assertEquals('/foo/bar', settings.nic_config_pb_loc)
+        self.assertEqual('/foo/bar.qcow', settings.image_file)
+        self.assertEqual('{\'hw_video_model\' : \'vga\'}', settings.extra_properties)
+        self.assertEqual('/foo/bar', settings.nic_config_pb_loc)
 
 
 class CreateImageSuccessTests(OSIntegrationTestCase):
@@ -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,18 +239,17 @@ 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(created_image.name, retrieved_image.name)
-        self.assertEquals(created_image.id, retrieved_image.id)
+        self.assertEqual(created_image.size, retrieved_image.size)
+        self.assertEqual(get_image_size(self.image_settings), retrieved_image.size)
+        self.assertEqual(created_image.name, retrieved_image.name)
+        self.assertEqual(created_image.id, retrieved_image.id)
 
     def test_create_image_clean_url_properties(self):
         """
@@ -255,19 +257,17 @@ 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(created_image.name, retrieved_image.name)
-        self.assertEquals(created_image.id, retrieved_image.id)
-        self.assertEquals(created_image.properties, retrieved_image.properties)
+        self.assertEqual(self.image_creator.get_image().size, retrieved_image.size)
+        self.assertEqual(get_image_size(self.image_settings), retrieved_image.size)
+        self.assertEqual(created_image.name, retrieved_image.name)
+        self.assertEqual(created_image.id, retrieved_image.id)
+        self.assertEqual(created_image.properties, retrieved_image.properties)
 
     def test_create_image_clean_file(self):
         """
@@ -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()
@@ -290,28 +288,25 @@ class CreateImageSuccessTests(OSIntegrationTestCase):
 
         retrieved_image = glance_utils.get_image(self.glance, file_image_settings.name)
         self.assertIsNotNone(retrieved_image)
-        self.assertEquals(self.image_creator.get_image().size, retrieved_image.size)
-        self.assertEquals(get_image_size(file_image_settings), retrieved_image.size)
+        self.assertEqual(self.image_creator.get_image().size, retrieved_image.size)
+        self.assertEqual(get_image_size(file_image_settings), retrieved_image.size)
 
-        self.assertEquals(created_image.name, retrieved_image.name)
-        self.assertEquals(created_image.id, retrieved_image.id)
+        self.assertEqual(created_image.name, retrieved_image.name)
+        self.assertEqual(created_image.id, retrieved_image.id)
 
     def test_create_delete_image(self):
         """
         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.assertEqual(self.image_creator.get_image().size, retrieved_image.size)
+        self.assertEqual(get_image_size(self.image_settings), retrieved_image.size)
 
         # Delete Image manually
         glance_utils.delete_image(self.glance, created_image)
@@ -327,24 +322,21 @@ 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(image1.name, retrieved_image.name)
-        self.assertEquals(image1.id, retrieved_image.id)
-        self.assertEquals(image1.properties, retrieved_image.properties)
+        self.assertEqual(self.image_creator.get_image().size, retrieved_image.size)
+        self.assertEqual(get_image_size(self.image_settings), retrieved_image.size)
+        self.assertEqual(image1.name, retrieved_image.name)
+        self.assertEqual(image1.id, retrieved_image.id)
+        self.assertEqual(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)
+        self.assertEqual(image1.id, image2.id)
 
 
 class CreateImageNegativeTests(OSIntegrationTestCase):
@@ -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',
@@ -498,17 +490,17 @@ class CreateMultiPartImageTests(OSIntegrationTestCase):
         main_image = glance_utils.get_image(self.glance, image_settings.name)
         self.assertIsNotNone(main_image)
         self.assertIsNotNone(image_creator.get_image())
-        self.assertEquals(image_creator.get_image().id, main_image.id)
+        self.assertEqual(image_creator.get_image().id, main_image.id)
 
         kernel_image = glance_utils.get_image(self.glance, image_settings.kernel_image_settings.name)
         self.assertIsNotNone(kernel_image)
         self.assertIsNotNone(image_creator.get_kernel_image())
-        self.assertEquals(kernel_image.id, image_creator.get_kernel_image().id)
+        self.assertEqual(kernel_image.id, image_creator.get_kernel_image().id)
 
         ramdisk_image = glance_utils.get_image(self.glance, image_settings.ramdisk_image_settings.name)
         self.assertIsNotNone(ramdisk_image)
         self.assertIsNotNone(image_creator.get_ramdisk_image())
-        self.assertEquals(ramdisk_image.id, image_creator.get_ramdisk_image().id)
+        self.assertEqual(ramdisk_image.id, image_creator.get_ramdisk_image().id)
 
     def test_create_three_part_image_from_file_3_creators(self):
         """
@@ -530,7 +522,7 @@ class CreateMultiPartImageTests(OSIntegrationTestCase):
         self.image_creators.append(create_image.OpenStackImage(self.os_creds, kernel_file_image_settings))
         kernel_image = self.image_creators[-1].create()
         self.assertIsNotNone(kernel_image)
-        self.assertEquals(get_image_size(kernel_file_image_settings), kernel_image.size)
+        self.assertEqual(get_image_size(kernel_file_image_settings), kernel_image.size)
 
         # Create the ramdisk image
         ramdisk_url = 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-initramfs'
@@ -543,7 +535,7 @@ class CreateMultiPartImageTests(OSIntegrationTestCase):
         self.image_creators.append(create_image.OpenStackImage(self.os_creds, ramdisk_file_image_settings))
         ramdisk_image = self.image_creators[-1].create()
         self.assertIsNotNone(ramdisk_image)
-        self.assertEquals(get_image_size(ramdisk_file_image_settings), ramdisk_image.size)
+        self.assertEqual(get_image_size(ramdisk_file_image_settings), ramdisk_image.size)
 
         # Create the main image
         image_url = 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img'
@@ -560,11 +552,11 @@ class CreateMultiPartImageTests(OSIntegrationTestCase):
 
         retrieved_image = glance_utils.get_image(self.glance, file_image_settings.name)
         self.assertIsNotNone(retrieved_image)
-        self.assertEquals(self.image_creators[-1].get_image().size, retrieved_image.size)
-        self.assertEquals(get_image_size(file_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)
+        self.assertEqual(self.image_creators[-1].get_image().size, retrieved_image.size)
+        self.assertEqual(get_image_size(file_image_settings), retrieved_image.size)
+        self.assertEqual(created_image.name, retrieved_image.name)
+        self.assertEqual(created_image.id, retrieved_image.id)
+        self.assertEqual(created_image.properties, retrieved_image.properties)
 
     def test_create_three_part_image_from_url_3_creators(self):
         """
@@ -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')
 
@@ -586,10 +578,10 @@ class CreateMultiPartImageTests(OSIntegrationTestCase):
         self.image_creators.append(create_image.OpenStackImage(self.os_creds, kernel_image_settings))
         kernel_image = self.image_creators[-1].create()
         self.assertIsNotNone(kernel_image)
-        self.assertEquals(get_image_size(kernel_image_settings), kernel_image.size)
+        self.assertEqual(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:
@@ -598,10 +590,10 @@ class CreateMultiPartImageTests(OSIntegrationTestCase):
         self.image_creators.append(create_image.OpenStackImage(self.os_creds, ramdisk_image_settings))
         ramdisk_image = self.image_creators[-1].create()
         self.assertIsNotNone(ramdisk_image)
-        self.assertEquals(get_image_size(ramdisk_image_settings), ramdisk_image.size)
+        self.assertEqual(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:
@@ -620,12 +612,12 @@ class CreateMultiPartImageTests(OSIntegrationTestCase):
         retrieved_image = glance_utils.get_image(self.glance, os_image_settings.name)
         self.assertIsNotNone(retrieved_image)
 
-        self.assertEquals(self.image_creators[-1].get_image().size, retrieved_image.size)
-        self.assertEquals(get_image_size(os_image_settings), retrieved_image.size)
+        self.assertEqual(self.image_creators[-1].get_image().size, retrieved_image.size)
+        self.assertEqual(get_image_size(os_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)
+        self.assertEqual(created_image.name, retrieved_image.name)
+        self.assertEqual(created_image.id, retrieved_image.id)
+        self.assertEqual(created_image.properties, retrieved_image.properties)
 
 
 def get_image_size(image_settings):