summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-22 15:34:20 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-22 16:12:50 +0200
commitc5b8affdabf4de9f758d0ba47547aa78fb004801 (patch)
tree24e3b0e61c415f833b49b68667b4d275e50a1097
parentf426c72f2bb6381c631794a4b9f4c3322832e0d3 (diff)
Revert "Temporarily disable HOT including OS::Nova::FloatingIPAssociation"
This reverts commit 59ba5abb31018282bca796ee0c0652d61192c6bf. Change-Id: I87a01b828668123dc9d96f5ac7823686ff0fb10e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py24
1 files changed, 11 insertions, 13 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
index 6b6af5112..7da17bf65 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
@@ -44,7 +44,7 @@ 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 +66,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 +201,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,
@@ -439,12 +438,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,