Switch to tempest.common.utils.requires_ext
The old (tempest.test.requires_ext) location is deprecated in Pike. Change-Id: I79a9c3033fb38780808e02f34966280aa9591bc8
This commit is contained in:
Ihar Hrachyshka
parent
f772094105
commit
62c5afbd95
|
|
@ -12,9 +12,9 @@
|
|||
import testtools
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
from neutron.tests.tempest import config
|
||||
|
|
@ -23,7 +23,7 @@ from neutron.tests.tempest import config
|
|||
class NetworksTestAdmin(base.BaseAdminNetworkTest):
|
||||
|
||||
@decorators.idempotent_id('d3c76044-d067-4cb0-ae47-8cdd875c7f67')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_admin_create_network_keystone_v3(self):
|
||||
project_id = self.client.tenant_id # non-admin
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ class NetworksTestAdmin(base.BaseAdminNetworkTest):
|
|||
self.assertEqual(project_id, lookup_net['tenant_id'])
|
||||
|
||||
@decorators.idempotent_id('8d21aaca-4364-4eb9-8b79-44b4fff6373b')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_admin_create_network_keystone_v3_and_tenant(self):
|
||||
project_id = self.client.tenant_id # non-admin
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ class NetworksTestAdmin(base.BaseAdminNetworkTest):
|
|||
self.assertEqual(project_id, lookup_net['tenant_id'])
|
||||
|
||||
@decorators.idempotent_id('08b92179-669d-45ee-8233-ef6611190809')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_admin_create_network_keystone_v3_and_other_tenant(self):
|
||||
project_id = self.client.tenant_id # non-admin
|
||||
other_tenant = uuidutils.generate_uuid()
|
||||
|
|
@ -76,7 +76,7 @@ class NetworksTestAdmin(base.BaseAdminNetworkTest):
|
|||
@testtools.skipUnless("vxlan" in config.CONF.neutron_plugin_options.
|
||||
available_type_drivers,
|
||||
'VXLAN type_driver is not enabled')
|
||||
@test.requires_ext(extension="provider", service="network")
|
||||
@utils.requires_ext(extension="provider", service="network")
|
||||
def test_create_tenant_network_vxlan(self):
|
||||
network = self.admin_client.create_network(
|
||||
**{"provider:network_type": "vxlan"})['network']
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
# under the License.
|
||||
|
||||
import six
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
from neutron.tests.tempest import config
|
||||
|
|
@ -115,7 +115,7 @@ class QuotasTest(QuotasTestBase):
|
|||
|
||||
@decorators.idempotent_id('e974b5ba-090a-452c-a578-f9710151d9fc')
|
||||
@decorators.attr(type='gate')
|
||||
@test.requires_ext(extension="quota_details", service="network")
|
||||
@utils.requires_ext(extension="quota_details", service="network")
|
||||
def test_detail_quotas(self):
|
||||
tenant_id = self.create_project()['id']
|
||||
new_quotas = {'network': {'used': 1, 'limit': 2, 'reserved': 0},
|
||||
|
|
|
|||
|
|
@ -10,10 +10,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api.admin import test_quotas
|
||||
from neutron.tests.tempest import config
|
||||
|
|
@ -88,7 +88,7 @@ class QuotasAdminNegativeTestJSON(test_quotas.QuotasTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('bb1e9c3c-7e6f-41f1-b579-63dbc655ecb7')
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
def test_create_router_when_quotas_is_full(self):
|
||||
tenant_id = self.create_project()['id']
|
||||
new_quotas = {'router': 1}
|
||||
|
|
@ -106,7 +106,7 @@ class QuotasAdminNegativeTestJSON(test_quotas.QuotasTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('5c924ff7-b7a9-474f-92a3-dbe0f976ec13')
|
||||
@test.requires_ext(extension="security-group", service="network")
|
||||
@utils.requires_ext(extension="security-group", service="network")
|
||||
def test_create_security_group_when_quotas_is_full(self):
|
||||
tenant_id = self.create_project()['id']
|
||||
sg_args = {'tenant_id': tenant_id}
|
||||
|
|
@ -127,7 +127,7 @@ class QuotasAdminNegativeTestJSON(test_quotas.QuotasTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('b7143480-6118-4ed4-be38-1b6f15f30d05')
|
||||
@test.requires_ext(extension="security-group", service="network")
|
||||
@utils.requires_ext(extension="security-group", service="network")
|
||||
def test_create_security_group_rule_when_quotas_is_full(self):
|
||||
tenant_id = self.create_project()['id']
|
||||
sg_args = {'tenant_id': tenant_id}
|
||||
|
|
@ -159,7 +159,7 @@ class QuotasAdminNegativeTestJSON(test_quotas.QuotasTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('d00fe5bb-9db8-4e1a-9c31-490f52897e6f')
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
def test_create_floatingip_when_quotas_is_full(self):
|
||||
tenant_id = self.create_project()['id']
|
||||
new_quotas = {'floatingip': 1}
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
# under the License.
|
||||
|
||||
from oslo_utils import uuidutils
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
import testtools
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
|
|
@ -384,7 +384,7 @@ class RBACSharedNetworksTest(base.BaseAdminNetworkTest):
|
|||
action='access_as_shared', target_tenant=self.client.tenant_id)
|
||||
|
||||
@decorators.idempotent_id('c5f8f785-ce8d-4430-af7e-a236205862fb')
|
||||
@test.requires_ext(extension="quotas", service="network")
|
||||
@utils.requires_ext(extension="quotas", service="network")
|
||||
def test_rbac_policy_quota(self):
|
||||
quota = self.client.show_quotas(self.client.tenant_id)['quota']
|
||||
max_policies = quota['rbac_policy']
|
||||
|
|
@ -426,7 +426,7 @@ class RBACSharedNetworksTest(base.BaseAdminNetworkTest):
|
|||
target_tenant=self.client2.tenant_id)
|
||||
self.client.delete_port(port['id'])
|
||||
|
||||
@test.requires_ext(extension="standard-attr-revisions", service="network")
|
||||
@utils.requires_ext(extension="standard-attr-revisions", service="network")
|
||||
@decorators.idempotent_id('86c3529b-1231-40de-1234-89664291a4cb')
|
||||
def test_rbac_bumps_network_revision(self):
|
||||
resp = self._make_admin_net_and_subnet_shared_to_tenant_id(
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ class AddressScopeTest(AddressScopeTestBase):
|
|||
self.assertFalse(returned_address_scope['shared'])
|
||||
|
||||
@decorators.idempotent_id('bbd57364-6d57-48e4-b0f1-8b9a998f5e06')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_show_address_scope_project_id(self):
|
||||
address_scope = self._create_address_scope(ip_version=4)
|
||||
body = self.client.show_address_scope(address_scope['id'])
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
# under the License.
|
||||
|
||||
import ddt
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
from neutron.tests.tempest.api import base_security_groups as base_security
|
||||
|
|
@ -30,7 +30,7 @@ class PortSecTest(base_security.BaseSecGroupTest,
|
|||
base.BaseNetworkTest):
|
||||
|
||||
@decorators.idempotent_id('7c338ddf-e64e-4118-bd33-e49a1f2f1495')
|
||||
@test.requires_ext(extension='port-security', service='network')
|
||||
@utils.requires_ext(extension='port-security', service='network')
|
||||
def test_port_sec_default_value(self):
|
||||
# Default port-sec value is True, and the attr of the port will inherit
|
||||
# from the port-sec of the network when it not be specified in API
|
||||
|
|
@ -41,7 +41,7 @@ class PortSecTest(base_security.BaseSecGroupTest,
|
|||
self.assertTrue(port['port_security_enabled'])
|
||||
|
||||
@decorators.idempotent_id('e60eafd2-31de-4c38-8106-55447d033b57')
|
||||
@test.requires_ext(extension='port-security', service='network')
|
||||
@utils.requires_ext(extension='port-security', service='network')
|
||||
@ddt.unpack
|
||||
@ddt.data({'port_sec_net': False, 'port_sec_port': True, 'expected': True},
|
||||
{'port_sec_net': True, 'port_sec_port': False,
|
||||
|
|
@ -55,7 +55,7 @@ class PortSecTest(base_security.BaseSecGroupTest,
|
|||
self.assertEqual(port['port_security_enabled'], expected)
|
||||
|
||||
@decorators.idempotent_id('fe7c27b9-f320-4daf-b977-b1547c43daf6')
|
||||
@test.requires_ext(extension='port-security', service='network')
|
||||
@utils.requires_ext(extension='port-security', service='network')
|
||||
def test_create_port_sec_with_security_group(self):
|
||||
network = self.create_network(port_security_enabled=True)
|
||||
self.create_subnet(network)
|
||||
|
|
@ -71,7 +71,7 @@ class PortSecTest(base_security.BaseSecGroupTest,
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('ff11226c-a5ff-4ad4-8480-0840e36e47a9')
|
||||
@test.requires_ext(extension='port-security', service='network')
|
||||
@utils.requires_ext(extension='port-security', service='network')
|
||||
def test_port_sec_update_port_failed(self):
|
||||
network = self.create_network()
|
||||
self.create_subnet(network)
|
||||
|
|
@ -98,7 +98,7 @@ class PortSecTest(base_security.BaseSecGroupTest,
|
|||
self.update_port(port, security_groups=[])
|
||||
|
||||
@decorators.idempotent_id('05642059-1bfc-4581-9bc9-aaa5db08dd60')
|
||||
@test.requires_ext(extension='port-security', service='network')
|
||||
@utils.requires_ext(extension='port-security', service='network')
|
||||
def test_port_sec_update_pass(self):
|
||||
network = self.create_network()
|
||||
self.create_subnet(network)
|
||||
|
|
@ -122,7 +122,7 @@ class PortSecTest(base_security.BaseSecGroupTest,
|
|||
self.assertFalse(port['port_security_enabled'])
|
||||
|
||||
@decorators.idempotent_id('2df6114b-b8c3-48a1-96e8-47f08159d35c')
|
||||
@test.requires_ext(extension='port-security', service='network')
|
||||
@utils.requires_ext(extension='port-security', service='network')
|
||||
def test_delete_with_port_sec(self):
|
||||
network = self.create_network(port_security_enabled=True)
|
||||
port = self.create_port(network=network,
|
||||
|
|
@ -135,8 +135,8 @@ class PortSecTest(base_security.BaseSecGroupTest,
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('ed93e453-3f8d-495e-8e7e-b0e268c2ebd9')
|
||||
@test.requires_ext(extension='port-security', service='network')
|
||||
@test.requires_ext(extension='allowed-address-pairs', service='network')
|
||||
@utils.requires_ext(extension='port-security', service='network')
|
||||
@utils.requires_ext(extension='allowed-address-pairs', service='network')
|
||||
def test_allow_address_pairs(self):
|
||||
network = self.create_network()
|
||||
self.create_subnet(network)
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
from neutron.tests.tempest import config
|
||||
|
|
@ -58,7 +58,7 @@ class FloatingIPTestJSON(base.BaseNetworkTest):
|
|||
self.assertFalse(body['port_id'])
|
||||
|
||||
@decorators.idempotent_id('c72c1c0c-2193-4aca-eeee-b1442641ffff')
|
||||
@test.requires_ext(extension="standard-attr-description",
|
||||
@utils.requires_ext(extension="standard-attr-description",
|
||||
service="network")
|
||||
def test_create_update_floatingip_description(self):
|
||||
body = self.client.create_floatingip(
|
||||
|
|
@ -80,7 +80,7 @@ class FloatingIPTestJSON(base.BaseNetworkTest):
|
|||
self.assertEqual('d2', body['floatingip']['description'])
|
||||
|
||||
@decorators.idempotent_id('fd7161e1-2167-4686-a6ff-0f3df08001bb')
|
||||
@test.requires_ext(extension="standard-attr-description",
|
||||
@utils.requires_ext(extension="standard-attr-description",
|
||||
service="network")
|
||||
def test_floatingip_update_extra_attributes_port_id_not_changed(self):
|
||||
port_id = self.ports[1]['id']
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
import netaddr
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib.common.utils import test_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
from neutron.tests.tempest import config
|
||||
|
|
@ -50,7 +50,7 @@ class NetworksIpAvailabilityTest(base.BaseAdminNetworkTest):
|
|||
"""
|
||||
|
||||
@classmethod
|
||||
@test.requires_ext(extension="network-ip-availability", service="network")
|
||||
@utils.requires_ext(extension="network-ip-availability", service="network")
|
||||
def skip_checks(cls):
|
||||
super(NetworksIpAvailabilityTest, cls).skip_checks()
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
import testtools
|
||||
|
|
@ -55,7 +56,7 @@ class NetworksTestJSON(base.BaseNetworkTest):
|
|||
self.assertEqual(project_id, network['project_id'])
|
||||
|
||||
@decorators.idempotent_id('26f2b7a5-2cd1-4f3a-b11f-ad259b099b11')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_show_network_fields_keystone_v3(self):
|
||||
|
||||
def _check_show_network_fields(fields, expect_project_id,
|
||||
|
|
@ -74,7 +75,7 @@ class NetworksTestJSON(base.BaseNetworkTest):
|
|||
_check_show_network_fields(['project_id', 'tenant_id'], True, True)
|
||||
|
||||
@decorators.idempotent_id('0cc0552f-afaf-4231-b7a7-c2a1774616da')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_create_network_keystone_v3(self):
|
||||
project_id = self.client.tenant_id
|
||||
|
||||
|
|
@ -95,7 +96,7 @@ class NetworksTestJSON(base.BaseNetworkTest):
|
|||
self.assertEqual(project_id, new_net['tenant_id'])
|
||||
|
||||
@decorators.idempotent_id('94e2a44c-3367-4253-8c2a-22deaf59e96c')
|
||||
@test.requires_ext(extension="dns-integration",
|
||||
@utils.requires_ext(extension="dns-integration",
|
||||
service="network")
|
||||
def test_create_update_network_dns_domain(self):
|
||||
domain1 = 'test.org.'
|
||||
|
|
@ -111,7 +112,7 @@ class NetworksTestJSON(base.BaseNetworkTest):
|
|||
self.assertEqual(domain2, body['dns_domain'])
|
||||
|
||||
@decorators.idempotent_id('a23186b9-aa6f-4b08-b877-35ca3b9cd54c')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_list_networks_fields_keystone_v3(self):
|
||||
def _check_list_networks_fields(fields, expect_project_id,
|
||||
expect_tenant_id):
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ class PortsTestJSON(base.BaseNetworkTest):
|
|||
self.assertEqual(ip, dns_assignment['ip_address'])
|
||||
|
||||
@decorators.idempotent_id('c72c1c0c-2193-4aca-bbb4-b1442640bbbb')
|
||||
@test.requires_ext(extension="standard-attr-description",
|
||||
@utils.requires_ext(extension="standard-attr-description",
|
||||
service="network")
|
||||
def test_create_update_port_description(self):
|
||||
body = self.create_port(self.network,
|
||||
|
|
@ -59,7 +59,7 @@ class PortsTestJSON(base.BaseNetworkTest):
|
|||
self.assertEqual('d2', body['description'])
|
||||
|
||||
@decorators.idempotent_id('539fbefe-fb36-48aa-9a53-8c5fbd44e492')
|
||||
@test.requires_ext(extension="dns-integration",
|
||||
@utils.requires_ext(extension="dns-integration",
|
||||
service="network")
|
||||
def test_create_update_port_with_dns_name(self):
|
||||
# NOTE(manjeets) dns_domain is set to openstackgate.local
|
||||
|
|
@ -80,7 +80,7 @@ class PortsTestJSON(base.BaseNetworkTest):
|
|||
self._confirm_dns_assignment(body)
|
||||
|
||||
@decorators.idempotent_id('435e89df-a8bb-4b41-801a-9f20d362d777')
|
||||
@test.requires_ext(extension="dns-integration",
|
||||
@utils.requires_ext(extension="dns-integration",
|
||||
service="network")
|
||||
def test_create_update_port_with_no_dns_name(self):
|
||||
self.create_subnet(self.network)
|
||||
|
|
@ -92,7 +92,7 @@ class PortsTestJSON(base.BaseNetworkTest):
|
|||
self._confirm_dns_assignment(port_body['port'])
|
||||
|
||||
@decorators.idempotent_id('dfe8cc79-18d9-4ae8-acef-3ec6bb719aa7')
|
||||
@test.requires_ext(extension="dns-domain-ports",
|
||||
@utils.requires_ext(extension="dns-domain-ports",
|
||||
service="network")
|
||||
def test_create_update_port_with_dns_domain(self):
|
||||
self.create_subnet(self.network)
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions
|
||||
from tempest import test
|
||||
|
||||
import testscenarios
|
||||
import testtools
|
||||
|
|
@ -56,7 +56,7 @@ class QosTestJSON(base.BaseAdminNetworkTest):
|
|||
self.assertIn(policy['id'], policies_ids)
|
||||
|
||||
@decorators.idempotent_id('606a48e2-5403-4052-b40f-4d54b855af76')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_show_policy_has_project_id(self):
|
||||
policy = self.create_qos_policy(name='test-policy', shared=False)
|
||||
body = self.admin_client.show_qos_policy(policy['id'])
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
import netaddr
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
from neutron.tests.tempest.api import base_security_groups as bsg
|
||||
|
|
@ -109,7 +109,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['network']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('6c256f71-c929-4200-b3dc-4e1843506be5')
|
||||
@test.requires_ext(extension="security-group", service="network")
|
||||
@utils.requires_ext(extension="security-group", service="network")
|
||||
def test_update_sg_group_bumps_revision(self):
|
||||
sg, name = self._create_security_group()
|
||||
self.assertIn('revision_number', sg['security_group'])
|
||||
|
|
@ -119,7 +119,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
sg['security_group']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('6489632f-8550-4453-a674-c98849742967')
|
||||
@test.requires_ext(extension="security-group", service="network")
|
||||
@utils.requires_ext(extension="security-group", service="network")
|
||||
def test_update_port_sg_binding_bumps_revision(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -136,7 +136,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['port']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('29c7ab2b-d1d8-425d-8cec-fcf632960f22')
|
||||
@test.requires_ext(extension="security-group", service="network")
|
||||
@utils.requires_ext(extension="security-group", service="network")
|
||||
def test_update_sg_rule_bumps_sg_revision(self):
|
||||
sg, name = self._create_security_group()
|
||||
rule = self.client.create_security_group_rule(
|
||||
|
|
@ -153,7 +153,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['security_group']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('db70c285-0365-4fac-9f55-2a0ad8cf55a8')
|
||||
@test.requires_ext(extension="allowed-address-pairs", service="network")
|
||||
@utils.requires_ext(extension="allowed-address-pairs", service="network")
|
||||
def test_update_allowed_address_pairs_bumps_revision(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -169,7 +169,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['port']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('a21ec3b4-3569-4b77-bf29-4177edaa2df5')
|
||||
@test.requires_ext(extension="extra_dhcp_opt", service="network")
|
||||
@utils.requires_ext(extension="extra_dhcp_opt", service="network")
|
||||
def test_update_extra_dhcp_opt_bumps_revision(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -186,7 +186,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['port']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('40ba648f-f374-4c29-a5b7-489dd5a38a4e')
|
||||
@test.requires_ext(extension="dns-integration", service="network")
|
||||
@utils.requires_ext(extension="dns-integration", service="network")
|
||||
def test_update_dns_domain_bumps_revision(self):
|
||||
net = self.create_network(dns_domain='example.test.')
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -205,8 +205,8 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['port']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('8482324f-cf59-4d73-b98e-d37119255300')
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@test.requires_ext(extension="extraroute", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="extraroute", service="network")
|
||||
def test_update_router_extra_routes_bumps_revision(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -230,7 +230,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['router']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('6bd18702-e25a-4b4b-8c0c-680113533511')
|
||||
@test.requires_ext(extension="subnet-service-types", service="network")
|
||||
@utils.requires_ext(extension="subnet-service-types", service="network")
|
||||
def test_update_subnet_service_types_bumps_revisions(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -246,7 +246,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['subnet']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('9c83105c-9973-45ff-9ca2-e66d64700abe')
|
||||
@test.requires_ext(extension="port-security", service="network")
|
||||
@utils.requires_ext(extension="port-security", service="network")
|
||||
def test_update_port_security_bumps_revisions(self):
|
||||
net = self.create_network(port_security_enabled=False)
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -270,7 +270,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
updated['port']['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('68d5ac3a-11a1-4847-8e2e-5843c043d89b')
|
||||
@test.requires_ext(extension="binding", service="network")
|
||||
@utils.requires_ext(extension="binding", service="network")
|
||||
def test_portbinding_bumps_revision(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -284,7 +284,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
port['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('4a37bde9-1975-47e0-9b8c-2c9ca36415b0')
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
def test_update_router_bumps_revision(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -307,8 +307,8 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
router['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('9de71ebc-f5df-4cd0-80bc-60299fce3ce9')
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@test.requires_ext(extension="standard-attr-description",
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="standard-attr-description",
|
||||
service="network")
|
||||
def test_update_floatingip_bumps_revision(self):
|
||||
ext_id = config.CONF.network.public_network_id
|
||||
|
|
@ -339,8 +339,8 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
self.client.update_floatingip(b2['floatingip']['id'], port_id=None)
|
||||
|
||||
@decorators.idempotent_id('afb6486c-41b5-483e-a500-3c506f4deb49')
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@test.requires_ext(extension="l3-ha", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="l3-ha", service="network")
|
||||
def test_update_router_extra_attributes_bumps_revision(self):
|
||||
# updates from CVR to CVR-HA are supported on every release,
|
||||
# but only the admin can forcibly create a non-HA router
|
||||
|
|
@ -360,10 +360,10 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
router['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('90743b00-b0e2-40e4-9524-1c884fe3ef23')
|
||||
@test.requires_ext(extension="external-net", service="network")
|
||||
@test.requires_ext(extension="auto-allocated-topology", service="network")
|
||||
@test.requires_ext(extension="subnet_allocation", service="network")
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="external-net", service="network")
|
||||
@utils.requires_ext(extension="auto-allocated-topology", service="network")
|
||||
@utils.requires_ext(extension="subnet_allocation", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
def test_update_external_network_bumps_revision(self):
|
||||
net = self.create_network()
|
||||
self.addCleanup(self.client.delete_network, net['id'])
|
||||
|
|
@ -374,7 +374,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
net['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('5af6450a-0f61-49c3-b628-38db77c7b856')
|
||||
@test.requires_ext(extension="qos", service="network")
|
||||
@utils.requires_ext(extension="qos", service="network")
|
||||
def test_update_qos_port_policy_binding_bumps_revision(self):
|
||||
policy = self.create_qos_policy(name='port-policy', shared=False)
|
||||
net = self.create_network()
|
||||
|
|
@ -387,7 +387,7 @@ class TestRevisions(base.BaseAdminNetworkTest, bsg.BaseSecGroupTest):
|
|||
port['revision_number'])
|
||||
|
||||
@decorators.idempotent_id('817da343-c6e4-445c-9519-a621f124dfbe')
|
||||
@test.requires_ext(extension="qos", service="network")
|
||||
@utils.requires_ext(extension="qos", service="network")
|
||||
def test_update_qos_network_policy_binding_bumps_revision(self):
|
||||
policy = self.create_qos_policy(name='network-policy', shared=False)
|
||||
network = self.create_network()
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
# 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
|
||||
from tempest import test
|
||||
|
||||
from neutron.common import utils
|
||||
from neutron.tests.tempest.api import base
|
||||
|
|
@ -39,7 +39,7 @@ class RoutersTest(base_routers.BaseRouterTest):
|
|||
config.safe_get_config_value('network', 'project_network_v6_cidr'))
|
||||
|
||||
@decorators.idempotent_id('c72c1c0c-2193-4aca-eeee-b1442640eeee')
|
||||
@test.requires_ext(extension="standard-attr-description",
|
||||
@tutils.requires_ext(extension="standard-attr-description",
|
||||
service="network")
|
||||
def test_create_update_router_description(self):
|
||||
body = self.create_router(description='d1', router_name='test')
|
||||
|
|
@ -52,7 +52,7 @@ class RoutersTest(base_routers.BaseRouterTest):
|
|||
self.assertEqual('d2', body['description'])
|
||||
|
||||
@decorators.idempotent_id('847257cc-6afd-4154-b8fb-af49f5670ce8')
|
||||
@test.requires_ext(extension='ext-gw-mode', service='network')
|
||||
@tutils.requires_ext(extension='ext-gw-mode', service='network')
|
||||
def test_create_router_with_default_snat_value(self):
|
||||
# Create a router with default snat rule
|
||||
name = data_utils.rand_name('router')
|
||||
|
|
@ -63,7 +63,7 @@ class RoutersTest(base_routers.BaseRouterTest):
|
|||
'enable_snat': True})
|
||||
|
||||
@decorators.idempotent_id('ea74068d-09e9-4fd7-8995-9b6a1ace920f')
|
||||
@test.requires_ext(extension='ext-gw-mode', service='network')
|
||||
@tutils.requires_ext(extension='ext-gw-mode', service='network')
|
||||
def test_create_router_with_snat_explicit(self):
|
||||
name = data_utils.rand_name('snat-router')
|
||||
# Create a router enabling snat attributes
|
||||
|
|
@ -105,7 +105,7 @@ class RoutersTest(base_routers.BaseRouterTest):
|
|||
[x['subnet_id'] for x in fixed_ips])
|
||||
|
||||
@decorators.idempotent_id('b386c111-3b21-466d-880c-5e72b01e1a33')
|
||||
@test.requires_ext(extension='ext-gw-mode', service='network')
|
||||
@tutils.requires_ext(extension='ext-gw-mode', service='network')
|
||||
def test_update_router_set_gateway_with_snat_explicit(self):
|
||||
router = self._create_router(data_utils.rand_name('router-'))
|
||||
self.admin_client.update_router_with_snat_gw_info(
|
||||
|
|
@ -120,7 +120,7 @@ class RoutersTest(base_routers.BaseRouterTest):
|
|||
self._verify_gateway_port(router['id'])
|
||||
|
||||
@decorators.idempotent_id('96536bc7-8262-4fb2-9967-5c46940fa279')
|
||||
@test.requires_ext(extension='ext-gw-mode', service='network')
|
||||
@tutils.requires_ext(extension='ext-gw-mode', service='network')
|
||||
def test_update_router_set_gateway_without_snat(self):
|
||||
router = self._create_router(data_utils.rand_name('router-'))
|
||||
self.admin_client.update_router_with_snat_gw_info(
|
||||
|
|
@ -135,7 +135,7 @@ class RoutersTest(base_routers.BaseRouterTest):
|
|||
self._verify_gateway_port(router['id'])
|
||||
|
||||
@decorators.idempotent_id('f2faf994-97f4-410b-a831-9bc977b64374')
|
||||
@test.requires_ext(extension='ext-gw-mode', service='network')
|
||||
@tutils.requires_ext(extension='ext-gw-mode', service='network')
|
||||
def test_update_router_reset_gateway_without_snat(self):
|
||||
router = self._create_router(
|
||||
data_utils.rand_name('router-'),
|
||||
|
|
@ -163,7 +163,7 @@ class RoutersTest(base_routers.BaseRouterTest):
|
|||
utils.wait_until_true(status_active, exception=AssertionError)
|
||||
|
||||
@decorators.idempotent_id('c86ac3a8-50bd-4b00-a6b8-62af84a0765c')
|
||||
@test.requires_ext(extension='extraroute', service='network')
|
||||
@tutils.requires_ext(extension='extraroute', service='network')
|
||||
def test_update_extra_route(self):
|
||||
self.network = self.create_network()
|
||||
self.name = self.network['name']
|
||||
|
|
|
|||
|
|
@ -13,9 +13,9 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
|
||||
|
|
@ -105,7 +105,7 @@ class SubnetPoolsTest(SubnetPoolsTestBase):
|
|||
"Created subnetpool name should be in the list")
|
||||
|
||||
@decorators.idempotent_id('c72c1c0c-2193-4aca-ddd4-b1442640bbbb')
|
||||
@test.requires_ext(extension="standard-attr-description",
|
||||
@utils.requires_ext(extension="standard-attr-description",
|
||||
service="network")
|
||||
def test_create_update_subnetpool_description(self):
|
||||
body = self._create_subnetpool(description='d1')
|
||||
|
|
@ -135,7 +135,7 @@ class SubnetPoolsTest(SubnetPoolsTestBase):
|
|||
self.assertFalse(subnetpool['shared'])
|
||||
|
||||
@decorators.idempotent_id('5bf9f1e2-efc8-4195-acf3-d12b2bd68dd3')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_show_subnetpool_has_project_id(self):
|
||||
subnetpool = self._create_subnetpool()
|
||||
body = self.client.show_subnetpool(subnetpool['id'])
|
||||
|
|
@ -259,7 +259,7 @@ class SubnetPoolsTest(SubnetPoolsTestBase):
|
|||
self.assertTrue(cidr.endswith(str(self.max_prefixlen)))
|
||||
|
||||
@decorators.idempotent_id('49b44c64-1619-4b29-b527-ffc3c3115dc4')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_create_subnetpool_associate_address_scope(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'),
|
||||
|
|
@ -271,7 +271,7 @@ class SubnetPoolsTest(SubnetPoolsTestBase):
|
|||
body['subnetpool']['address_scope_id'])
|
||||
|
||||
@decorators.idempotent_id('910b6393-db24-4f6f-87dc-b36892ad6c8c')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_update_subnetpool_associate_address_scope(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'),
|
||||
|
|
@ -287,7 +287,7 @@ class SubnetPoolsTest(SubnetPoolsTestBase):
|
|||
body['subnetpool']['address_scope_id'])
|
||||
|
||||
@decorators.idempotent_id('18302e80-46a3-4563-82ac-ccd1dd57f652')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_update_subnetpool_associate_another_address_scope(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'),
|
||||
|
|
@ -308,7 +308,7 @@ class SubnetPoolsTest(SubnetPoolsTestBase):
|
|||
body['subnetpool']['address_scope_id'])
|
||||
|
||||
@decorators.idempotent_id('f8970048-e41b-42d6-934b-a1297b07706a')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_update_subnetpool_disassociate_address_scope(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'),
|
||||
|
|
@ -325,7 +325,7 @@ class SubnetPoolsTest(SubnetPoolsTestBase):
|
|||
self.assertIsNone(body['subnetpool']['address_scope_id'])
|
||||
|
||||
@decorators.idempotent_id('4c6963c2-f54c-4347-b288-75d18421c4c4')
|
||||
@test.requires_ext(extension='default-subnetpools', service='network')
|
||||
@utils.requires_ext(extension='default-subnetpools', service='network')
|
||||
def test_tenant_create_non_default_subnetpool(self):
|
||||
"""
|
||||
Test creates a subnetpool, the "is_default" attribute is False.
|
||||
|
|
@ -351,7 +351,7 @@ class DefaultSubnetPoolsTest(SubnetPoolsTestBase):
|
|||
raise cls.skipException(msg)
|
||||
|
||||
@decorators.idempotent_id('cb839106-6184-4332-b292-5d07c074de4f')
|
||||
@test.requires_ext(extension='default-subnetpools', service='network')
|
||||
@utils.requires_ext(extension='default-subnetpools', service='network')
|
||||
def test_admin_create_default_subnetpool(self):
|
||||
"""
|
||||
Test uses administrative credentials to create a default subnetpool,
|
||||
|
|
@ -362,7 +362,7 @@ class DefaultSubnetPoolsTest(SubnetPoolsTestBase):
|
|||
self.assertTrue(created_subnetpool['is_default'])
|
||||
|
||||
@decorators.idempotent_id('9e79730c-29b6-44a4-9504-bf3c7cedc56c')
|
||||
@test.requires_ext(extension='default-subnetpools', service='network')
|
||||
@utils.requires_ext(extension='default-subnetpools', service='network')
|
||||
def test_convert_subnetpool_to_default_subnetpool(self):
|
||||
"""
|
||||
Test creates a subnetpool, which is non default subnetpool.
|
||||
|
|
@ -379,7 +379,7 @@ class DefaultSubnetPoolsTest(SubnetPoolsTestBase):
|
|||
self.assertTrue(show_body['subnetpool']['is_default'])
|
||||
|
||||
@decorators.idempotent_id('39687561-7a37-47b8-91ce-f9143ae26969')
|
||||
@test.requires_ext(extension='default-subnetpools', service='network')
|
||||
@utils.requires_ext(extension='default-subnetpools', service='network')
|
||||
def test_convert_default_subnetpool_to_non_default(self):
|
||||
"""
|
||||
Test uses administrative credentials to create a default subnetpool,
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
|
||||
import netaddr
|
||||
from oslo_utils import uuidutils
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import test_subnetpools
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('6ae09d8f-95be-40ed-b1cf-8b850d45bab5')
|
||||
@test.requires_ext(extension='default-subnetpools', service='network')
|
||||
@utils.requires_ext(extension='default-subnetpools', service='network')
|
||||
def test_tenant_create_default_subnetpool(self):
|
||||
# 'default' subnetpool can only be created by admin.
|
||||
self.assertRaises(lib_exc.Forbidden, self._create_subnetpool,
|
||||
|
|
@ -113,21 +113,21 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('9589e332-638e-476e-81bd-013d964aa3cb')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_create_subnetpool_associate_invalid_address_scope(self):
|
||||
self.assertRaises(lib_exc.BadRequest, self._create_subnetpool,
|
||||
address_scope_id='foo-addr-scope')
|
||||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('3b6c5942-485d-4964-a560-55608af020b5')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_create_subnetpool_associate_non_exist_address_scope(self):
|
||||
self.assertRaises(lib_exc.NotFound, self._create_subnetpool,
|
||||
address_scope_id=uuidutils.generate_uuid())
|
||||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('2dfb4269-8657-485a-a053-b022e911456e')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_create_subnetpool_associate_address_scope_prefix_intersect(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'),
|
||||
|
|
@ -143,7 +143,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('83a19a13-5384-42e2-b579-43fc69c80914')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_create_sp_associate_address_scope_multiple_prefix_intersect(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'),
|
||||
|
|
@ -161,7 +161,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('f06d8e7b-908b-4e94-b570-8156be6a4bf1')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_create_subnetpool_associate_address_scope_of_other_owner(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'), is_admin=True,
|
||||
|
|
@ -171,7 +171,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('3396ec6c-cb80-4ebe-b897-84e904580bdf')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_tenant_create_subnetpool_associate_shared_address_scope(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'), is_admin=True,
|
||||
|
|
@ -181,7 +181,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('6d3d9ad5-32d4-4d63-aa00-8c62f73e2881')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_update_subnetpool_associate_address_scope_of_other_owner(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'), is_admin=True,
|
||||
|
|
@ -214,7 +214,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('96006292-7214-40e0-a471-153fb76e6b31')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_update_subnetpool_prefix_intersect(self):
|
||||
pool_1_prefix = [u'20.0.0.0/18']
|
||||
pool_2_prefix = [u'20.10.0.0/24']
|
||||
|
|
@ -224,7 +224,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('4d3f8a79-c530-4e59-9acf-6c05968adbfe')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_update_subnetpool_multiple_prefix_intersect(self):
|
||||
pool_1_prefixes = [u'20.0.0.0/18', u'30.0.0.0/18']
|
||||
pool_2_prefixes = [u'20.10.0.0/24', u'40.0.0.0/18', '50.0.0.0/18']
|
||||
|
|
@ -235,7 +235,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('7438e49e-1351-45d8-937b-892059fb97f5')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_tenant_update_sp_prefix_associated_with_shared_addr_scope(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'), is_admin=True,
|
||||
|
|
@ -266,7 +266,7 @@ class SubnetPoolsNegativeTestJSON(test_subnetpools.SubnetPoolsTestBase):
|
|||
|
||||
@decorators.attr(type='negative')
|
||||
@decorators.idempotent_id('648fee7d-a909-4ced-bad3-3a169444c0a8')
|
||||
@test.requires_ext(extension='address-scope', service='network')
|
||||
@utils.requires_ext(extension='address-scope', service='network')
|
||||
def test_update_subnetpool_associate_address_scope_wrong_ip_version(self):
|
||||
address_scope = self.create_address_scope(
|
||||
name=data_utils.rand_name('smoke-address-scope'),
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
|
||||
|
|
@ -100,7 +100,7 @@ class TagSubnetTestJSON(TagTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('2805aabf-a94c-4e70-a0b2-9814f06beb03')
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_subnet_tags(self):
|
||||
self._test_tag_operations()
|
||||
|
||||
|
|
@ -116,7 +116,7 @@ class TagPortTestJSON(TagTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('c7c44f2c-edb0-4ebd-a386-d37cec155c34')
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_port_tags(self):
|
||||
self._test_tag_operations()
|
||||
|
||||
|
|
@ -132,7 +132,7 @@ class TagSubnetPoolTestJSON(TagTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('bdc1c24b-c0b5-4835-953c-8f67dc11edfe')
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_subnetpool_tags(self):
|
||||
self._test_tag_operations()
|
||||
|
||||
|
|
@ -147,8 +147,8 @@ class TagRouterTestJSON(TagTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('b898ff92-dc33-4232-8ab9-2c6158c80d28')
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_router_tags(self):
|
||||
self._test_tag_operations()
|
||||
|
||||
|
|
@ -258,7 +258,7 @@ class TagFilterSubnetTestJSON(TagFilterTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('dd8f9ba7-bcf6-496f-bead-714bd3daac10')
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_filter_subnet_tags(self):
|
||||
self._test_filter_tags()
|
||||
|
||||
|
|
@ -278,7 +278,7 @@ class TagFilterPortTestJSON(TagFilterTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('09c036b8-c8d0-4bee-b776-7f4601512898')
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_filter_port_tags(self):
|
||||
self._test_filter_tags()
|
||||
|
||||
|
|
@ -298,7 +298,7 @@ class TagFilterSubnetpoolTestJSON(TagFilterTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('16ae7ad2-55c2-4821-9195-bfd04ab245b7')
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_filter_subnetpool_tags(self):
|
||||
self._test_filter_tags()
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ class TagFilterRouterTestJSON(TagFilterTestJSON):
|
|||
|
||||
@decorators.attr(type='smoke')
|
||||
@decorators.idempotent_id('cdd3f3ea-073d-4435-a6cb-826a4064193d')
|
||||
@test.requires_ext(extension="tag-ext", service="network")
|
||||
@utils.requires_ext(extension="tag-ext", service="network")
|
||||
def test_filter_router_tags(self):
|
||||
self._test_filter_tags()
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib.common.utils import test_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions as lib_exc
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.api import base
|
||||
from neutron.tests.tempest import config
|
||||
|
|
@ -95,7 +95,7 @@ class TrunkTestJSON(TrunkTestJSONBase):
|
|||
self.assertRaises(lib_exc.NotFound, self._show_trunk, trunk_id)
|
||||
|
||||
@decorators.idempotent_id('8d83a6ca-662d-45b8-8062-d513077296aa')
|
||||
@test.requires_ext(extension="project-id", service="network")
|
||||
@utils.requires_ext(extension="project-id", service="network")
|
||||
def test_show_trunk_has_project_id(self):
|
||||
trunk = self._create_trunk_with_network_and_parent(None)
|
||||
body = self._show_trunk(trunk['trunk']['id'])
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@
|
|||
# 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.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest import config
|
||||
from neutron.tests.tempest.scenario import base
|
||||
|
|
@ -49,7 +49,7 @@ class NetworkDvrTest(base.BaseTempestTestCase, NetworkTestMixin):
|
|||
force_tenant_isolation = False
|
||||
|
||||
@classmethod
|
||||
@test.requires_ext(extension="dvr", service="network")
|
||||
@utils.requires_ext(extension="dvr", service="network")
|
||||
def skip_checks(cls):
|
||||
super(NetworkDvrTest, cls).skip_checks()
|
||||
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
# under the License.
|
||||
|
||||
import netaddr
|
||||
from tempest.common import utils
|
||||
from tempest.common import waiters
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
import testscenarios
|
||||
from testscenarios.scenarios import multiply_scenarios
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ class FloatingIpTestCasesMixin(object):
|
|||
credentials = ['primary', 'admin']
|
||||
|
||||
@classmethod
|
||||
@test.requires_ext(extension="router", service="network")
|
||||
@utils.requires_ext(extension="router", service="network")
|
||||
def resource_setup(cls):
|
||||
super(FloatingIpTestCasesMixin, cls).resource_setup()
|
||||
cls.network = cls.create_network()
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest.common import utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
|
||||
from neutron.tests.tempest.scenario import base
|
||||
from neutron.tests.tempest.scenario import test_dvr
|
||||
|
|
@ -26,8 +26,8 @@ class NetworkMigrationTestBase(base.BaseTempestTestCase,
|
|||
force_tenant_isolation = False
|
||||
|
||||
@classmethod
|
||||
@test.requires_ext(extension="dvr", service="network")
|
||||
@test.requires_ext(extension="l3-ha", service="network")
|
||||
@utils.requires_ext(extension="dvr", service="network")
|
||||
@utils.requires_ext(extension="l3-ha", service="network")
|
||||
def skip_checks(cls):
|
||||
super(NetworkMigrationTestBase, cls).skip_checks()
|
||||
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@ import socket
|
|||
import time
|
||||
|
||||
from oslo_log import log as logging
|
||||
from tempest.common import utils as tutils
|
||||
from tempest.lib import decorators
|
||||
from tempest.lib import exceptions
|
||||
from tempest import test
|
||||
|
||||
from neutron.common import utils
|
||||
from neutron.services.qos import qos_consts
|
||||
|
|
@ -80,7 +80,7 @@ class QoSTest(base.BaseTempestTestCase):
|
|||
FILE_PATH = "/tmp/img"
|
||||
|
||||
@classmethod
|
||||
@test.requires_ext(extension="qos", service="network")
|
||||
@tutils.requires_ext(extension="qos", service="network")
|
||||
@base_api.require_qos_rule_type(qos_consts.RULE_TYPE_BANDWIDTH_LIMIT)
|
||||
def resource_setup(cls):
|
||||
super(QoSTest, cls).resource_setup()
|
||||
|
|
|
|||
|
|
@ -14,10 +14,10 @@
|
|||
|
||||
import netaddr
|
||||
from oslo_log import log as logging
|
||||
from tempest.common import utils as tutils
|
||||
from tempest.common import waiters
|
||||
from tempest.lib.common.utils import data_utils
|
||||
from tempest.lib import decorators
|
||||
from tempest import test
|
||||
import testtools
|
||||
|
||||
from neutron.common import utils
|
||||
|
|
@ -47,7 +47,7 @@ class TrunkTest(base.BaseTempestTestCase):
|
|||
force_tenant_isolation = False
|
||||
|
||||
@classmethod
|
||||
@test.requires_ext(extension="trunk", service="network")
|
||||
@tutils.requires_ext(extension="trunk", service="network")
|
||||
def resource_setup(cls):
|
||||
super(TrunkTest, cls).resource_setup()
|
||||
# setup basic topology for servers we can log into
|
||||
|
|
|
|||
Loading…
Reference in New Issue