From ab94fcbbbdf37c13c6dc5d9a02e6ddff64943983 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sun, 22 Jul 2018 16:14:26 +0200 Subject: [PATCH] Revert "Temporarily disable HOT including OS::Nova::FloatingIPAssociation" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit 95dcfcad2edd90ccde2b40281dab7464f6555237. Change-Id: I969fb6b4b4808b98af01a5820f029e345daa3f10 Signed-off-by: Cédric Ollivier --- .../openstack/snaps/snaps_suite_builder.py | 24 ++++++++++------------ 1 file 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 991a63dbb..0e9c41a23 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, @@ -438,12 +437,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, -- 2.16.6