From a71b834ab1719b7af5c6ee1cf8373c56b104fcde Mon Sep 17 00:00:00 2001 From: Dongcan Ye Date: Wed, 2 May 2018 06:56:26 +0000 Subject: [PATCH] Tempest: Add l3-ha extension requirement for HA tests Change-Id: I3b6cc4888875000d6400758a15ea20ad59d39240 Closes-Bug: #1768209 --- neutron_tempest_plugin/api/admin/test_routers_dvr.py | 12 ++++++++++-- neutron_tempest_plugin/api/test_routers.py | 6 ++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/neutron_tempest_plugin/api/admin/test_routers_dvr.py b/neutron_tempest_plugin/api/admin/test_routers_dvr.py index 2313d1be..644bc386 100644 --- a/neutron_tempest_plugin/api/admin/test_routers_dvr.py +++ b/neutron_tempest_plugin/api/admin/test_routers_dvr.py @@ -19,7 +19,7 @@ from tempest.lib import decorators from neutron_tempest_plugin.api import base_routers as base -class RoutersTestDVR(base.BaseRouterTest): +class RoutersTestDVRBase(base.BaseRouterTest): required_extensions = ['router', 'dvr'] @@ -31,7 +31,7 @@ class RoutersTestDVR(base.BaseRouterTest): # admin credentials to create router with distributed=True attribute # and checking for BadRequest exception and that the resulting router # has a distributed attribute. - super(RoutersTestDVR, cls).resource_setup() + super(RoutersTestDVRBase, cls).resource_setup() name = data_utils.rand_name('pretest-check') router = cls.admin_client.create_router(name) if 'distributed' not in router['router']: @@ -39,6 +39,9 @@ class RoutersTestDVR(base.BaseRouterTest): raise cls.skipException(msg) cls.admin_client.delete_router(router['router']['id']) + +class RoutersTestDVR(RoutersTestDVRBase): + @decorators.idempotent_id('08a2a0a8-f1e4-4b34-8e30-e522e836c44e') def test_distributed_router_creation(self): """ @@ -74,6 +77,11 @@ class RoutersTestDVR(base.BaseRouterTest): router['router']['id']) self.assertFalse(router['router']['distributed']) + +class RouterTestCentralizedToDVR(RoutersTestDVRBase): + + required_extensions = ['l3-ha'] + @decorators.idempotent_id('acd43596-c1fb-439d-ada8-31ad48ae3c2e') def test_centralized_router_update_to_dvr(self): """ diff --git a/neutron_tempest_plugin/api/test_routers.py b/neutron_tempest_plugin/api/test_routers.py index bc657e0f..e1b2eb18 100644 --- a/neutron_tempest_plugin/api/test_routers.py +++ b/neutron_tempest_plugin/api/test_routers.py @@ -14,6 +14,7 @@ # under the License. import netaddr + from tempest.common import utils as tutils from tempest.lib.common.utils import data_utils from tempest.lib import decorators @@ -241,6 +242,11 @@ class DvrRoutersTest(base_routers.BaseRouterTest): self.admin_client) self.assertTrue(create_body['router']['distributed']) + +class DvrRoutersTestToCentralized(base_routers.BaseRouterTest): + + required_extensions = ['dvr', 'l3-ha'] + @decorators.idempotent_id('644d7a4a-01a1-4b68-bb8d-0c0042cb1729') def test_convert_centralized_router(self): router_args = {'tenant_id': self.client.tenant_id,