Modified code to support both Python 2.7 and 3.x

[snaps.git] / snaps / openstack / tests / create_instance_tests.py
diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py

index ccdf45e..e0dca17 100644 (file)
--- 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");
  #                    and others.  All rights reserved.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +28,7 @@ from snaps.openstack.create_image import OpenStackImage
  from snaps.openstack.create_security_group import SecurityGroupSettings, OpenStackSecurityGroup
  from snaps.openstack.tests import openstack_tests, validation_utils
  from snaps.openstack.utils import nova_utils
  from snaps.openstack.create_security_group import SecurityGroupSettings, OpenStackSecurityGroup
  from snaps.openstack.tests import openstack_tests, validation_utils
  from snaps.openstack.utils import nova_utils
-from snaps.openstack.tests.os_source_file_test import OSComponentTestCase, OSIntegrationTestCase
+from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
  
  __author__ = 'spisarski'
  
  
  __author__ = 'spisarski'
  
@@ -59,29 +59,43 @@ class VmInstanceSettingsUnitTests(unittest.TestCase):
              VmInstanceSettings(config={'name': 'foo'})
  
      def test_name_flavor_only(self):
              VmInstanceSettings(config={'name': 'foo'})
  
      def test_name_flavor_only(self):
-        settings = VmInstanceSettings(name='foo', flavor='bar')
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.flavor)
-        self.assertEquals(0, len(settings.port_settings))
-        self.assertEquals(0, len(settings.security_group_names))
-        self.assertEquals(0, len(settings.floating_ip_settings))
+        with self.assertRaises(Exception):
+            VmInstanceSettings(name='foo', flavor='bar')
+
+    def test_config_with_name_flavor_only(self):
+        with self.assertRaises(Exception):
+            VmInstanceSettings(config={'name': 'foo', 'flavor': 'bar'})
+
+    def test_name_flavor_port_only(self):
+        port_settings = PortSettings(name='foo-port', network_name='bar-net')
+        settings = VmInstanceSettings(name='foo', flavor='bar', port_settings=[port_settings])
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.flavor)
+        self.assertEqual(1, len(settings.port_settings))
+        self.assertEqual('foo-port', settings.port_settings[0].name)
+        self.assertEqual('bar-net', settings.port_settings[0].network_name)
+        self.assertEqual(0, len(settings.security_group_names))
+        self.assertEqual(0, len(settings.floating_ip_settings))
          self.assertIsNone(settings.sudo_user)
          self.assertIsNone(settings.sudo_user)
-        self.assertEquals(900, settings.vm_boot_timeout)
-        self.assertEquals(300, settings.vm_delete_timeout)
-        self.assertEquals(180, settings.ssh_connect_timeout)
+        self.assertEqual(900, settings.vm_boot_timeout)
+        self.assertEqual(300, settings.vm_delete_timeout)
+        self.assertEqual(180, settings.ssh_connect_timeout)
          self.assertIsNone(settings.availability_zone)
  
          self.assertIsNone(settings.availability_zone)
  
-    def test_config_with_name_flavor_only(self):
-        settings = VmInstanceSettings(config={'name': 'foo', 'flavor': 'bar'})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.flavor)
-        self.assertEquals(0, len(settings.port_settings))
-        self.assertEquals(0, len(settings.security_group_names))
-        self.assertEquals(0, len(settings.floating_ip_settings))
+    def test_config_with_name_flavor_port_only(self):
+        port_settings = PortSettings(name='foo-port', network_name='bar-net')
+        settings = VmInstanceSettings(config={'name': 'foo', 'flavor': 'bar', 'ports': [port_settings]})
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.flavor)
+        self.assertEqual(1, len(settings.port_settings))
+        self.assertEqual('foo-port', settings.port_settings[0].name)
+        self.assertEqual('bar-net', settings.port_settings[0].network_name)
+        self.assertEqual(0, len(settings.security_group_names))
+        self.assertEqual(0, len(settings.floating_ip_settings))
          self.assertIsNone(settings.sudo_user)
          self.assertIsNone(settings.sudo_user)
-        self.assertEquals(900, settings.vm_boot_timeout)
-        self.assertEquals(300, settings.vm_delete_timeout)
-        self.assertEquals(180, settings.ssh_connect_timeout)
+        self.assertEqual(900, settings.vm_boot_timeout)
+        self.assertEqual(300, settings.vm_delete_timeout)
+        self.assertEqual(180, settings.ssh_connect_timeout)
          self.assertIsNone(settings.availability_zone)
  
      def test_all(self):
          self.assertIsNone(settings.availability_zone)
  
      def test_all(self):
@@ -92,22 +106,22 @@ class VmInstanceSettingsUnitTests(unittest.TestCase):
                                        security_group_names=['sec_grp_1'], floating_ip_settings=[fip_settings],
                                        sudo_user='joe', vm_boot_timeout=999, vm_delete_timeout=333,
                                        ssh_connect_timeout=111, availability_zone='server name')
                                        security_group_names=['sec_grp_1'], floating_ip_settings=[fip_settings],
                                        sudo_user='joe', vm_boot_timeout=999, vm_delete_timeout=333,
                                        ssh_connect_timeout=111, availability_zone='server name')
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.flavor)
-        self.assertEquals(1, len(settings.port_settings))
-        self.assertEquals('foo-port', settings.port_settings[0].name)
-        self.assertEquals('bar-net', settings.port_settings[0].network_name)
-        self.assertEquals(1, len(settings.security_group_names))
-        self.assertEquals('sec_grp_1', settings.security_group_names[0])
-        self.assertEquals(1, len(settings.floating_ip_settings))
-        self.assertEquals('foo-fip', settings.floating_ip_settings[0].name)
-        self.assertEquals('bar-port', settings.floating_ip_settings[0].port_name)
-        self.assertEquals('foo-bar-router', settings.floating_ip_settings[0].router_name)
-        self.assertEquals('joe', settings.sudo_user)
-        self.assertEquals(999, settings.vm_boot_timeout)
-        self.assertEquals(333, settings.vm_delete_timeout)
-        self.assertEquals(111, settings.ssh_connect_timeout)
-        self.assertEquals('server name', settings.availability_zone)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.flavor)
+        self.assertEqual(1, len(settings.port_settings))
+        self.assertEqual('foo-port', settings.port_settings[0].name)
+        self.assertEqual('bar-net', settings.port_settings[0].network_name)
+        self.assertEqual(1, len(settings.security_group_names))
+        self.assertEqual('sec_grp_1', settings.security_group_names[0])
+        self.assertEqual(1, len(settings.floating_ip_settings))
+        self.assertEqual('foo-fip', settings.floating_ip_settings[0].name)
+        self.assertEqual('bar-port', settings.floating_ip_settings[0].port_name)
+        self.assertEqual('foo-bar-router', settings.floating_ip_settings[0].router_name)
+        self.assertEqual('joe', settings.sudo_user)
+        self.assertEqual(999, settings.vm_boot_timeout)
+        self.assertEqual(333, settings.vm_delete_timeout)
+        self.assertEqual(111, settings.ssh_connect_timeout)
+        self.assertEqual('server name', settings.availability_zone)
  
      def test_config_all(self):
          port_settings = PortSettings(name='foo-port', network_name='bar-net')
  
      def test_config_all(self):
          port_settings = PortSettings(name='foo-port', network_name='bar-net')
@@ -118,21 +132,21 @@ class VmInstanceSettingsUnitTests(unittest.TestCase):
                                                'floating_ips': [fip_settings], 'sudo_user': 'joe',
                                                'vm_boot_timeout': 999, 'vm_delete_timeout': 333,
                                                'ssh_connect_timeout': 111, 'availability_zone': 'server name'})
                                                'floating_ips': [fip_settings], 'sudo_user': 'joe',
                                                'vm_boot_timeout': 999, 'vm_delete_timeout': 333,
                                                'ssh_connect_timeout': 111, 'availability_zone': 'server name'})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('bar', settings.flavor)
-        self.assertEquals(1, len(settings.port_settings))
-        self.assertEquals('foo-port', settings.port_settings[0].name)
-        self.assertEquals('bar-net', settings.port_settings[0].network_name)
-        self.assertEquals(1, len(settings.security_group_names))
-        self.assertEquals(1, len(settings.floating_ip_settings))
-        self.assertEquals('foo-fip', settings.floating_ip_settings[0].name)
-        self.assertEquals('bar-port', settings.floating_ip_settings[0].port_name)
-        self.assertEquals('foo-bar-router', settings.floating_ip_settings[0].router_name)
-        self.assertEquals('joe', settings.sudo_user)
-        self.assertEquals(999, settings.vm_boot_timeout)
-        self.assertEquals(333, settings.vm_delete_timeout)
-        self.assertEquals(111, settings.ssh_connect_timeout)
-        self.assertEquals('server name', settings.availability_zone)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('bar', settings.flavor)
+        self.assertEqual(1, len(settings.port_settings))
+        self.assertEqual('foo-port', settings.port_settings[0].name)
+        self.assertEqual('bar-net', settings.port_settings[0].network_name)
+        self.assertEqual(1, len(settings.security_group_names))
+        self.assertEqual(1, len(settings.floating_ip_settings))
+        self.assertEqual('foo-fip', settings.floating_ip_settings[0].name)
+        self.assertEqual('bar-port', settings.floating_ip_settings[0].port_name)
+        self.assertEqual('foo-bar-router', settings.floating_ip_settings[0].router_name)
+        self.assertEqual('joe', settings.sudo_user)
+        self.assertEqual(999, settings.vm_boot_timeout)
+        self.assertEqual(333, settings.vm_delete_timeout)
+        self.assertEqual(111, settings.ssh_connect_timeout)
+        self.assertEqual('server name', settings.availability_zone)
  
  
  class FloatingIpSettingsUnitTests(unittest.TestCase):
  
  
  class FloatingIpSettingsUnitTests(unittest.TestCase):
@@ -174,36 +188,36 @@ class FloatingIpSettingsUnitTests(unittest.TestCase):
  
      def test_name_port_router_only(self):
          settings = FloatingIpSettings(name='foo', port_name='foo-port', router_name='bar-router')
  
      def test_name_port_router_only(self):
          settings = FloatingIpSettings(name='foo', port_name='foo-port', router_name='bar-router')
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('foo-port', settings.port_name)
-        self.assertEquals('bar-router', settings.router_name)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('foo-port', settings.port_name)
+        self.assertEqual('bar-router', settings.router_name)
          self.assertIsNone(settings.subnet_name)
          self.assertTrue(settings.provisioning)
  
      def test_config_with_name_port_router_only(self):
          settings = FloatingIpSettings(config={'name': 'foo', 'port_name': 'foo-port', 'router_name': 'bar-router'})
          self.assertIsNone(settings.subnet_name)
          self.assertTrue(settings.provisioning)
  
      def test_config_with_name_port_router_only(self):
          settings = FloatingIpSettings(config={'name': 'foo', 'port_name': 'foo-port', 'router_name': 'bar-router'})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('foo-port', settings.port_name)
-        self.assertEquals('bar-router', settings.router_name)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('foo-port', settings.port_name)
+        self.assertEqual('bar-router', settings.router_name)
          self.assertIsNone(settings.subnet_name)
          self.assertTrue(settings.provisioning)
  
      def test_all(self):
          settings = FloatingIpSettings(name='foo', port_name='foo-port', router_name='bar-router',
                                        subnet_name='bar-subnet', provisioning=False)
          self.assertIsNone(settings.subnet_name)
          self.assertTrue(settings.provisioning)
  
      def test_all(self):
          settings = FloatingIpSettings(name='foo', port_name='foo-port', router_name='bar-router',
                                        subnet_name='bar-subnet', provisioning=False)
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('foo-port', settings.port_name)
-        self.assertEquals('bar-router', settings.router_name)
-        self.assertEquals('bar-subnet', settings.subnet_name)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('foo-port', settings.port_name)
+        self.assertEqual('bar-router', settings.router_name)
+        self.assertEqual('bar-subnet', settings.subnet_name)
          self.assertFalse(settings.provisioning)
  
      def test_config_all(self):
          settings = FloatingIpSettings(config={'name': 'foo', 'port_name': 'foo-port', 'router_name': 'bar-router',
                                                'subnet_name': 'bar-subnet', 'provisioning': False})
          self.assertFalse(settings.provisioning)
  
      def test_config_all(self):
          settings = FloatingIpSettings(config={'name': 'foo', 'port_name': 'foo-port', 'router_name': 'bar-router',
                                                'subnet_name': 'bar-subnet', 'provisioning': False})
-        self.assertEquals('foo', settings.name)
-        self.assertEquals('foo-port', settings.port_name)
-        self.assertEquals('bar-router', settings.router_name)
-        self.assertEquals('bar-subnet', settings.subnet_name)
+        self.assertEqual('foo', settings.name)
+        self.assertEqual('foo-port', settings.port_name)
+        self.assertEqual('bar-router', settings.router_name)
+        self.assertEqual('bar-subnet', settings.subnet_name)
          self.assertFalse(settings.provisioning)
  
  
          self.assertFalse(settings.provisioning)
  
  
@@ -239,10 +253,12 @@ class SimpleHealthCheck(OSIntegrationTestCase):
          self.port_settings = PortSettings(
              name=self.port_1_name, network_name=self.priv_net_config.network_settings.name)
  
          self.port_settings = PortSettings(
              name=self.port_1_name, network_name=self.priv_net_config.network_settings.name)
  
-        self.os_image_settings = openstack_tests.cirros_url_image(name=guid + '-image')
+        # Create Image
+        # Set the default image settings, then set any custom parameters sent from the app
+        self.os_image_settings = openstack_tests.cirros_image_settings(
+            name=guid + '-image', image_metadata=self.image_metadata)
  
          try:
  
          try:
-            # Create Image
              self.image_creator = OpenStackImage(self.os_creds, self.os_image_settings)
              self.image_creator.create()
  
              self.image_creator = OpenStackImage(self.os_creds, self.os_image_settings)
              self.image_creator.create()
  
@@ -253,7 +269,7 @@ class SimpleHealthCheck(OSIntegrationTestCase):
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
-                FlavorSettings(name=guid + '-flavor-name', ram=1024, disk=10, vcpus=1))
+                FlavorSettings(name=guid + '-flavor-name', ram=128, disk=10, vcpus=1, metadata=self.flavor_metadata))
              self.flavor_creator.create()
          except Exception as e:
              self.tearDown()
              self.flavor_creator.create()
          except Exception as e:
              self.tearDown()
@@ -267,7 +283,7 @@ class SimpleHealthCheck(OSIntegrationTestCase):
              try:
                  self.inst_creator.clean()
              except Exception as e:
              try:
                  self.inst_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning VM instance with message - ' + e.message)
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
  
          if os.path.isfile(self.keypair_pub_filepath):
              os.remove(self.keypair_pub_filepath)
  
          if os.path.isfile(self.keypair_pub_filepath):
              os.remove(self.keypair_pub_filepath)
@@ -275,23 +291,23 @@ class SimpleHealthCheck(OSIntegrationTestCase):
          if os.path.isfile(self.keypair_priv_filepath):
              os.remove(self.keypair_priv_filepath)
  
          if os.path.isfile(self.keypair_priv_filepath):
              os.remove(self.keypair_priv_filepath)
  
-        if self.flavor_creator:
+        if self.network_creator:
              try:
              try:
-                self.flavor_creator.clean()
+                self.network_creator.clean()
              except Exception as e:
              except Exception as e:
-                logger.error('Unexpected exception cleaning flavor with message - ' + e.message)
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
  
  
-        if self.network_creator:
+        if self.flavor_creator:
              try:
              try:
-                self.network_creator.clean()
+                self.flavor_creator.clean()
              except Exception as e:
              except Exception as e:
-                logger.error('Unexpected exception cleaning network with message - ' + e.message)
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning image with message - ' + e.message)
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
  
          super(self.__class__, self).__clean__()
  
  
          super(self.__class__, self).__clean__()
  
@@ -303,7 +319,8 @@ class SimpleHealthCheck(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[self.port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[self.port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
          vm = self.inst_creator.create()
  
          ip = self.inst_creator.get_port_ip(self.port_settings.name)
          vm = self.inst_creator.create()
  
          ip = self.inst_creator.get_port_ip(self.port_settings.name)
@@ -314,20 +331,22 @@ class SimpleHealthCheck(OSIntegrationTestCase):
          found = False
          timeout = 160
          start_time = time.time()
          found = False
          timeout = 160
          start_time = time.time()
-        match_value = 'Lease of.*obtained'
  
  
-        logger.info("Looking for expression %s in the console log" % match_value)
+        logger.info("Looking for IP %s in the console log" % ip)
+        full_log = ''
          while timeout > time.time() - start_time:
              output = vm.get_console_output()
          while timeout > time.time() - start_time:
              output = vm.get_console_output()
-            if re.search(match_value, output):
+            full_log = full_log + output
+            if re.search(ip, output):
                  logger.info('DHCP lease obtained logged in console')
                  logger.info('DHCP lease obtained logged in console')
-                if ip in output:
-                    logger.info('With correct IP address')
-                    found = True
-                else:
-                    logger.error('With incorrect IP address')
+                found = True
                  break
  
                  break
  
+        if not found:
+            logger.error('Full console output -\n' + full_log)
+        else:
+            logger.debug('Full console output -\n' + full_log)
+
          self.assertTrue(found)
  
  
          self.assertTrue(found)
  
  
@@ -345,22 +364,38 @@ 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)
          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(name=guid + '-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(
+            net_name=guid + '-pub-net', subnet_name=guid + '-pub-subnet',
+            router_name=guid + '-pub-router', external_net=self.ext_net_name)
  
          # Initialize for tearDown()
          self.image_creator = None
          self.flavor_creator = None
  
          # Initialize for tearDown()
          self.image_creator = None
          self.flavor_creator = None
+
+        self.network_creator = None
          self.inst_creator = None
  
          try:
              # Create Image
              self.image_creator = OpenStackImage(self.os_creds, self.os_image_settings)
              self.image_creator.create()
          self.inst_creator = None
  
          try:
              # Create Image
              self.image_creator = OpenStackImage(self.os_creds, self.os_image_settings)
              self.image_creator.create()
+
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
-                FlavorSettings(name=guid + '-flavor-name', ram=2048, disk=10, vcpus=2))
+                FlavorSettings(name=guid + '-flavor-name', ram=128, disk=10, vcpus=2, metadata=self.flavor_metadata))
              self.flavor_creator.create()
              self.flavor_creator.create()
+
+            # Create Network
+            self.network_creator = OpenStackNetwork(self.os_creds, net_config.network_settings)
+            self.network_creator.create()
+
+            self.port_settings = PortSettings(name=guid + '-port',
+                                              network_name=net_config.network_settings.name)
+
          except Exception as e:
              self.tearDown()
              raise e
          except Exception as e:
              self.tearDown()
              raise e
@@ -373,19 +408,25 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase):
              try:
                  self.inst_creator.clean()
              except Exception as e:
              try:
                  self.inst_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning VM instance with message - ' + e.message)
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning flavor with message - ' + e.message)
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
+
+        if self.network_creator:
+            try:
+                self.network_creator.clean()
+            except Exception as e:
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning image with message - ' + e.message)
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
  
          super(self.__class__, self).__clean__()
  
  
          super(self.__class__, self).__clean__()
  
@@ -393,19 +434,20 @@ class CreateInstanceSimpleTests(OSIntegrationTestCase):
          """
          Tests the creation of an OpenStack instance with a single port with a static IP without a Floating IP.
          """
          """
          Tests the creation of an OpenStack instance with a single port with a static IP without a Floating IP.
          """
-        instance_settings = VmInstanceSettings(name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name)
+        instance_settings = VmInstanceSettings(name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name,
+                                               port_settings=[self.port_settings])
  
          self.inst_creator = OpenStackVmInstance(
              self.os_creds, instance_settings, self.image_creator.image_settings)
  
          vm_inst = self.inst_creator.create()
  
          self.inst_creator = OpenStackVmInstance(
              self.os_creds, instance_settings, self.image_creator.image_settings)
  
          vm_inst = self.inst_creator.create()
-        self.assertEquals(1, len(nova_utils.get_servers_by_name(self.nova, instance_settings.name)))
+        self.assertEqual(1, len(nova_utils.get_servers_by_name(self.nova, instance_settings.name)))
  
          # Delete instance
          nova_utils.delete_vm_instance(self.nova, vm_inst)
  
          self.assertTrue(self.inst_creator.vm_deleted(block=True))
  
          # Delete instance
          nova_utils.delete_vm_instance(self.nova, vm_inst)
  
          self.assertTrue(self.inst_creator.vm_deleted(block=True))
-        self.assertEquals(0, len(nova_utils.get_servers_by_name(self.nova, instance_settings.name)))
+        self.assertEqual(0, len(nova_utils.get_servers_by_name(self.nova, instance_settings.name)))
  
          # Exception should not be thrown
          self.inst_creator.clean()
  
          # Exception should not be thrown
          self.inst_creator.clean()
@@ -443,8 +485,8 @@ 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.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(name=guid + '-image')
-
+        self.os_image_settings = openstack_tests.cirros_image_settings(
+            name=guid + '-image', image_metadata=self.image_metadata)
          try:
              # Create Image
              self.image_creator = OpenStackImage(self.os_creds, self.os_image_settings)
          try:
              # Create Image
              self.image_creator = OpenStackImage(self.os_creds, self.os_image_settings)
@@ -461,7 +503,7 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase):
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
-                FlavorSettings(name=guid + '-flavor-name', ram=2048, disk=10, vcpus=2))
+                FlavorSettings(name=guid + '-flavor-name', ram=128, disk=10, vcpus=2, metadata=self.flavor_metadata))
              self.flavor_creator.create()
  
              self.keypair_creator = OpenStackKeypair(
              self.flavor_creator.create()
  
              self.keypair_creator = OpenStackKeypair(
@@ -481,13 +523,13 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase):
              try:
                  inst_creator.clean()
              except Exception as e:
              try:
                  inst_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning VM instance with message - ' + e.message)
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
  
          if self.keypair_creator:
              try:
                  self.keypair_creator.clean()
              except Exception as e:
  
          if self.keypair_creator:
              try:
                  self.keypair_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning keypair with message - ' + e.message)
+                logger.error('Unexpected exception cleaning keypair with message - ' + str(e))
  
          if os.path.isfile(self.keypair_pub_filepath):
              os.remove(self.keypair_pub_filepath)
  
          if os.path.isfile(self.keypair_pub_filepath):
              os.remove(self.keypair_pub_filepath)
@@ -499,25 +541,25 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase):
              try:
                  self.flavor_creator.clean()
              except Exception as e:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning flavor with message - ' + e.message)
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
  
          if self.router_creator:
              try:
                  self.router_creator.clean()
              except Exception as e:
  
          if self.router_creator:
              try:
                  self.router_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning router with message - ' + e.message)
+                logger.error('Unexpected exception cleaning router with message - ' + str(e))
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning network with message - ' + e.message)
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning image with message - ' + e.message)
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
  
          super(self.__class__, self).__clean__()
  
  
          super(self.__class__, self).__clean__()
  
@@ -543,9 +585,9 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase):
          self.inst_creators.append(inst_creator)
          vm_inst = inst_creator.create()
  
          self.inst_creators.append(inst_creator)
          vm_inst = inst_creator.create()
  
-        self.assertEquals(ip_1, inst_creator.get_port_ip(self.port_1_name))
+        self.assertEqual(ip_1, inst_creator.get_port_ip(self.port_1_name))
          self.assertTrue(inst_creator.vm_active(block=True))
          self.assertTrue(inst_creator.vm_active(block=True))
-        self.assertEquals(vm_inst, inst_creator.get_vm_inst())
+        self.assertEqual(vm_inst, inst_creator.get_vm_inst())
  
      def test_ssh_client_fip_before_active(self):
          """
  
      def test_ssh_client_fip_before_active(self):
          """
@@ -568,9 +610,9 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase):
          self.assertIsNotNone(vm_inst)
  
          self.assertTrue(inst_creator.vm_active(block=True))
          self.assertIsNotNone(vm_inst)
  
          self.assertTrue(inst_creator.vm_active(block=True))
-        self.assertEquals(vm_inst, inst_creator.get_vm_inst())
+        self.assertEqual(vm_inst, inst_creator.get_vm_inst())
  
  
-        validate_ssh_client(inst_creator)
+        self.assertTrue(validate_ssh_client(inst_creator))
  
      def test_ssh_client_fip_after_active(self):
          """
  
      def test_ssh_client_fip_after_active(self):
          """
@@ -595,93 +637,9 @@ class CreateInstanceSingleNetworkTests(OSIntegrationTestCase):
          self.assertIsNotNone(vm_inst)
  
          self.assertTrue(inst_creator.vm_active(block=True))
          self.assertIsNotNone(vm_inst)
  
          self.assertTrue(inst_creator.vm_active(block=True))
-        self.assertEquals(vm_inst, inst_creator.get_vm_inst())
-
-        validate_ssh_client(inst_creator)
-
-    # TODO - Determine how allowed_address_pairs is supposed to operate before continuing this test
-    # see http://docs.openstack.org/developer/dragonflow/specs/allowed_address_pairs.html for a functional description
-    # def test_allowed_address_port_access(self):
-    #     """
-    #     Tests to ensure that setting allowed_address_pairs on a port functions as designed
-    #     """
-    #     port_settings_1 = PortSettings(
-    #         name=self.port_1_name + '-1', network_name=self.pub_net_config.network_settings.name)
-    #
-    #     instance_settings_1 = VmInstanceSettings(
-    #         name=self.vm_inst_name + '-1', flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings_1],
-    #         floating_ip_settings=[FloatingIpSettings(
-    #             name=self.floating_ip_name + '-1', port_name=port_settings_1.name,
-    #             router_name=self.pub_net_config.router_settings.name)])
-    #
-    #     inst_creator_1 = OpenStackVmInstance(
-    #         self.os_creds, instance_settings_1, self.image_creator.image_settings,
-    #         keypair_settings=self.keypair_creator.keypair_settings)
-    #     self.inst_creators.append(inst_creator_1)
-    #
-    #     # block=True will force the create() method to block until the
-    #     vm_inst_1 = inst_creator_1.create(block=True)
-    #     self.assertIsNotNone(vm_inst_1)
-    #
-    #     port_settings_1 = PortSettings(
-    #         name=self.port_1_name + '-1', network_name=self.pub_net_config.network_settings.name)
-    #
-    #     instance_settings_1 = VmInstanceSettings(
-    #         name=self.vm_inst_name + '-1', flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings_1],
-    #         floating_ip_settings=[FloatingIpSettings(
-    #             name=self.floating_ip_name + '-1', port_name=port_settings_1.name,
-    #             router_name=self.pub_net_config.router_settings.name)])
-    #
-    #     inst_creator_1 = OpenStackVmInstance(
-    #         self.os_creds, instance_settings_1, self.image_creator.image_settings,
-    #         keypair_settings=self.keypair_creator.keypair_settings)
-    #     self.inst_creators.append(inst_creator_1)
-    #     inst_creator_1.create(block=True)
-    #
-    #     ip = inst_creator_1.get_port_ip(port_settings_1.name,
-    #                                     subnet_name=self.pub_net_config.network_settings.subnet_settings[0].name)
-    #     self.assertIsNotNone(ip)
-    #     mac_addr = inst_creator_1.get_port_mac(port_settings_1.name)
-    #     self.assertIsNotNone(mac_addr)
-    #
-    #     allowed_address_pairs = [{'ip_address': ip, 'mac_address': mac_addr}]
-    #
-    #     # Create VM that can be accessed by vm_inst_1
-    #     port_settings_2 = PortSettings(
-    #         name=self.port_1_name + '-2', network_name=self.pub_net_config.network_settings.name,
-    #         allowed_address_pairs=allowed_address_pairs)
-    #
-    #     instance_settings_2 = VmInstanceSettings(
-    #         name=self.vm_inst_name + '-2', flavor=self.flavor_creator.flavor_settings.name,
-    #         port_settings=[port_settings_2])
-    #
-    #     inst_creator_2 = OpenStackVmInstance(
-    #         self.os_creds, instance_settings_2, self.image_creator.image_settings)
-    #     self.inst_creators.append(inst_creator_2)
-    #     inst_creator_2.create(block=True)
-    #
-    #     # Create VM that cannot be accessed by vm_inst_1
-    #     ip = '10.55.0.101'
-    #     mac_addr = '0a:1b:2c:3d:4e:5f'
-    #     invalid_address_pairs = [{'ip_address': ip, 'mac_address': mac_addr}]
-    #
-    #     port_settings_3 = PortSettings(
-    #         name=self.port_1_name + '-3', network_name=self.pub_net_config.network_settings.name,
-    #         allowed_address_pairs=invalid_address_pairs)
-    #
-    #     instance_settings_3 = VmInstanceSettings(
-    #         name=self.vm_inst_name + '-3', flavor=self.flavor_creator.flavor_settings.name,
-    #         port_settings=[port_settings_3])
-    #
-    #     inst_creator_3 = OpenStackVmInstance(
-    #         self.os_creds, instance_settings_3, self.image_creator.image_settings)
-    #     self.inst_creators.append(inst_creator_3)
-    #     inst_creator_3.create(block=True)
-    #
-    #     print 'foo'
-    # I expected that this feature would block/allow traffic from specific endpoints (VMs). In this case, I would expect
-    # inst_1 to be able to access inst_2 but not inst_3; however, they all can access each other.
-    # TODO - Add validation
+        self.assertEqual(vm_inst, inst_creator.get_vm_inst())
+
+        self.assertTrue(validate_ssh_client(inst_creator))
  
  
  class CreateInstancePortManipulationTests(OSIntegrationTestCase):
  
  
  class CreateInstancePortManipulationTests(OSIntegrationTestCase):
@@ -711,7 +669,8 @@ 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.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(name=guid + '-image')
+        self.os_image_settings = openstack_tests.cirros_image_settings(
+            name=guid + '-image', image_metadata=self.image_metadata)
  
          try:
              # Create Image
  
          try:
              # Create Image
@@ -725,7 +684,7 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
-                FlavorSettings(name=guid + '-flavor-name', ram=2048, disk=10, vcpus=2))
+                FlavorSettings(name=guid + '-flavor-name', ram=128, disk=10, vcpus=2, metadata=self.flavor_metadata))
              self.flavor_creator.create()
          except Exception as e:
              self.tearDown()
              self.flavor_creator.create()
          except Exception as e:
              self.tearDown()
@@ -739,25 +698,25 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
              try:
                  self.inst_creator.clean()
              except Exception as e:
              try:
                  self.inst_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning VM instance with message - ' + e.message)
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning flavor with message - ' + e.message)
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning network with message - ' + e.message)
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning image with message - ' + e.message)
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
  
          super(self.__class__, self).__clean__()
  
  
          super(self.__class__, self).__clean__()
  
@@ -773,10 +732,11 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        self.inst_creator.create()
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        self.inst_creator.create(block=True)
  
  
-        self.assertEquals(ip, self.inst_creator.get_port_ip(
+        self.assertEqual(ip, self.inst_creator.get_port_ip(
              self.port_1_name, subnet_name=self.net_config.network_settings.subnet_settings[0].name))
  
      def test_set_custom_invalid_ip_one_subnet(self):
              self.port_1_name, subnet_name=self.net_config.network_settings.subnet_settings[0].name))
  
      def test_set_custom_invalid_ip_one_subnet(self):
@@ -791,7 +751,8 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
  
          with self.assertRaises(Exception):
              self.inst_creator.create()
  
          with self.assertRaises(Exception):
              self.inst_creator.create()
@@ -807,10 +768,11 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        self.inst_creator.create()
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        self.inst_creator.create(block=True)
  
  
-        self.assertEquals(mac_addr, self.inst_creator.get_port_mac(self.port_1_name))
+        self.assertEqual(mac_addr, self.inst_creator.get_port_mac(self.port_1_name))
  
      def test_set_custom_invalid_mac(self):
          """
  
      def test_set_custom_invalid_mac(self):
          """
@@ -842,12 +804,13 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        self.inst_creator.create()
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        self.inst_creator.create(block=True)
  
  
-        self.assertEquals(ip, self.inst_creator.get_port_ip(
+        self.assertEqual(ip, self.inst_creator.get_port_ip(
              self.port_1_name, subnet_name=self.net_config.network_settings.subnet_settings[0].name))
              self.port_1_name, subnet_name=self.net_config.network_settings.subnet_settings[0].name))
-        self.assertEquals(mac_addr, self.inst_creator.get_port_mac(self.port_1_name))
+        self.assertEqual(mac_addr, self.inst_creator.get_port_mac(self.port_1_name))
  
      def test_set_allowed_address_pairs(self):
          """
  
      def test_set_allowed_address_pairs(self):
          """
@@ -862,13 +825,14 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        self.inst_creator.create()
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        self.inst_creator.create(block=True)
  
          port = self.inst_creator.get_port_by_name(port_settings.name)
          self.assertIsNotNone(port)
          self.assertIsNotNone(port['port'].get('allowed_address_pairs'))
  
          port = self.inst_creator.get_port_by_name(port_settings.name)
          self.assertIsNotNone(port)
          self.assertIsNotNone(port['port'].get('allowed_address_pairs'))
-        self.assertEquals(1, len(port['port']['allowed_address_pairs']))
+        self.assertEqual(1, len(port['port']['allowed_address_pairs']))
          validation_utils.objects_equivalent(pair, port['port']['allowed_address_pairs'][0])
  
      def test_set_allowed_address_pairs_bad_mac(self):
          validation_utils.objects_equivalent(pair, port['port']['allowed_address_pairs'][0])
  
      def test_set_allowed_address_pairs_bad_mac(self):
@@ -887,7 +851,8 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
          with self.assertRaises(Exception):
              self.inst_creator.create()
  
          with self.assertRaises(Exception):
              self.inst_creator.create()
  
@@ -907,12 +872,13 @@ class CreateInstancePortManipulationTests(OSIntegrationTestCase):
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[port_settings])
  
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
          with self.assertRaises(Exception):
              self.inst_creator.create()
  
  
          with self.assertRaises(Exception):
              self.inst_creator.create()
  
  
-class CreateInstanceOnComputeHost(OSComponentTestCase):
+class CreateInstanceOnComputeHost(OSIntegrationTestCase):
      """
      Test for the CreateInstance where one VM is deployed to each compute node
      """
      """
      Test for the CreateInstance where one VM is deployed to each compute node
      """
@@ -922,6 +888,8 @@ class CreateInstanceOnComputeHost(OSComponentTestCase):
          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
          """
+        super(self.__class__, self).__start__()
+
          guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
          self.vm_inst_name = guid + '-inst'
          self.port_base_name = guid + 'port'
          guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
          self.vm_inst_name = guid + '-inst'
          self.port_base_name = guid + 'port'
@@ -935,17 +903,18 @@ class CreateInstanceOnComputeHost(OSComponentTestCase):
          self.priv_net_config = openstack_tests.get_priv_net_config(
              net_name=guid + '-priv-net', subnet_name=guid + '-priv-subnet')
  
          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(name=guid + '-image')
+        self.os_image_settings = openstack_tests.cirros_image_settings(
+            name=guid + '-image', image_metadata=self.image_metadata)
  
          try:
              # Create Network
  
          try:
              # Create Network
-            self.network_creator = OpenStackNetwork(self.os_creds, self.priv_net_config.network_settings)
+            self.network_creator = OpenStackNetwork(self.admin_os_creds, self.priv_net_config.network_settings)
              self.network_creator.create()
  
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
              self.network_creator.create()
  
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
-                self.os_creds,
-                FlavorSettings(name=guid + '-flavor-name', ram=512, disk=1, vcpus=1))
+                self.admin_os_creds,
+                FlavorSettings(name=guid + '-flavor-name', ram=512, disk=1, vcpus=1, metadata=self.flavor_metadata))
              self.flavor_creator.create()
  
              # Create Image
              self.flavor_creator.create()
  
              # Create Image
@@ -964,32 +933,34 @@ class CreateInstanceOnComputeHost(OSComponentTestCase):
              try:
                  inst_creator.clean()
              except Exception as e:
              try:
                  inst_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning VM instance with message - ' + e.message)
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning flavor with message - ' + e.message)
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning network with message - ' + e.message)
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning image with message - ' + e.message)
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
+
+        super(self.__class__, self).__clean__()
  
      def test_deploy_vm_to_each_compute_node(self):
          """
          Tests the creation of OpenStack VM instances to each compute node.
          """
          from snaps.openstack.utils import nova_utils
  
      def test_deploy_vm_to_each_compute_node(self):
          """
          Tests the creation of OpenStack VM instances to each compute node.
          """
          from snaps.openstack.utils import nova_utils
-        nova = nova_utils.nova_client(self.os_creds)
+        nova = nova_utils.nova_client(self.admin_os_creds)
          zones = nova_utils.get_nova_availability_zones(nova)
  
          # Create Instance on each server/zone
          zones = nova_utils.get_nova_availability_zones(nova)
  
          # Create Instance on each server/zone
@@ -1004,7 +975,7 @@ class CreateInstanceOnComputeHost(OSComponentTestCase):
                  name=inst_name, flavor=self.flavor_creator.flavor_settings.name, availability_zone=zone,
                  port_settings=[port_settings])
              inst_creator = OpenStackVmInstance(
                  name=inst_name, flavor=self.flavor_creator.flavor_settings.name, availability_zone=zone,
                  port_settings=[port_settings])
              inst_creator = OpenStackVmInstance(
-                self.os_creds, instance_settings, self.image_creator.image_settings)
+                self.admin_os_creds, instance_settings, self.image_creator.image_settings)
              self.inst_creators.append(inst_creator)
              inst_creator.create()
  
              self.inst_creators.append(inst_creator)
              inst_creator.create()
  
@@ -1016,7 +987,7 @@ class CreateInstanceOnComputeHost(OSComponentTestCase):
              vm = creator.get_vm_inst()
              deployed_zone = vm._info['OS-EXT-AZ:availability_zone']
              deployed_host = vm._info['OS-EXT-SRV-ATTR:host']
              vm = creator.get_vm_inst()
              deployed_zone = vm._info['OS-EXT-AZ:availability_zone']
              deployed_host = vm._info['OS-EXT-SRV-ATTR:host']
-            self.assertEquals(zone, deployed_zone + ':' + deployed_host)
+            self.assertEqual(zone, deployed_zone + ':' + deployed_host)
              index += 1
  
  
              index += 1
  
  
@@ -1055,8 +1026,10 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase):
          self.pub_net_config = openstack_tests.get_pub_net_config(
              net_name=self.guid + '-pub-net', subnet_name=self.guid + '-pub-subnet',
              router_name=self.guid + '-pub-router', external_net=self.ext_net_name)
          self.pub_net_config = openstack_tests.get_pub_net_config(
              net_name=self.guid + '-pub-net', subnet_name=self.guid + '-pub-subnet',
              router_name=self.guid + '-pub-router', external_net=self.ext_net_name)
+
          image_name = self.__class__.__name__ + '-' + str(uuid.uuid4())
          image_name = self.__class__.__name__ + '-' + str(uuid.uuid4())
-        self.os_image_settings = openstack_tests.centos_url_image(name=image_name)
+        self.os_image_settings = openstack_tests.centos_image_settings(name=image_name,
+                                                                       image_metadata=self.image_metadata)
  
          try:
              # Create Image
  
          try:
              # Create Image
@@ -1080,7 +1053,8 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase):
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
-                FlavorSettings(name=self.guid + '-flavor-name', ram=2048, disk=10, vcpus=2))
+                FlavorSettings(name=self.guid + '-flavor-name', ram=512, disk=10, vcpus=2,
+                               metadata=self.flavor_metadata))
              self.flavor_creator.create()
  
              # Create Keypair
              self.flavor_creator.create()
  
              # Create Keypair
@@ -1091,7 +1065,7 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase):
              self.keypair_creator.create()
          except Exception as e:
              self.tearDown()
              self.keypair_creator.create()
          except Exception as e:
              self.tearDown()
-            raise Exception(e.message)
+            raise Exception(str(e))
  
      def tearDown(self):
          """
  
      def tearDown(self):
          """
@@ -1101,13 +1075,13 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase):
              try:
                  self.inst_creator.clean()
              except Exception as e:
              try:
                  self.inst_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning VM instance with message - ' + e.message)
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
  
          if self.keypair_creator:
              try:
                  self.keypair_creator.clean()
              except Exception as e:
  
          if self.keypair_creator:
              try:
                  self.keypair_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning keypair with message - ' + e.message)
+                logger.error('Unexpected exception cleaning keypair with message - ' + str(e))
  
          if os.path.isfile(self.keypair_pub_filepath):
              os.remove(self.keypair_pub_filepath)
  
          if os.path.isfile(self.keypair_pub_filepath):
              os.remove(self.keypair_pub_filepath)
@@ -1119,25 +1093,25 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase):
              try:
                  self.flavor_creator.clean()
              except Exception as e:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning flavor with message - ' + e.message)
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
  
          for router_creator in self.router_creators:
              try:
                  router_creator.clean()
              except Exception as e:
  
          for router_creator in self.router_creators:
              try:
                  router_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning router with message - ' + e.message)
+                logger.error('Unexpected exception cleaning router with message - ' + str(e))
  
          for network_creator in self.network_creators:
              try:
                  network_creator.clean()
              except Exception as e:
  
          for network_creator in self.network_creators:
              try:
                  network_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning network with message - ' + e.message)
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning image with message - ' + e.message)
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
  
          super(self.__class__, self).__clean__()
  
  
          super(self.__class__, self).__clean__()
  
@@ -1172,7 +1146,7 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase):
  
          vm_inst = self.inst_creator.create(block=True)
  
  
          vm_inst = self.inst_creator.create(block=True)
  
-        self.assertEquals(vm_inst, self.inst_creator.get_vm_inst())
+        self.assertEqual(vm_inst, self.inst_creator.get_vm_inst())
  
          # Effectively blocks until VM has been properly activated
          self.assertTrue(self.inst_creator.vm_active(block=True))
  
          # Effectively blocks until VM has been properly activated
          self.assertTrue(self.inst_creator.vm_active(block=True))
@@ -1180,6 +1154,7 @@ class CreateInstancePubPrivNetTests(OSIntegrationTestCase):
          # Effectively blocks until VM's ssh port has been opened
          self.assertTrue(self.inst_creator.vm_ssh_active(block=True))
  
          # Effectively blocks until VM's ssh port has been opened
          self.assertTrue(self.inst_creator.vm_ssh_active(block=True))
  
+        # TODO - Refactor config_nics() to return a status that can be validated here.
          self.inst_creator.config_nics()
  
          # TODO - *** ADD VALIDATION HERE ***
          self.inst_creator.config_nics()
  
          # TODO - *** ADD VALIDATION HERE ***
@@ -1202,23 +1177,20 @@ 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.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(name=self.guid + '-image')
+        self.os_image_settings = openstack_tests.cirros_image_settings(
+            name=self.guid + '-image', image_metadata=self.image_metadata)
  
  
-        self.keypair_priv_filepath = 'tmp/' + self.guid
-        self.keypair_pub_filepath = self.keypair_priv_filepath + '.pub'
-        self.keypair_name = self.guid + '-kp'
          self.vm_inst_name = self.guid + '-inst'
          self.port_1_name = self.guid + 'port-1'
          self.port_2_name = self.guid + 'port-2'
          self.floating_ip_name = self.guid + 'fip1'
  
          self.vm_inst_name = self.guid + '-inst'
          self.port_1_name = self.guid + 'port-1'
          self.port_2_name = self.guid + 'port-2'
          self.floating_ip_name = self.guid + 'fip1'
  
-        self.pub_net_config = openstack_tests.get_pub_net_config(
+        net_config = openstack_tests.get_priv_net_config(
              net_name=self.guid + '-pub-net', subnet_name=self.guid + '-pub-subnet',
              router_name=self.guid + '-pub-router', external_net=self.ext_net_name)
  
          # Initialize for tearDown()
          self.image_creator = None
              net_name=self.guid + '-pub-net', subnet_name=self.guid + '-pub-subnet',
              router_name=self.guid + '-pub-router', external_net=self.ext_net_name)
  
          # Initialize for tearDown()
          self.image_creator = None
-        self.keypair_creator = None
          self.flavor_creator = None
          self.network_creator = None
          self.router_creator = None
          self.flavor_creator = None
          self.network_creator = None
          self.router_creator = None
@@ -1231,24 +1203,18 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase):
              self.image_creator.create()
  
              # Create Network
              self.image_creator.create()
  
              # Create Network
-            self.network_creator = OpenStackNetwork(self.os_creds, self.pub_net_config.network_settings)
+            self.network_creator = OpenStackNetwork(self.os_creds, net_config.network_settings)
              self.network_creator.create()
  
              self.network_creator.create()
  
-            # Create Router
-            self.router_creator = OpenStackRouter(self.os_creds, self.pub_net_config.router_settings)
-            self.router_creator.create()
-
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
              # Create Flavor
              self.flavor_creator = OpenStackFlavor(
                  self.admin_os_creds,
-                FlavorSettings(name=self.guid + '-flavor-name', ram=2048, disk=10, vcpus=2))
+                FlavorSettings(name=self.guid + '-flavor-name', ram=128, disk=10, vcpus=2,
+                               metadata=self.flavor_metadata))
              self.flavor_creator.create()
  
              self.flavor_creator.create()
  
-            self.keypair_creator = OpenStackKeypair(
-                self.os_creds, KeypairSettings(
-                    name=self.keypair_name, public_filepath=self.keypair_pub_filepath,
-                    private_filepath=self.keypair_priv_filepath))
-            self.keypair_creator.create()
+            self.port_settings = PortSettings(name=self.guid + '-port',
+                                              network_name=net_config.network_settings.name)
          except Exception as e:
              self.tearDown()
              raise e
          except Exception as e:
              self.tearDown()
              raise e
@@ -1261,49 +1227,31 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase):
              try:
                  self.inst_creator.clean()
              except Exception as e:
              try:
                  self.inst_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning VM instance with message - ' + e.message)
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
  
          for sec_grp_creator in self.sec_grp_creators:
              try:
                  sec_grp_creator.clean()
              except Exception as e:
  
          for sec_grp_creator in self.sec_grp_creators:
              try:
                  sec_grp_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning security group with message - ' + e.message)
-
-        if self.keypair_creator:
-            try:
-                self.keypair_creator.clean()
-            except Exception as e:
-                logger.error('Unexpected exception cleaning keypair with message - ' + e.message)
-
-        if os.path.isfile(self.keypair_pub_filepath):
-            os.remove(self.keypair_pub_filepath)
-
-        if os.path.isfile(self.keypair_priv_filepath):
-            os.remove(self.keypair_priv_filepath)
+                logger.error('Unexpected exception cleaning security group with message - ' + str(e))
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
  
          if self.flavor_creator:
              try:
                  self.flavor_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning flavor with message - ' + e.message)
-
-        if self.router_creator:
-            try:
-                self.router_creator.clean()
-            except Exception as e:
-                logger.error('Unexpected exception cleaning router with message - ' + e.message)
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
  
          if self.network_creator:
              try:
                  self.network_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning network with message - ' + e.message)
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
  
          if self.image_creator:
              try:
                  self.image_creator.clean()
              except Exception as e:
-                logger.error('Unexpected exception cleaning image with message - ' + e.message)
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
  
          super(self.__class__, self).__clean__()
  
  
          super(self.__class__, self).__clean__()
  
@@ -1313,9 +1261,10 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase):
          """
          # Create instance
          instance_settings = VmInstanceSettings(
          """
          # Create instance
          instance_settings = VmInstanceSettings(
-            name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name)
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        vm_inst = self.inst_creator.create()
+            name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[self.port_settings])
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        vm_inst = self.inst_creator.create(block=True)
          self.assertIsNotNone(vm_inst)
  
          # Create security group object to add to instance
          self.assertIsNotNone(vm_inst)
  
          # Create security group object to add to instance
@@ -1339,9 +1288,10 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase):
          """
          # Create instance
          instance_settings = VmInstanceSettings(
          """
          # Create instance
          instance_settings = VmInstanceSettings(
-            name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name)
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        vm_inst = self.inst_creator.create()
+            name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[self.port_settings])
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        vm_inst = self.inst_creator.create(block=True)
          self.assertIsNotNone(vm_inst)
  
          # Create security group object to add to instance
          self.assertIsNotNone(vm_inst)
  
          # Create security group object to add to instance
@@ -1373,9 +1323,10 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase):
          # Create instance
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name,
          # Create instance
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name,
-            security_group_names=[sec_grp_settings.name])
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        vm_inst = self.inst_creator.create()
+            security_group_names=[sec_grp_settings.name], port_settings=[self.port_settings])
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        vm_inst = self.inst_creator.create(block=True)
          self.assertIsNotNone(vm_inst)
  
          # Check that group has been added
          self.assertIsNotNone(vm_inst)
  
          # Check that group has been added
@@ -1399,13 +1350,14 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase):
  
          # Create instance
          instance_settings = VmInstanceSettings(
  
          # Create instance
          instance_settings = VmInstanceSettings(
-            name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name)
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        vm_inst = self.inst_creator.create()
+            name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name, port_settings=[self.port_settings])
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        vm_inst = self.inst_creator.create(block=True)
          self.assertIsNotNone(vm_inst)
  
          # Check that group has been added
          self.assertIsNotNone(vm_inst)
  
          # Check that group has been added
-        self.assertFalse(inst_has_sec_grp(vm_inst, sec_grp_settings.name))
+        self.assertFalse(inst_has_sec_grp(self.inst_creator.get_vm_inst(), sec_grp_settings.name))
  
          # Add security group to instance after activated
          self.assertFalse(self.inst_creator.remove_security_group(sec_grp))
  
          # Add security group to instance after activated
          self.assertFalse(self.inst_creator.remove_security_group(sec_grp))
@@ -1426,13 +1378,14 @@ class InstanceSecurityGroupTests(OSIntegrationTestCase):
          # Create instance
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name,
          # Create instance
          instance_settings = VmInstanceSettings(
              name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name,
-            security_group_names=[sec_grp_settings.name])
-        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings, self.image_creator.image_settings)
-        vm_inst = self.inst_creator.create()
+            security_group_names=[sec_grp_settings.name], port_settings=[self.port_settings])
+        self.inst_creator = OpenStackVmInstance(self.os_creds, instance_settings,
+                                                self.image_creator.image_settings)
+        vm_inst = self.inst_creator.create(block=True)
          self.assertIsNotNone(vm_inst)
  
          # Check that group has been added
          self.assertIsNotNone(vm_inst)
  
          # Check that group has been added
-        self.assertTrue(inst_has_sec_grp(vm_inst, sec_grp_settings.name))
+        self.assertTrue(inst_has_sec_grp(self.inst_creator.get_vm_inst(), sec_grp_settings.name))
  
          # Add security group to instance after activated
          self.assertTrue(self.inst_creator.add_security_group(sec_grp))
  
          # Add security group to instance after activated
          self.assertTrue(self.inst_creator.add_security_group(sec_grp))
@@ -1480,3 +1433,102 @@ def validate_ssh_client(instance_creator):
          return True
  
      return False
          return True
  
      return False
+
+
+class CreateInstanceFromThreePartImage(OSIntegrationTestCase):
+    """
+    Test for the CreateInstance class for creating an image from a 3-part image
+    """
+
+    def setUp(self):
+        """
+        Instantiates the CreateImage object that is responsible for downloading and creating an OS image file
+        within OpenStack
+        """
+        super(self.__class__, self).__start__()
+
+        guid = self.__class__.__name__ + '-' + str(uuid.uuid4())
+        self.image_name = guid
+        self.vm_inst_name = guid + '-inst'
+        self.nova = nova_utils.nova_client(self.os_creds)
+
+        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)
+
+        # Initialize for tearDown()
+        self.image_creator = None
+        self.network_creator = None
+        self.flavor_creator = None
+        self.inst_creator = None
+
+        try:
+            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',
+                                'ramdisk_url': 'http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-initramfs'})
+
+            self.image_creator = OpenStackImage(self.os_creds, image_settings)
+            self.image_creator.create()
+
+            # Create Flavor
+            self.flavor_creator = OpenStackFlavor(
+                self.admin_os_creds,
+                FlavorSettings(name=guid + '-flavor-name', ram=128, disk=10, vcpus=2, metadata=self.flavor_metadata))
+            self.flavor_creator.create()
+
+            # Create Network
+            self.network_creator = OpenStackNetwork(self.os_creds, net_config.network_settings)
+            self.network_creator.create()
+
+            self.port_settings = PortSettings(name=guid + '-port',
+                                              network_name=net_config.network_settings.name)
+        except Exception as e:
+            self.tearDown()
+            raise e
+
+    def tearDown(self):
+        """
+        Cleans the created object
+        """
+        if self.inst_creator:
+            try:
+                self.inst_creator.clean()
+            except Exception as e:
+                logger.error('Unexpected exception cleaning VM instance with message - ' + str(e))
+
+        if self.flavor_creator:
+            try:
+                self.flavor_creator.clean()
+            except Exception as e:
+                logger.error('Unexpected exception cleaning flavor with message - ' + str(e))
+
+        if self.network_creator:
+            try:
+                self.network_creator.clean()
+            except Exception as e:
+                logger.error('Unexpected exception cleaning network with message - ' + str(e))
+
+        if self.image_creator:
+            try:
+                self.image_creator.clean()
+            except Exception as e:
+                logger.error('Unexpected exception cleaning image with message - ' + str(e))
+
+        super(self.__class__, self).__clean__()
+
+    def test_create_instance_from_three_part_image(self):
+        """
+        Tests the creation of an OpenStack instance from a 3-part image.
+        """
+        instance_settings = VmInstanceSettings(name=self.vm_inst_name, flavor=self.flavor_creator.flavor_settings.name,
+                                               port_settings=[self.port_settings])
+
+        # The last created image is the main image from which we create the instance
+        self.inst_creator = OpenStackVmInstance(
+            self.os_creds, instance_settings, self.image_creator.image_settings)
+
+        vm_inst = self.inst_creator.create()
+        self.assertIsNotNone(vm_inst)
+        self.assertTrue(self.inst_creator.vm_active(block=True))