aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-07-24 16:11:17 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-24 16:11:17 +0000
commit707501c11aef0e8c03eb59bc2c0680dcca9bdce8 (patch)
treee4b39f1e50548b9d7a2d0a237a9d3f186b48422a
parenta38b55bbba3c7b6a354fc29da6bc3518c57caf52 (diff)
parentb361b60354fe1611fecad7779e9c2cc183df4edf (diff)
Merge "Revert "Temporarily disable Snaps CreateRouterSuccessTests""
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py17
1 files changed, 7 insertions, 10 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
index 7da17bf65..34a4396b8 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
@@ -37,9 +37,8 @@ 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 (
@@ -311,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,