From d1c4675e5c35257b84cd69969c6e67575faf19db Mon Sep 17 00:00:00 2001 From: spisarski Date: Thu, 4 May 2017 12:43:53 -0600 Subject: Modified code to support both Python 2.7 and 3.x * Tested on Python 2.7.10 and 3.4.4 * Updated installation documentation JIRA: SNAPS-30 Change-Id: I94a37d218be8ea47bbbcfb560197737430fcb3ba Signed-off-by: spisarski --- snaps/openstack/tests/create_image_tests.py | 192 ++++++++++++++-------------- 1 file changed, 96 insertions(+), 96 deletions(-) (limited to '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 6b8c1c0..87e7bdf 100644 --- 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): @@ -246,10 +246,10 @@ class CreateImageSuccessTests(OSIntegrationTestCase): 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(self.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): """ @@ -263,11 +263,11 @@ class CreateImageSuccessTests(OSIntegrationTestCase): 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(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) + 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): """ @@ -288,11 +288,11 @@ 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): """ @@ -305,8 +305,8 @@ class CreateImageSuccessTests(OSIntegrationTestCase): 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(self.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,16 +327,16 @@ class CreateImageSuccessTests(OSIntegrationTestCase): 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(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) + 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, self.image_settings) image2 = os_image_2.create() - self.assertEquals(image1.id, image2.id) + self.assertEqual(image1.id, image2.id) class CreateImageNegativeTests(OSIntegrationTestCase): @@ -490,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): """ @@ -522,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' @@ -535,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' @@ -552,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): """ @@ -578,7 +578,7 @@ 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_image_settings( @@ -590,7 +590,7 @@ 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_image_settings( @@ -612,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): -- cgit 1.2.3-korg