Merge "Create new project/user for snaps tests"

[functest.git] / functest / opnfv_tests / openstack / snaps / snaps_suite_builder.py

diff --git a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
index 6b6af51..34a4396 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
@@ -37,14 +37,13 @@ from snaps.openstack.tests.create_project_tests import (
     CreateProjectSuccessTests, CreateProjectUserTests)
 from snaps.openstack.tests.create_qos_tests import (
     CreateQoSTests)
-# from snaps.openstack.tests.create_router_tests import
-# CreateRouterSuccessTests
-from snaps.openstack.tests.create_router_tests import CreateRouterNegativeTests
+from snaps.openstack.tests.create_router_tests import (
+    CreateRouterSuccessTests, CreateRouterNegativeTests)
 from snaps.openstack.tests.create_security_group_tests import (
     CreateSecurityGroupTests)
 from snaps.openstack.tests.create_stack_tests import (
     CreateStackSuccessTests, CreateStackNegativeTests,
-    CreateStackFlavorTests,
+    CreateStackFlavorTests, CreateStackFloatingIpTests,
     CreateStackKeypairTests, CreateStackVolumeTests,
     CreateStackSecurityGroupTests)
 from snaps.openstack.tests.create_user_tests import (
@@ -66,7 +65,7 @@ from snaps.openstack.utils.tests.glance_utils_tests import (
     GlanceSmokeTests, GlanceUtilsTests)
 from snaps.openstack.utils.tests.heat_utils_tests import (
     HeatSmokeTests, HeatUtilsCreateSimpleStackTests,
-    HeatUtilsFlavorTests,
+    HeatUtilsCreateComplexStackTests, HeatUtilsFlavorTests,
     HeatUtilsKeypairTests, HeatUtilsSecurityGroupTests)
 from snaps.openstack.utils.tests.keystone_utils_tests import (
     KeystoneSmokeTests, KeystoneUtilsTests)
@@ -201,11 +200,10 @@ def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True,
         HeatUtilsCreateSimpleStackTests, os_creds=os_creds,
         ext_net_name=ext_net_name, log_level=log_level,
         image_metadata=image_metadata))
-    # https://gerrit.opnfv.org/gerrit/#/c/59801/
-    # suite.addTest(OSComponentTestCase.parameterize(
-    #     HeatUtilsCreateComplexStackTests, os_creds=os_creds,
-    #     ext_net_name=ext_net_name, log_level=log_level,
-    #     image_metadata=image_metadata))
+    suite.addTest(OSComponentTestCase.parameterize(
+        HeatUtilsCreateComplexStackTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, log_level=log_level,
+        image_metadata=image_metadata))
     suite.addTest(OSComponentTestCase.parameterize(
         HeatUtilsFlavorTests, os_creds=os_creds,
         ext_net_name=ext_net_name, log_level=log_level,
@@ -312,13 +310,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))
-    # https://jira.opnfv.org/browse/SNAPS-320
-    # 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))
+    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))
     suite.addTest(OSIntegrationTestCase.parameterize(
         CreateRouterNegativeTests, os_creds=os_creds,
         ext_net_name=ext_net_name, use_keystone=use_keystone,
@@ -439,12 +435,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))
-        # https://gerrit.opnfv.org/gerrit/#/c/59801/
-        # suite.addTest(OSIntegrationTestCase.parameterize(
-        #     CreateStackFloatingIpTests, 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(
+            CreateStackFloatingIpTests, 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,