From d8ed3fb42ad90558aa2c478c9bcc96c4d70439ce Mon Sep 17 00:00:00 2001 From: jskunda Date: Thu, 21 Sep 2023 16:02:06 +0200 Subject: [PATCH] Remove test duplication between tempest and n-t-p RoutersDVRTest RoutersDVRTest -https://opendev.org/openstack/tempest/src/branch\ /master/tempest/api/network/admin/test_routers_dvr.py has same functionality in tempest and neutron-tempest-plugin, so with removing these tests from tempest we can get rid of whole module, reducing the test duplications. Change-Id: Ie7d37def794a3cbdb2444ebbeba237fd58ddfb8a --- .../api/admin/test_routers_dvr.py | 105 ------------------ 1 file changed, 105 deletions(-) delete mode 100644 neutron_tempest_plugin/api/admin/test_routers_dvr.py diff --git a/neutron_tempest_plugin/api/admin/test_routers_dvr.py b/neutron_tempest_plugin/api/admin/test_routers_dvr.py deleted file mode 100644 index ab25a3fe..00000000 --- a/neutron_tempest_plugin/api/admin/test_routers_dvr.py +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 2015 OpenStack Foundation -# All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. - -from tempest.lib.common.utils import data_utils -from tempest.lib import decorators - -from neutron_tempest_plugin.api import base_routers as base - - -class RoutersTestDVRBase(base.BaseRouterTest): - - required_extensions = ['router', 'dvr'] - - @classmethod - def resource_setup(cls): - # The check above will pass if api_extensions=all, which does - # not mean DVR extension itself is present. - # Instead, we have to check whether DVR is actually present by using - # admin credentials to create router with distributed=True attribute - # and checking for BadRequest exception and that the resulting router - # has a distributed attribute. - 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']: - msg = "'distributed' attribute not found. DVR Possibly not enabled" - 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): - """Test distributed router creation - - Test uses administrative credentials to creates a - DVR (Distributed Virtual Routing) router using the - distributed=True. - - Acceptance - The router is created and the "distributed" attribute is - set to True - """ - name = data_utils.rand_name('router') - router = self._create_admin_router(name, distributed=True) - self.assertTrue(router['distributed']) - - @decorators.idempotent_id('8a0a72b4-7290-4677-afeb-b4ffe37bc352') - def test_centralized_router_creation(self): - """Test centralized router creation - - Test uses administrative credentials to creates a - CVR (Centralized Virtual Routing) router using the - distributed=False. - - Acceptance - The router is created and the "distributed" attribute is - set to False, thus making it a "Centralized Virtual Router" - as opposed to a "Distributed Virtual Router" - """ - name = data_utils.rand_name('router') - router = self._create_admin_router(name, distributed=False) - self.assertFalse(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): - """Test centralized to DVR router update - - Test uses administrative credentials to creates a - CVR (Centralized Virtual Routing) router using the - distributed=False.Then it will "update" the router - distributed attribute to True - - Acceptance - The router is created and the "distributed" attribute is - set to False. Once the router is updated, the distributed - attribute will be set to True - """ - name = data_utils.rand_name('router') - # router needs to be in admin state down in order to be upgraded to DVR - router = self._create_admin_router(name, distributed=False, - ha=False, admin_state_up=False) - self.assertFalse(router['distributed']) - self.assertFalse(router['ha']) - router = self.admin_client.update_router(router['id'], - distributed=True) - self.assertTrue(router['router']['distributed'])