Use neutron to create floating IPs.

This patch moves the floating IP creation out of nova and into neutron.
Other changes include the use of domain objects for VM and Floating IP
instances, addition of new nova_utils tests to exercise the create
server functionality, and more PEP8 compliance.

JIRA: SNAPS-92

Change-Id: I16c12b26b56008901633e90ae307586ad2045f9b
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

1 files changed, 262 insertions, 134 deletions

diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py
index e4f5685..d87ae5a 100644
--- a/snaps/test_suite_builder.py
+++ b/snaps/test_suite_builder.py
@@ -18,34 +18,54 @@ import unittest
 
 from snaps.domain.test.image_tests import ImageDomainObjectTests
 from snaps.domain.test.stack_tests import StackDomainObjectTests
-from snaps.openstack.tests.create_stack_tests import StackSettingsUnitTests, CreateStackSuccessTests, \
-    CreateStackNegativeTests
-from snaps.openstack.utils.tests.glance_utils_tests import GlanceSmokeTests, GlanceUtilsTests
+from snaps.domain.test.vm_inst_tests import (VmInstDomainObjectTests,
+                                             FloatingIpDomainObjectTests)
 from snaps.openstack.tests.create_flavor_tests import CreateFlavorTests
-from snaps.openstack.utils.tests.heat_utils_tests import HeatUtilsCreateStackTests, HeatSmokeTests
+from snaps.openstack.tests.create_image_tests import (
+    CreateImageSuccessTests, CreateImageNegativeTests, ImageSettingsUnitTests,
+    CreateMultiPartImageTests)
+from snaps.openstack.tests.create_instance_tests import (
+    CreateInstanceSingleNetworkTests, CreateInstancePubPrivNetTests,
+    CreateInstanceOnComputeHost, CreateInstanceSimpleTests,
+    FloatingIpSettingsUnitTests, InstanceSecurityGroupTests,
+    VmInstanceSettingsUnitTests, CreateInstancePortManipulationTests,
+    SimpleHealthCheck, CreateInstanceFromThreePartImage,
+    CreateInstanceMockOfflineTests)
+from snaps.openstack.tests.create_keypairs_tests import (
+    CreateKeypairsTests, KeypairSettingsUnitTests)
+from snaps.openstack.tests.create_network_tests import (
+    CreateNetworkSuccessTests, NetworkSettingsUnitTests, PortSettingsUnitTests,
+    SubnetSettingsUnitTests, CreateNetworkTypeTests)
+from snaps.openstack.tests.create_project_tests import (
+    CreateProjectSuccessTests, ProjectSettingsUnitTests,
+    CreateProjectUserTests)
+from snaps.openstack.tests.create_router_tests import (
+    CreateRouterSuccessTests, CreateRouterNegativeTests)
+from snaps.openstack.tests.create_security_group_tests import (
+    CreateSecurityGroupTests, SecurityGroupRuleSettingsUnitTests,
+    SecurityGroupSettingsUnitTests)
+from snaps.openstack.tests.create_stack_tests import (
+    StackSettingsUnitTests, CreateStackSuccessTests,  CreateStackNegativeTests)
+from snaps.openstack.tests.create_user_tests import (
+    UserSettingsUnitTests, CreateUserSuccessTests)
+from snaps.openstack.tests.os_source_file_test import (
+    OSComponentTestCase, OSIntegrationTestCase)
+from snaps.openstack.utils.tests.glance_utils_tests import (
+    GlanceSmokeTests, GlanceUtilsTests)
+from snaps.openstack.utils.tests.heat_utils_tests import (
+    HeatUtilsCreateStackTests, HeatSmokeTests)
+from snaps.openstack.utils.tests.keystone_utils_tests import (
+    KeystoneSmokeTests, KeystoneUtilsTests)
+from snaps.openstack.utils.tests.neutron_utils_tests import (
+    NeutronSmokeTests, NeutronUtilsNetworkTests, NeutronUtilsSubnetTests,
+    NeutronUtilsRouterTests, NeutronUtilsSecurityGroupTests,
+    NeutronUtilsFloatingIpTests)
+from snaps.openstack.utils.tests.nova_utils_tests import (
+    NovaSmokeTests, NovaUtilsKeypairTests, NovaUtilsFlavorTests,
+    NovaUtilsInstanceTests)
+from snaps.provisioning.tests.ansible_utils_tests import (
+    AnsibleProvisioningTests)
 from snaps.tests.file_utils_tests import FileUtilsTests
-from snaps.openstack.tests.create_security_group_tests import CreateSecurityGroupTests, \
-    SecurityGroupRuleSettingsUnitTests, SecurityGroupSettingsUnitTests
-from snaps.openstack.tests.create_project_tests import CreateProjectSuccessTests, ProjectSettingsUnitTests, \
-    CreateProjectUserTests
-from snaps.openstack.tests.create_user_tests import UserSettingsUnitTests, CreateUserSuccessTests
-from snaps.openstack.utils.tests.keystone_utils_tests import KeystoneSmokeTests, KeystoneUtilsTests
-from snaps.openstack.utils.tests.neutron_utils_tests import NeutronSmokeTests, NeutronUtilsNetworkTests, \
-    NeutronUtilsSubnetTests, NeutronUtilsRouterTests, NeutronUtilsSecurityGroupTests
-from snaps.openstack.tests.create_image_tests import CreateImageSuccessTests, CreateImageNegativeTests, \
-    ImageSettingsUnitTests, CreateMultiPartImageTests
-from snaps.openstack.tests.create_keypairs_tests import CreateKeypairsTests, KeypairSettingsUnitTests
-from snaps.openstack.tests.create_network_tests import CreateNetworkSuccessTests, NetworkSettingsUnitTests, \
-    PortSettingsUnitTests, SubnetSettingsUnitTests, CreateNetworkTypeTests
-from snaps.openstack.tests.create_router_tests import CreateRouterSuccessTests, CreateRouterNegativeTests
-from snaps.openstack.tests.create_instance_tests import CreateInstanceSingleNetworkTests, \
-    CreateInstancePubPrivNetTests, CreateInstanceOnComputeHost, CreateInstanceSimpleTests, \
-    FloatingIpSettingsUnitTests, InstanceSecurityGroupTests, VmInstanceSettingsUnitTests, \
-    CreateInstancePortManipulationTests, SimpleHealthCheck, CreateInstanceFromThreePartImage, \
-    CreateInstanceMockOfflineTests
-from snaps.provisioning.tests.ansible_utils_tests import AnsibleProvisioningTests
-from snaps.openstack.tests.os_source_file_test import OSComponentTestCase, OSIntegrationTestCase
-from snaps.openstack.utils.tests.nova_utils_tests import NovaSmokeTests, NovaUtilsKeypairTests, NovaUtilsFlavorTests
 
 __author__ = 'spisarski'
 
@@ -57,59 +77,95 @@ def add_unit_tests(suite):
     :return: None as the tests will be adding to the 'suite' parameter object
     """
     suite.addTest(unittest.TestLoader().loadTestsFromTestCase(FileUtilsTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(SecurityGroupRuleSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(SecurityGroupSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ImageSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ImageDomainObjectTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(KeypairSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(UserSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(ProjectSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(NetworkSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(SubnetSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(PortSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(FloatingIpSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(VmInstanceSettingsUnitTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(StackDomainObjectTests))
-    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(StackSettingsUnitTests))
-
-
-def add_openstack_client_tests(suite, os_creds, ext_net_name, use_keystone=True, log_level=logging.INFO):
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
+        SecurityGroupRuleSettingsUnitTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
+        SecurityGroupSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(ImageSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(ImageDomainObjectTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(KeypairSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(UserSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(ProjectSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(NetworkSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(SubnetSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(PortSettingsUnitTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
+        FloatingIpSettingsUnitTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
+        VmInstanceSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(StackDomainObjectTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(StackSettingsUnitTests))
+    suite.addTest(
+        unittest.TestLoader().loadTestsFromTestCase(VmInstDomainObjectTests))
+    suite.addTest(unittest.TestLoader().loadTestsFromTestCase(
+        FloatingIpDomainObjectTests))
+
+
+def add_openstack_client_tests(suite, os_creds, ext_net_name,
+                               use_keystone=True, log_level=logging.INFO):
     """
     Adds tests written to exercise OpenStack client retrieval
     :param suite: the unittest.TestSuite object to which to add the tests
-    :param os_creds: and instance of OSCreds that holds the credentials required by OpenStack
-    :param ext_net_name: the name of an external network on the cloud under test
-    :param use_keystone: when True, tests requiring direct access to Keystone are added as these need to be running on
-                         a host that has access to the cloud's private network
+    :param os_creds: and instance of OSCreds that holds the credentials
+                     required by OpenStack
+    :param ext_net_name: the name of an external network on the cloud under
+                         test
+    :param use_keystone: when True, tests requiring direct access to Keystone
+                         are added as these need to be running on a host that
+                         has access to the cloud's private network
     :param log_level: the logging level
     :return: None as the tests will be adding to the 'suite' parameter object
     """
     # Basic connection tests
-    suite.addTest(OSComponentTestCase.parameterize(GlanceSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
-                                                   log_level=log_level))
+    suite.addTest(
+        OSComponentTestCase.parameterize(
+            GlanceSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
+            log_level=log_level))
 
     if use_keystone:
-        suite.addTest(OSComponentTestCase.parameterize(KeystoneSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
-                                                       log_level=log_level))
+        suite.addTest(
+            OSComponentTestCase.parameterize(
+                KeystoneSmokeTests, os_creds=os_creds,
+                ext_net_name=ext_net_name, log_level=log_level))
 
-    suite.addTest(OSComponentTestCase.parameterize(NeutronSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
-                                                   log_level=log_level))
-    suite.addTest(OSComponentTestCase.parameterize(NovaSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
-                                                   log_level=log_level))
-    suite.addTest(OSComponentTestCase.parameterize(HeatSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
-                                                   log_level=log_level))
+    suite.addTest(
+        OSComponentTestCase.parameterize(
+            NeutronSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
+            log_level=log_level))
+    suite.addTest(
+        OSComponentTestCase.parameterize(
+            NovaSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
+            log_level=log_level))
+    suite.addTest(
+        OSComponentTestCase.parameterize(
+            HeatSmokeTests, os_creds=os_creds, ext_net_name=ext_net_name,
+            log_level=log_level))
 
 
-def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True, image_metadata=None,
-                            log_level=logging.INFO):
+def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True,
+                            image_metadata=None, log_level=logging.INFO):
     """
     Adds tests written to exercise all existing OpenStack APIs
     :param suite: the unittest.TestSuite object to which to add the tests
-    :param os_creds: and instance of OSCreds that holds the credentials required by OpenStack
-    :param ext_net_name: the name of an external network on the cloud under test
-    :param use_keystone: when True, tests requiring direct access to Keystone are added as these need to be running on
-                         a host that has access to the cloud's private network
-    :param image_metadata: dict() object containing metadata for creating an image with custom config
+    :param os_creds: Instance of OSCreds that holds the credentials
+                     required by OpenStack
+    :param ext_net_name: the name of an external network on the cloud under
+                         test
+    :param use_keystone: when True, tests requiring direct access to Keystone
+                         are added as these need to be running on a host that
+                         has access to the cloud's private network
+    :param image_metadata: dict() object containing metadata for creating an
+                           image with custom config
                            (see YAML files in examples/image-metadata)
     :param log_level: the logging level
     :return: None as the tests will be adding to the 'suite' parameter object
@@ -117,131 +173,203 @@ def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True, im
     # Tests the OpenStack API calls
     if use_keystone:
         suite.addTest(OSComponentTestCase.parameterize(
-            KeystoneUtilsTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+            KeystoneUtilsTests, os_creds=os_creds, ext_net_name=ext_net_name,
+            log_level=log_level))
         suite.addTest(OSComponentTestCase.parameterize(
-            CreateUserSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+            CreateUserSuccessTests, os_creds=os_creds,
+            ext_net_name=ext_net_name, log_level=log_level))
         suite.addTest(OSComponentTestCase.parameterize(
-            CreateProjectSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+            CreateProjectSuccessTests, os_creds=os_creds,
+            ext_net_name=ext_net_name, log_level=log_level))
         suite.addTest(OSComponentTestCase.parameterize(
-            CreateProjectUserTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+            CreateProjectUserTests, os_creds=os_creds,
+            ext_net_name=ext_net_name, log_level=log_level))
 
     suite.addTest(OSComponentTestCase.parameterize(
-        GlanceUtilsTests, os_creds=os_creds, ext_net_name=ext_net_name, image_metadata=image_metadata,
+        GlanceUtilsTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        image_metadata=image_metadata,
+        log_level=log_level))
+    suite.addTest(OSComponentTestCase.parameterize(
+        NeutronUtilsNetworkTests, os_creds=os_creds, ext_net_name=ext_net_name,
         log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        NeutronUtilsNetworkTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        NeutronUtilsSubnetTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        log_level=log_level))
+    suite.addTest(OSComponentTestCase.parameterize(
+        NeutronUtilsRouterTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        NeutronUtilsSubnetTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        NeutronUtilsSecurityGroupTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        NeutronUtilsRouterTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        NeutronUtilsFloatingIpTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        NeutronUtilsSecurityGroupTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        NovaUtilsKeypairTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        NovaUtilsKeypairTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        NovaUtilsFlavorTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        NovaUtilsFlavorTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        NovaUtilsInstanceTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        CreateFlavorTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        CreateFlavorTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        HeatUtilsCreateStackTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level,
+        HeatUtilsCreateStackTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, log_level=log_level,
         image_metadata=image_metadata))
 
 
-def add_openstack_integration_tests(suite, os_creds, ext_net_name, use_keystone=True, flavor_metadata=None,
-                                    image_metadata=None, use_floating_ips=True, log_level=logging.INFO):
+def add_openstack_integration_tests(suite, os_creds, ext_net_name,
+                                    use_keystone=True, flavor_metadata=None,
+                                    image_metadata=None, use_floating_ips=True,
+                                    log_level=logging.INFO):
     """
-    Adds tests written to exercise all long-running OpenStack integration tests meaning they will be creating VM
-    instances and potentially performing some SSH functions through floating IPs
+    Adds tests written to exercise all long-running OpenStack integration tests
+    meaning they will be creating VM instances and potentially performing some
+    SSH functions through floatingIPs
     :param suite: the unittest.TestSuite object to which to add the tests
-    :param os_creds: and instance of OSCreds that holds the credentials required by OpenStack
-    :param ext_net_name: the name of an external network on the cloud under test
-    :param use_keystone: when True, tests requiring direct access to Keystone are added as these need to be running on
-                         a host that has access to the cloud's private network
-    :param image_metadata: dict() object containing metadata for creating an image with custom config
+    :param os_creds: and instance of OSCreds that holds the credentials
+                     required by OpenStack
+    :param ext_net_name: the name of an external network on the cloud under
+                         test
+    :param use_keystone: when True, tests requiring direct access to Keystone
+                         are added as these need to be running on a host that
+                         has access to the cloud's private network
+    :param image_metadata: dict() object containing metadata for creating an
+                           image with custom config
                            (see YAML files in examples/image-metadata)
-    :param flavor_metadata: dict() object containing the metadata required by your flavor based on your configuration:
+    :param flavor_metadata: dict() object containing the metadata required by
+                            your flavor based on your configuration:
                             (i.e. {'hw:mem_page_size': 'large'})
-    :param use_floating_ips: when true, all tests requiring Floating IPs will be added to the suite
+    :param use_floating_ips: when true, all tests requiring Floating IPs will
+                             be added to the suite
     :param log_level: the logging level
     :return: None as the tests will be adding to the 'suite' parameter object
     """
-    # Tests the OpenStack API calls via a creator. If use_keystone, objects will be created with a custom user
-    # and project
+    # Tests the OpenStack API calls via a creator. If use_keystone, objects
+    # will be created with a custom user and project
 
     # Creator Object tests
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateSecurityGroupTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateSecurityGroupTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateImageSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateImageSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateImageNegativeTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateImageNegativeTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateMultiPartImageTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateMultiPartImageTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateKeypairsTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateKeypairsTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateNetworkSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateNetworkSuccessTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateRouterSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateRouterSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateRouterNegativeTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateRouterNegativeTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
 
     # VM Instances
     suite.addTest(OSIntegrationTestCase.parameterize(
-        SimpleHealthCheck, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        SimpleHealthCheck, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateInstanceSimpleTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateInstanceSimpleTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateInstancePortManipulationTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateInstancePortManipulationTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        InstanceSecurityGroupTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        InstanceSecurityGroupTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateInstanceOnComputeHost, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateInstanceOnComputeHost, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateInstanceFromThreePartImage, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateInstanceFromThreePartImage, os_creds=os_creds,
+        ext_net_name=ext_net_name, use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateStackSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateStackSuccessTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
     suite.addTest(OSIntegrationTestCase.parameterize(
-        CreateStackNegativeTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-        flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+        CreateStackNegativeTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        use_keystone=use_keystone,
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+        log_level=log_level))
 
     if use_floating_ips:
         suite.addTest(OSIntegrationTestCase.parameterize(
-            CreateInstanceSingleNetworkTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-            flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+            CreateInstanceSingleNetworkTests, os_creds=os_creds,
+            ext_net_name=ext_net_name, use_keystone=use_keystone,
+            flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+            log_level=log_level))
         suite.addTest(OSIntegrationTestCase.parameterize(
-            CreateInstancePubPrivNetTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-            flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+            CreateInstancePubPrivNetTests, os_creds=os_creds,
+            ext_net_name=ext_net_name, use_keystone=use_keystone,
+            flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+            log_level=log_level))
         suite.addTest(OSIntegrationTestCase.parameterize(
-            AnsibleProvisioningTests, os_creds=os_creds, ext_net_name=ext_net_name, use_keystone=use_keystone,
-            flavor_metadata=flavor_metadata, image_metadata=image_metadata, log_level=log_level))
+            AnsibleProvisioningTests, os_creds=os_creds,
+            ext_net_name=ext_net_name, use_keystone=use_keystone,
+            flavor_metadata=flavor_metadata, image_metadata=image_metadata,
+            log_level=log_level))
 
 
-def add_openstack_staging_tests(suite, os_creds, ext_net_name, log_level=logging.INFO):
+def add_openstack_staging_tests(suite, os_creds, ext_net_name,
+                                log_level=logging.INFO):
     """
-    Adds tests that are still in development have not been designed to run successfully against all OpenStack pods
+    Adds tests that are still in development have not been designed to run
+    successfully against all OpenStack pods
     :param suite: the unittest.TestSuite object to which to add the tests
-    :param os_creds: and instance of OSCreds that holds the credentials required by OpenStack
-    :param ext_net_name: the name of an external network on the cloud under test
+    :param os_creds: Instance of OSCreds that holds the credentials
+                    required by OpenStack
+    :param ext_net_name: the name of an external network on the cloud under
+                         test
     :param log_level: the logging level
     :return: None as the tests will be adding to the 'suite' parameter object
     """
     suite.addTest(OSComponentTestCase.parameterize(
-        CreateNetworkTypeTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        CreateNetworkTypeTests, os_creds=os_creds, ext_net_name=ext_net_name,
+        log_level=log_level))
     suite.addTest(OSComponentTestCase.parameterize(
-        CreateInstanceMockOfflineTests, os_creds=os_creds, ext_net_name=ext_net_name, log_level=log_level))
+        CreateInstanceMockOfflineTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, log_level=log_level))