Merge "1) Cleanup floating IPs that are assigned through Juju Deployment. 2) Add...

[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 c7d6fa9..0e9c41a 100644 (file)
--- a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
@@ -37,8 +37,9 @@ 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, CreateRouterNegativeTests)
+# from snaps.openstack.tests.create_router_tests import
+# CreateRouterSuccessTests
+from snaps.openstack.tests.create_router_tests import CreateRouterNegativeTests
 from snaps.openstack.tests.create_security_group_tests import (
     CreateSecurityGroupTests)
 from snaps.openstack.tests.create_stack_tests import (
@@ -75,7 +76,7 @@ from snaps.openstack.utils.tests.neutron_utils_tests import (
     NeutronUtilsFloatingIpTests)
 from snaps.openstack.utils.tests.nova_utils_tests import (
     NovaSmokeTests, NovaUtilsKeypairTests, NovaUtilsFlavorTests,
-    NovaUtilsInstanceTests)
+    NovaUtilsInstanceTests, NovaUtilsInstanceVolumeTests)
 from snaps.provisioning.tests.ansible_utils_tests import (
     AnsibleProvisioningTests)
 
@@ -189,12 +190,10 @@ def add_openstack_api_tests(suite, os_creds, ext_net_name, use_keystone=True,
     suite.addTest(OSComponentTestCase.parameterize(
         NovaUtilsInstanceTests, os_creds=os_creds, ext_net_name=ext_net_name,
         log_level=log_level, image_metadata=image_metadata))
-    # Temporary disabled for gating
-    # JIRA: SNAPS-263
-    # suite.addTest(OSComponentTestCase.parameterize(
-    #     NovaUtilsInstanceVolumeTests, os_creds=os_creds,
-    #     ext_net_name=ext_net_name, log_level=log_level,
-    #     image_metadata=image_metadata))
+    suite.addTest(OSComponentTestCase.parameterize(
+        NovaUtilsInstanceVolumeTests, os_creds=os_creds,
+        ext_net_name=ext_net_name, log_level=log_level,
+        image_metadata=image_metadata))
     suite.addTest(OSComponentTestCase.parameterize(
         CreateFlavorTests, os_creds=os_creds, ext_net_name=ext_net_name,
         log_level=log_level))
@@ -312,11 +311,13 @@ 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(
-        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))
+    # 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(
         CreateRouterNegativeTests, os_creds=os_creds,
         ext_net_name=ext_net_name, use_keystone=use_keystone,