openstack
/
neutron
Code Issues Proposed changes

Merge "api tests: Check correct extensions"

This commit is contained in:
Jenkins 2016-03-26 04:54:10 +00:00 committed by Gerrit Code Review
parent fc9d6a305c 9d3bab6b8d
commit 4f4a40689d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/tests/api/admin/test_external_network_extension.py
View File

@ -25,8 +25,8 @@ class ExternalNetworksRBACTestJSON(base.BaseAdminNetworkTest):
@classmethod
def resource_setup(cls):
if not test.is_extension_enabled('rbac_policies', 'network'):
msg = "rbac extension not enabled."
if not test.is_extension_enabled('rbac-policies', 'network'):
msg = "rbac-policies extension not enabled."
raise cls.skipException(msg)
super(ExternalNetworksRBACTestJSON, cls).resource_setup()
cls.client2 = cls.alt_manager.network_client

4
neutron/tests/api/admin/test_shared_network_extension.py
View File

@ -181,8 +181,8 @@ class RBACSharedNetworksTest(base.BaseAdminNetworkTest):
@classmethod
def resource_setup(cls):
super(RBACSharedNetworksTest, cls).resource_setup()
if not test.is_extension_enabled('rbac_policies', 'network'):
msg = "rbac extension not enabled."
if not test.is_extension_enabled('rbac-policies', 'network'):
msg = "rbac-policies extension not enabled."
raise cls.skipException(msg)
cls.client2 = cls.alt_manager.network_client

5
neutron/tests/api/test_auto_allocated_topology.py
View File

@ -32,8 +32,9 @@ class TestAutoAllocatedTopology(base.BaseAdminNetworkTest):
def skip_checks(cls):
super(TestAutoAllocatedTopology, cls).skip_checks()
if not test.is_extension_enabled('auto_allocate', 'network'):
raise cls.skipException("auto_allocate extension not enabled")
if not test.is_extension_enabled('auto-allocated-topology', 'network'):
raise cls.skipException("auto-allocated-topology extension not "
"enabled")
@classmethod
def resource_setup(cls):