
Deleted tests that duplicate tests from Tempest, according to the new criteria specified in TESTING.rst. Follow up steps are detailed here: https://etherpad.openstack.org/p/neutron-tempest-defork For reviewers, here's how to get a complete list of network tests from Tempest. From a Tempest directory, execute: testr list-tests tempest.api.network | cut -d"[" -f1 | cut -d"." -f4- I verified that every test removed here actually exists in that list. Here's a list of patches that modified tests after the fork: https://etherpad.openstack.org/p/neutron-tempest-defork-patches-since-initial-sync And the list of tests we care about: https://etherpad.openstack.org/p/neutron-tempest-defork, Ctrl-F for: 'Tests that should be synced from Neutron' Related-bug: #1552960 Change-Id: I685291058f221a7ef0b5b7485280cdabceaa4af3
46 lines
1.8 KiB
Python
46 lines
1.8 KiB
Python
# Copyright 2013 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 neutron.tests.api import base
|
|
|
|
|
|
class BaseRouterTest(base.BaseAdminNetworkTest):
|
|
# NOTE(salv-orlando): This class inherits from BaseAdminNetworkTest
|
|
# as some router operations, such as enabling or disabling SNAT
|
|
# require admin credentials by default
|
|
|
|
def _cleanup_router(self, router):
|
|
self.delete_router(router)
|
|
self.routers.remove(router)
|
|
|
|
def _create_router(self, name, admin_state_up=False,
|
|
external_network_id=None, enable_snat=None):
|
|
# associate a cleanup with created routers to avoid quota limits
|
|
router = self.create_router(name, admin_state_up,
|
|
external_network_id, enable_snat)
|
|
self.addCleanup(self._cleanup_router, router)
|
|
return router
|
|
|
|
def _delete_router(self, router_id, network_client=None):
|
|
client = network_client or self.client
|
|
client.delete_router(router_id)
|
|
# Asserting that the router is not found in the list
|
|
# after deletion
|
|
list_body = self.client.list_routers()
|
|
routers_list = list()
|
|
for router in list_body['routers']:
|
|
routers_list.append(router['id'])
|
|
self.assertNotIn(router_id, routers_list)
|