From bec65f6cdd159ec252c4aa0a63aabc9aea8fcfba Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 25 Mar 2016 15:25:39 +0900 Subject: [PATCH] api tests: Check correct extensions auto_allocate -> auto-allocated-topology rbac_policies -> rbac-policies Closes-Bug: #1561858 (cherry picked from commit 9d3bab6b8d6b2122732faeb66f831927bee0ac7e) Change-Id: Ied13e52bf78afe571f7243e93005bf5c68fe44db --- neutron/tests/api/admin/test_external_network_extension.py | 4 ++-- neutron/tests/api/admin/test_shared_network_extension.py | 4 ++-- neutron/tests/api/test_auto_allocated_topology.py | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/neutron/tests/api/admin/test_external_network_extension.py b/neutron/tests/api/admin/test_external_network_extension.py index dab05a33e86..a035319ad5a 100644 --- a/neutron/tests/api/admin/test_external_network_extension.py +++ b/neutron/tests/api/admin/test_external_network_extension.py @@ -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 diff --git a/neutron/tests/api/admin/test_shared_network_extension.py b/neutron/tests/api/admin/test_shared_network_extension.py index e44be207228..179ddbd0238 100644 --- a/neutron/tests/api/admin/test_shared_network_extension.py +++ b/neutron/tests/api/admin/test_shared_network_extension.py @@ -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 diff --git a/neutron/tests/api/test_auto_allocated_topology.py b/neutron/tests/api/test_auto_allocated_topology.py index f3f33641254..de457319a97 100644 --- a/neutron/tests/api/test_auto_allocated_topology.py +++ b/neutron/tests/api/test_auto_allocated_topology.py @@ -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):