Small fix to network/project when creating ports and

[snaps.git] / snaps / test_suite_builder.py

diff --git a/snaps/test_suite_builder.py b/snaps/test_suite_builder.py
index 7933277..52008a6 100644 (file)
--- a/snaps/test_suite_builder.py
+++ b/snaps/test_suite_builder.py
@@ -65,13 +65,13 @@ from snaps.openstack.tests.create_image_tests import (
     CreateImageSuccessTests, CreateImageNegativeTests,
     CreateMultiPartImageTests)
 from snaps.openstack.tests.create_instance_tests import (
-    CreateInstanceSingleNetworkTests,  CreateInstanceOnComputeHost,
+    CreateInstanceSingleNetworkTests, CreateInstanceOnComputeHost,
     CreateInstanceSimpleTests, FloatingIpSettingsUnitTests,
     InstanceSecurityGroupTests, VmInstanceSettingsUnitTests,
     CreateInstancePortManipulationTests, SimpleHealthCheck,
     CreateInstanceFromThreePartImage, CreateInstanceMockOfflineTests,
     CreateInstanceTwoNetTests, CreateInstanceVolumeTests,
-    CreateInstanceIPv6NetworkTests)
+    CreateInstanceIPv6NetworkTests, CreateInstanceExternalNetTests)
 from snaps.openstack.tests.create_keypairs_tests import (
     CreateKeypairsTests, KeypairSettingsUnitTests, CreateKeypairsCleanupTests)
 from snaps.openstack.tests.create_network_tests import (
@@ -86,7 +86,7 @@ from snaps.openstack.tests.create_qos_tests import (
 from snaps.openstack.tests.create_router_tests import (
     CreateRouterSuccessTests, CreateRouterNegativeTests,
     RouterSettingsUnitTests, CreateMultipleRouterTests,
-    CreateRouterSecurityGroupTests)
+    CreateRouterSecurityGroupTests, CreateRouterSharedNetworksTests)
 from snaps.openstack.tests.create_security_group_tests import (
     CreateSecurityGroupTests, SecurityGroupRuleSettingsUnitTests,
     SecurityGroupSettingsUnitTests, CreateMultipleSecurityGroupTests)
@@ -94,7 +94,8 @@ from snaps.openstack.tests.create_stack_tests import (
     StackSettingsUnitTests, CreateStackSuccessTests, CreateStackNegativeTests,
     CreateStackFlavorTests, CreateStackFloatingIpTests,
     CreateStackNestedResourceTests, CreateStackKeypairTests,
-    CreateStackVolumeTests, CreateStackSecurityGroupTests)
+    CreateStackVolumeTests, CreateStackSecurityGroupTests,
+    CreateStackUpdateTests)
 from snaps.openstack.tests.create_user_tests import (
     UserSettingsUnitTests, CreateUserSuccessTests)
 from snaps.openstack.tests.create_volume_tests import (
@@ -317,7 +318,8 @@ def add_openstack_client_tests(suite, os_creds, ext_net_name,
 
 
 def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True,
-                            image_metadata=None, log_level=logging.INFO):
+                            flavor_metadata=None, 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
@@ -328,6 +330,9 @@ def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True,
     :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 flavor_metadata: dict() object containing the metadata required by
+                            your flavor based on your configuration:
+                            (i.e. {'hw:mem_page_size': 'any'})
     :param image_metadata: dict() object containing metadata for creating an
                            image with custom config
                            (see YAML files in examples/image-metadata)
@@ -383,7 +388,7 @@ def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True,
     suite.addTest(OSComponentTestCase.parameterize(
         NovaUtilsInstanceVolumeTests, os_creds=os_creds,
         ext_net_name=ext_net_name, log_level=log_level,
-        image_metadata=image_metadata))
+        flavor_metadata=flavor_metadata, image_metadata=image_metadata))
     suite.addTest(OSComponentTestCase.parameterize(
         CreateFlavorTests, os_creds=os_creds, ext_net_name=ext_net_name,
         log_level=log_level))
@@ -540,6 +545,11 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name,
         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(
+        CreateRouterSharedNetworksTests, 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(
         CreateQoSTests, os_creds=os_creds,
         ext_net_name=ext_net_name, use_keystone=use_keystone,
@@ -597,6 +607,11 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name,
         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(
+        CreateInstanceExternalNetTests, 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,
@@ -674,6 +689,11 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name,
             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(
+            CreateStackUpdateTests, 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_ansible_integration_tests(suite, os_creds, ext_net_name,