From 28d2b0df5a4c46484dc15aebea3433b16951e45b Mon Sep 17 00:00:00 2001 From: EdLeafe Date: Tue, 18 Aug 2015 17:28:07 +0000 Subject: [PATCH] Remove more 'v3' references from the code This is part of the V3 cleanup effort. The 'ApiSampleTestBaseV3' class has been renamed to 'ApiSampleTestBaseV21', and all references to it updated. Also, all references to the 'nova.api.v3' extension namespace have been renamed to 'nova.api.v21'. Finally, some code that used short variable names like 'v1', 'v2', etc., has been updated to rename these 'vers1', 'vers2', to avoid confusion with the v3 issue. Change-Id: I23eab21c7158ba319e060bd075ef25afc5365381 --- nova/api/openstack/__init__.py | 4 +- nova/api/openstack/compute/servers.py | 12 +- .../api_sample_tests/api_sample_base.py | 5 +- .../api_sample_tests/test_access_ips.py | 2 +- .../api_sample_tests/test_agents.py | 2 +- .../api_sample_tests/test_aggregates.py | 2 +- .../api_sample_tests/test_baremetal_nodes.py | 2 +- .../functional/api_sample_tests/test_cells.py | 2 +- .../api_sample_tests/test_certificates.py | 2 +- .../api_sample_tests/test_cloudpipe.py | 2 +- .../api_sample_tests/test_extension_info.py | 4 +- .../api_sample_tests/test_flavor_access.py | 2 +- .../test_flavor_extraspecs.py | 2 +- .../api_sample_tests/test_flavor_manage.py | 2 +- .../api_sample_tests/test_flavor_rxtx.py | 2 +- .../api_sample_tests/test_flavors.py | 2 +- .../api_sample_tests/test_floating_ip_dns.py | 2 +- .../test_floating_ip_pools.py | 2 +- .../api_sample_tests/test_floating_ips.py | 2 +- .../test_floating_ips_bulk.py | 2 +- .../functional/api_sample_tests/test_hosts.py | 2 +- .../api_sample_tests/test_hypervisors.py | 4 +- .../api_sample_tests/test_image_size.py | 2 +- .../api_sample_tests/test_images.py | 2 +- .../api_sample_tests/test_instance_actions.py | 2 +- .../test_instance_usage_audit_log.py | 2 +- .../api_sample_tests/test_keypairs.py | 2 +- .../api_sample_tests/test_limits.py | 2 +- .../api_sample_tests/test_migrations.py | 2 +- .../api_sample_tests/test_networks.py | 2 +- .../test_networks_associate.py | 2 +- .../functional/api_sample_tests/test_pci.py | 4 +- .../api_sample_tests/test_quota_classes.py | 2 +- .../api_sample_tests/test_quota_sets.py | 2 +- .../api_sample_tests/test_scheduler_hints.py | 2 +- .../test_security_group_default_rules.py | 2 +- .../api_sample_tests/test_server_groups.py | 2 +- .../api_sample_tests/test_servers.py | 2 +- .../api_sample_tests/test_services.py | 2 +- .../api_sample_tests/test_tenant_networks.py | 2 +- .../api_sample_tests/test_used_limits.py | 2 +- .../api_sample_tests/test_user_data.py | 2 +- .../api_sample_tests/test_versions.py | 2 +- .../api_sample_tests/test_volumes.py | 2 +- .../openstack/compute/test_microversions.py | 32 +-- .../compute/test_plugin_framework.py | 2 +- .../openstack/compute/test_v3_extensions.py | 194 ------------------ .../api/openstack/test_api_version_request.py | 74 +++---- setup.cfg | 14 +- 49 files changed, 114 insertions(+), 311 deletions(-) delete mode 100644 nova/tests/unit/api/openstack/compute/test_v3_extensions.py diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py index 1e1ebf5fa2..e167071e1c 100644 --- a/nova/api/openstack/__init__.py +++ b/nova/api/openstack/__init__.py @@ -312,9 +312,7 @@ class APIRouterV21(base_wsgi.Router): @staticmethod def api_extension_namespace(): - # TODO(oomichi): This namespaces will be changed after moving all v3 - # APIs to v2.1. - return 'nova.api.v3.extensions' + return 'nova.api.v21.extensions' def __init__(self, init_only=None, v3mode=False): # TODO(cyeoh): bp v3-api-extension-framework. Currently load diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index aca867c2f2..beb0d5351b 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -63,17 +63,17 @@ authorize = extensions.os_compute_authorizer(ALIAS) class ServersController(wsgi.Controller): """The Server API base controller class for the OpenStack API.""" - EXTENSION_CREATE_NAMESPACE = 'nova.api.v3.extensions.server.create' + EXTENSION_CREATE_NAMESPACE = 'nova.api.v21.extensions.server.create' EXTENSION_DESERIALIZE_EXTRACT_SERVER_NAMESPACE = ( - 'nova.api.v3.extensions.server.create.deserialize') + 'nova.api.v21.extensions.server.create.deserialize') - EXTENSION_REBUILD_NAMESPACE = 'nova.api.v3.extensions.server.rebuild' + EXTENSION_REBUILD_NAMESPACE = 'nova.api.v21.extensions.server.rebuild' EXTENSION_DESERIALIZE_EXTRACT_REBUILD_NAMESPACE = ( - 'nova.api.v3.extensions.server.rebuild.deserialize') + 'nova.api.v21.extensions.server.rebuild.deserialize') - EXTENSION_UPDATE_NAMESPACE = 'nova.api.v3.extensions.server.update' + EXTENSION_UPDATE_NAMESPACE = 'nova.api.v21.extensions.server.update' - EXTENSION_RESIZE_NAMESPACE = 'nova.api.v3.extensions.server.resize' + EXTENSION_RESIZE_NAMESPACE = 'nova.api.v21.extensions.server.resize' _view_builder_class = views_servers.ViewBuilderV3 diff --git a/nova/tests/functional/api_sample_tests/api_sample_base.py b/nova/tests/functional/api_sample_tests/api_sample_base.py index 0770c2a8ce..2a0541658a 100644 --- a/nova/tests/functional/api_sample_tests/api_sample_base.py +++ b/nova/tests/functional/api_sample_tests/api_sample_base.py @@ -29,7 +29,7 @@ from nova.tests.unit import fake_utils CONF = cfg.CONF -class ApiSampleTestBaseV3(testscenarios.WithScenarios, +class ApiSampleTestBaseV21(testscenarios.WithScenarios, api_samples_test_base.ApiSampleTestBase): _api_version = 'v2' sample_dir = None @@ -69,8 +69,7 @@ class ApiSampleTestBaseV3(testscenarios.WithScenarios, elif (self._test == 'v2' and self._api_version == 'v2'): # override /v2 in compatibility mode with v2 legacy self.useFixture(api_paste_fixture.ApiPasteLegacyV2Fixture()) - - super(ApiSampleTestBaseV3, self).setUp() + super(ApiSampleTestBaseV21, self).setUp() self.useFixture(test.SampleNetworks(host=self.network.host)) fake_network.stub_compute_with_ips(self.stubs) fake_utils.stub_out_utils_spawn_n(self.stubs) diff --git a/nova/tests/functional/api_sample_tests/test_access_ips.py b/nova/tests/functional/api_sample_tests/test_access_ips.py index 3ee52c6100..a6076364d3 100644 --- a/nova/tests/functional/api_sample_tests/test_access_ips.py +++ b/nova/tests/functional/api_sample_tests/test_access_ips.py @@ -23,7 +23,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class AccessIPsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): extension_name = 'os-access-ips' def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_agents.py b/nova/tests/functional/api_sample_tests/test_agents.py index 0f8e509893..f54c4a0aad 100644 --- a/nova/tests/functional/api_sample_tests/test_agents.py +++ b/nova/tests/functional/api_sample_tests/test_agents.py @@ -24,7 +24,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class AgentsJsonTest(api_sample_base.ApiSampleTestBaseV3): +class AgentsJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-agents" diff --git a/nova/tests/functional/api_sample_tests/test_aggregates.py b/nova/tests/functional/api_sample_tests/test_aggregates.py index 3e6a9f6ffb..c8b1b84782 100644 --- a/nova/tests/functional/api_sample_tests/test_aggregates.py +++ b/nova/tests/functional/api_sample_tests/test_aggregates.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class AggregatesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-aggregates" diff --git a/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py b/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py index cde9ebdebe..cbb1c3cc30 100644 --- a/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py +++ b/nova/tests/functional/api_sample_tests/test_baremetal_nodes.py @@ -48,7 +48,7 @@ class fake_client(object): node = NodeManager() -class BareMetalNodesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class BareMetalNodesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-baremetal-nodes" diff --git a/nova/tests/functional/api_sample_tests/test_cells.py b/nova/tests/functional/api_sample_tests/test_cells.py index 8b14092947..26bac00fe8 100644 --- a/nova/tests/functional/api_sample_tests/test_cells.py +++ b/nova/tests/functional/api_sample_tests/test_cells.py @@ -28,7 +28,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class CellsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-cells" def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_certificates.py b/nova/tests/functional/api_sample_tests/test_certificates.py index 1a72dda1d4..7fb151a84d 100644 --- a/nova/tests/functional/api_sample_tests/test_certificates.py +++ b/nova/tests/functional/api_sample_tests/test_certificates.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class CertificatesSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): +class CertificatesSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-certificates" def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_cloudpipe.py b/nova/tests/functional/api_sample_tests/test_cloudpipe.py index a93d9e16df..f90cf07695 100644 --- a/nova/tests/functional/api_sample_tests/test_cloudpipe.py +++ b/nova/tests/functional/api_sample_tests/test_cloudpipe.py @@ -28,7 +28,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class CloudPipeSampleTest(api_sample_base.ApiSampleTestBaseV3): +class CloudPipeSampleTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-cloudpipe" diff --git a/nova/tests/functional/api_sample_tests/test_extension_info.py b/nova/tests/functional/api_sample_tests/test_extension_info.py index 59ca2e47aa..3cdccf3f6e 100644 --- a/nova/tests/functional/api_sample_tests/test_extension_info.py +++ b/nova/tests/functional/api_sample_tests/test_extension_info.py @@ -30,7 +30,7 @@ def fake_soft_extension_authorizer(extension_name, core=False): return authorize -class ExtensionInfoAllSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): +class ExtensionInfoAllSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): all_extensions = True @mock.patch.object(api_extensions, 'os_compute_soft_authorizer') @@ -44,7 +44,7 @@ class ExtensionInfoAllSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): self._verify_response(template, subs, response, 200) -class ExtensionInfoSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): +class ExtensionInfoSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): sample_dir = "extension-info" extra_extensions_to_load = ["os-create-backup"] # NOTE (gmann): run this tests for v21. and v2.1 compatible mode only diff --git a/nova/tests/functional/api_sample_tests/test_flavor_access.py b/nova/tests/functional/api_sample_tests/test_flavor_access.py index bf2dfaf3eb..df878469df 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_access.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_access.py @@ -21,7 +21,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FlavorAccessSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class FlavorAccessSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = 'flavor-access' diff --git a/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py index 2e37dc28a4..31f70f6768 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_extraspecs.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class FlavorExtraSpecsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = 'flavor-extra-specs' diff --git a/nova/tests/functional/api_sample_tests/test_flavor_manage.py b/nova/tests/functional/api_sample_tests/test_flavor_manage.py index af81060839..0987284219 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_manage.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_manage.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class FlavorManageSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = 'flavor-manage' diff --git a/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py b/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py index 5e3e71b27e..84c16e8e48 100644 --- a/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py +++ b/nova/tests/functional/api_sample_tests/test_flavor_rxtx.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FlavorRxtxJsonTest(api_sample_base.ApiSampleTestBaseV3): +class FlavorRxtxJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = 'os-flavor-rxtx' diff --git a/nova/tests/functional/api_sample_tests/test_flavors.py b/nova/tests/functional/api_sample_tests/test_flavors.py index 7cbd752a7d..fb7810e3b4 100644 --- a/nova/tests/functional/api_sample_tests/test_flavors.py +++ b/nova/tests/functional/api_sample_tests/test_flavors.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class FlavorsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): sample_dir = 'flavors' def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py b/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py index ebd0b07012..fffcd206f7 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ip_dns.py @@ -21,7 +21,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FloatingIpDNSTest(api_sample_base.ApiSampleTestBaseV3): +class FloatingIpDNSTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-floating-ip-dns" diff --git a/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py b/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py index 758b68042d..70bae5f5fb 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ip_pools.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FloatingIPPoolsSampleTests(api_sample_base.ApiSampleTestBaseV3): +class FloatingIPPoolsSampleTests(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-floating-ip-pools" def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_floating_ips.py b/nova/tests/functional/api_sample_tests/test_floating_ips.py index 3ab3432e08..3e70a002d8 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ips.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ips.py @@ -25,7 +25,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FloatingIpsTest(api_sample_base.ApiSampleTestBaseV3): +class FloatingIpsTest(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-floating-ips" def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py b/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py index a6245c5140..9be5cd930f 100644 --- a/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py +++ b/nova/tests/functional/api_sample_tests/test_floating_ips_bulk.py @@ -25,7 +25,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class FloatingIpsBulkTest(api_sample_base.ApiSampleTestBaseV3): +class FloatingIpsBulkTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-floating-ips-bulk" diff --git a/nova/tests/functional/api_sample_tests/test_hosts.py b/nova/tests/functional/api_sample_tests/test_hosts.py index e941f4897b..b815ddf790 100644 --- a/nova/tests/functional/api_sample_tests/test_hosts.py +++ b/nova/tests/functional/api_sample_tests/test_hosts.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class HostsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-hosts" diff --git a/nova/tests/functional/api_sample_tests/test_hypervisors.py b/nova/tests/functional/api_sample_tests/test_hypervisors.py index 5f5544a625..db21021d10 100644 --- a/nova/tests/functional/api_sample_tests/test_hypervisors.py +++ b/nova/tests/functional/api_sample_tests/test_hypervisors.py @@ -27,7 +27,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-hypervisors" @@ -114,7 +114,7 @@ class HypervisorsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): @mock.patch("nova.servicegroup.API.service_is_up", return_value=True) -class HypervisorsCellsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class HypervisorsCellsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-hypervisors" diff --git a/nova/tests/functional/api_sample_tests/test_image_size.py b/nova/tests/functional/api_sample_tests/test_image_size.py index 5eed0790f4..fd668307c7 100644 --- a/nova/tests/functional/api_sample_tests/test_image_size.py +++ b/nova/tests/functional/api_sample_tests/test_image_size.py @@ -23,7 +23,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class ImageSizeSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class ImageSizeSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): extension_name = "image-size" extra_extensions_to_load = ["images", "image-metadata"] diff --git a/nova/tests/functional/api_sample_tests/test_images.py b/nova/tests/functional/api_sample_tests/test_images.py index 8c572c6ae7..5ccee1ace3 100644 --- a/nova/tests/functional/api_sample_tests/test_images.py +++ b/nova/tests/functional/api_sample_tests/test_images.py @@ -23,7 +23,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class ImagesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class ImagesSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): extension_name = 'images' extra_extensions_to_load = ["image-metadata"] diff --git a/nova/tests/functional/api_sample_tests/test_instance_actions.py b/nova/tests/functional/api_sample_tests/test_instance_actions.py index 278d719425..6e9ab04eab 100644 --- a/nova/tests/functional/api_sample_tests/test_instance_actions.py +++ b/nova/tests/functional/api_sample_tests/test_instance_actions.py @@ -30,7 +30,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class ServerActionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class ServerActionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = 'os-instance-actions' diff --git a/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py b/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py index ecebfda8dd..e4324db618 100644 --- a/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py +++ b/nova/tests/functional/api_sample_tests/test_instance_usage_audit_log.py @@ -24,7 +24,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class InstanceUsageAuditLogJsonTest(api_sample_base.ApiSampleTestBaseV3): +class InstanceUsageAuditLogJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-instance-usage-audit-log" diff --git a/nova/tests/functional/api_sample_tests/test_keypairs.py b/nova/tests/functional/api_sample_tests/test_keypairs.py index bd76f02f33..71f8f1e08e 100644 --- a/nova/tests/functional/api_sample_tests/test_keypairs.py +++ b/nova/tests/functional/api_sample_tests/test_keypairs.py @@ -26,7 +26,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class KeyPairsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): request_api_version = None sample_dir = "keypairs" expected_delete_status_code = 202 diff --git a/nova/tests/functional/api_sample_tests/test_limits.py b/nova/tests/functional/api_sample_tests/test_limits.py index c454cffb7c..b8ffd25517 100644 --- a/nova/tests/functional/api_sample_tests/test_limits.py +++ b/nova/tests/functional/api_sample_tests/test_limits.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class LimitsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class LimitsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "limits" diff --git a/nova/tests/functional/api_sample_tests/test_migrations.py b/nova/tests/functional/api_sample_tests/test_migrations.py index 1cb6cd7c20..7ab0686e37 100644 --- a/nova/tests/functional/api_sample_tests/test_migrations.py +++ b/nova/tests/functional/api_sample_tests/test_migrations.py @@ -25,7 +25,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class MigrationsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): +class MigrationsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-migrations" diff --git a/nova/tests/functional/api_sample_tests/test_networks.py b/nova/tests/functional/api_sample_tests/test_networks.py index bc9ba5e738..4ab9bcb881 100644 --- a/nova/tests/functional/api_sample_tests/test_networks.py +++ b/nova/tests/functional/api_sample_tests/test_networks.py @@ -24,7 +24,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class NetworksJsonTests(api_sample_base.ApiSampleTestBaseV3): +class NetworksJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-networks" diff --git a/nova/tests/functional/api_sample_tests/test_networks_associate.py b/nova/tests/functional/api_sample_tests/test_networks_associate.py index 4715fea33c..27449e6b5f 100644 --- a/nova/tests/functional/api_sample_tests/test_networks_associate.py +++ b/nova/tests/functional/api_sample_tests/test_networks_associate.py @@ -23,7 +23,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class NetworksAssociateJsonTests(api_sample_base.ApiSampleTestBaseV3): +class NetworksAssociateJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-networks-associate" extra_extensions_to_load = ["os-networks"] diff --git a/nova/tests/functional/api_sample_tests/test_pci.py b/nova/tests/functional/api_sample_tests/test_pci.py index b254083db9..98bee8354a 100644 --- a/nova/tests/functional/api_sample_tests/test_pci.py +++ b/nova/tests/functional/api_sample_tests/test_pci.py @@ -89,7 +89,7 @@ class ExtendedServerPciSampleJsonTest(test_servers.ServersSampleBase): self._verify_response('servers-detail-resp', subs, response, 200) -class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extra_extensions_to_load = ['os-hypervisors'] extension_name = 'os-pci' @@ -175,7 +175,7 @@ class ExtendedHyervisorPciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): subs, response, 200) -class PciSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class PciSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-pci" diff --git a/nova/tests/functional/api_sample_tests/test_quota_classes.py b/nova/tests/functional/api_sample_tests/test_quota_classes.py index ddebe15db2..3d9faa17b5 100644 --- a/nova/tests/functional/api_sample_tests/test_quota_classes.py +++ b/nova/tests/functional/api_sample_tests/test_quota_classes.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class QuotaClassesSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class QuotaClassesSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-quota-class-sets" set_id = 'test_class' diff --git a/nova/tests/functional/api_sample_tests/test_quota_sets.py b/nova/tests/functional/api_sample_tests/test_quota_sets.py index dc07d7b56c..08ff69b4ff 100644 --- a/nova/tests/functional/api_sample_tests/test_quota_sets.py +++ b/nova/tests/functional/api_sample_tests/test_quota_sets.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class QuotaSetsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class QuotaSetsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-quota-sets" diff --git a/nova/tests/functional/api_sample_tests/test_scheduler_hints.py b/nova/tests/functional/api_sample_tests/test_scheduler_hints.py index d07dc7ff44..8b55851509 100644 --- a/nova/tests/functional/api_sample_tests/test_scheduler_hints.py +++ b/nova/tests/functional/api_sample_tests/test_scheduler_hints.py @@ -25,7 +25,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class SchedulerHintsJsonTest(api_sample_base.ApiSampleTestBaseV3): +class SchedulerHintsJsonTest(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-scheduler-hints" def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py b/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py index a30829bee3..db4e7a7610 100644 --- a/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py +++ b/nova/tests/functional/api_sample_tests/test_security_group_default_rules.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', class SecurityGroupDefaultRulesSampleJsonTest( - api_sample_base.ApiSampleTestBaseV3): + api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = 'os-security-group-default-rules' diff --git a/nova/tests/functional/api_sample_tests/test_server_groups.py b/nova/tests/functional/api_sample_tests/test_server_groups.py index 3d1b8cb912..89cd06bff3 100644 --- a/nova/tests/functional/api_sample_tests/test_server_groups.py +++ b/nova/tests/functional/api_sample_tests/test_server_groups.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class ServerGroupsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class ServerGroupsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-server-groups" def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_servers.py b/nova/tests/functional/api_sample_tests/test_servers.py index 3769c6bbe3..647cdeda4b 100644 --- a/nova/tests/functional/api_sample_tests/test_servers.py +++ b/nova/tests/functional/api_sample_tests/test_servers.py @@ -23,7 +23,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class ServersSampleBase(api_sample_base.ApiSampleTestBaseV3): +class ServersSampleBase(api_sample_base.ApiSampleTestBaseV21): extra_extensions_to_load = ["os-access-ips"] def _post_server(self, use_common_server_api_samples=True): diff --git a/nova/tests/functional/api_sample_tests/test_services.py b/nova/tests/functional/api_sample_tests/test_services.py index dfe69dc9e6..a52ece200d 100644 --- a/nova/tests/functional/api_sample_tests/test_services.py +++ b/nova/tests/functional/api_sample_tests/test_services.py @@ -25,7 +25,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class ServicesJsonTest(api_sample_base.ApiSampleTestBaseV3): +class ServicesJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-services" request_api_version = None diff --git a/nova/tests/functional/api_sample_tests/test_tenant_networks.py b/nova/tests/functional/api_sample_tests/test_tenant_networks.py index a8f85ef2cc..faa39fa908 100644 --- a/nova/tests/functional/api_sample_tests/test_tenant_networks.py +++ b/nova/tests/functional/api_sample_tests/test_tenant_networks.py @@ -28,7 +28,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class TenantNetworksJsonTests(api_sample_base.ApiSampleTestBaseV3): +class TenantNetworksJsonTests(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-tenant-networks" diff --git a/nova/tests/functional/api_sample_tests/test_used_limits.py b/nova/tests/functional/api_sample_tests/test_used_limits.py index f3c3c65358..3c16f9ad48 100644 --- a/nova/tests/functional/api_sample_tests/test_used_limits.py +++ b/nova/tests/functional/api_sample_tests/test_used_limits.py @@ -22,7 +22,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class UsedLimitsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3): +class UsedLimitsSamplesJsonTest(api_sample_base.ApiSampleTestBaseV21): ADMIN_API = True extension_name = "os-used-limits" extra_extensions_to_load = ["limits"] diff --git a/nova/tests/functional/api_sample_tests/test_user_data.py b/nova/tests/functional/api_sample_tests/test_user_data.py index 9b77030ae6..3f45f520e2 100644 --- a/nova/tests/functional/api_sample_tests/test_user_data.py +++ b/nova/tests/functional/api_sample_tests/test_user_data.py @@ -24,7 +24,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV3): +class UserDataJsonTest(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-user-data" def _get_flags(self): diff --git a/nova/tests/functional/api_sample_tests/test_versions.py b/nova/tests/functional/api_sample_tests/test_versions.py index a4601c3905..1d078bbb1b 100644 --- a/nova/tests/functional/api_sample_tests/test_versions.py +++ b/nova/tests/functional/api_sample_tests/test_versions.py @@ -16,7 +16,7 @@ from nova.tests.functional.api_sample_tests import api_sample_base -class VersionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV3): +class VersionsSampleJsonTest(api_sample_base.ApiSampleTestBaseV21): sample_dir = 'versions' scenarios = [('', {'_test': ''})] diff --git a/nova/tests/functional/api_sample_tests/test_volumes.py b/nova/tests/functional/api_sample_tests/test_volumes.py index 6d941f4cbc..04a348bdd7 100644 --- a/nova/tests/functional/api_sample_tests/test_volumes.py +++ b/nova/tests/functional/api_sample_tests/test_volumes.py @@ -34,7 +34,7 @@ CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.legacy_v2.extensions') -class SnapshotsSampleJsonTests(api_sample_base.ApiSampleTestBaseV3): +class SnapshotsSampleJsonTests(api_sample_base.ApiSampleTestBaseV21): extension_name = "os-volumes" create_subs = { diff --git a/nova/tests/unit/api/openstack/compute/test_microversions.py b/nova/tests/unit/api/openstack/compute/test_microversions.py index 27e6e41192..6c3c2ba55a 100644 --- a/nova/tests/unit/api/openstack/compute/test_microversions.py +++ b/nova/tests/unit/api/openstack/compute/test_microversions.py @@ -38,7 +38,7 @@ class MicroversionsTest(test.NoDBTestCase): return res @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_no_header(self, mock_namespace): app = fakes.wsgi_app_v21(init_only='test-microversions') req = fakes.HTTPRequest.blank('/v2/fake/microversions') @@ -48,7 +48,7 @@ class MicroversionsTest(test.NoDBTestCase): self.assertEqual('val', resp_json['param']) @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_return_header(self, mock_namespace): app = fakes.wsgi_app_v21(init_only='test-microversions') req = fakes.HTTPRequest.blank('/v2/fake/microversions') @@ -61,7 +61,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_return_header_non_default(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("2.3") @@ -78,7 +78,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_return_header_fault(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.0") @@ -93,7 +93,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def _check_microversion_response(self, url, req_version, resp_param, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest('2.3') @@ -120,7 +120,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions2_later_version(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.1") @@ -134,7 +134,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions2_version_too_high(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.5") @@ -146,7 +146,7 @@ class MicroversionsTest(test.NoDBTestCase): self.assertEqual(404, res.status_int) @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions2_version_too_low(self, mock_namespace): app = fakes.wsgi_app_v21(init_only='test-microversions') req = fakes.HTTPRequest.blank('/v2/fake/microversions2') @@ -156,7 +156,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_global_version_too_high(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.5") @@ -173,7 +173,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_schema(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.3") @@ -193,7 +193,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_schema_fail(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.3") @@ -212,7 +212,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_schema_out_of_version_check(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.3") @@ -232,7 +232,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_microversions_schema_second_version(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest("3.3") @@ -252,7 +252,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def _test_microversions_inner_function(self, version, expected_resp, mock_namespace, mock_maxver): @@ -277,7 +277,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def test_with_extends_decorator(self, mock_namespace, mock_maxver): mock_maxver.return_value = api_version.APIVersionRequest('2.4') @@ -300,7 +300,7 @@ class MicroversionsTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.api_version_request.max_api_version") @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace", - return_value='nova.api.v3.test_extensions') + return_value='nova.api.v21.test_extensions') def _test_microversions_actions(self, ret_code, ret_header, req_header, mock_namespace, mock_maxver): diff --git a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py b/nova/tests/unit/api/openstack/compute/test_plugin_framework.py index 7e9edaabf7..0482aa994e 100644 --- a/nova/tests/unit/api/openstack/compute/test_plugin_framework.py +++ b/nova/tests/unit/api/openstack/compute/test_plugin_framework.py @@ -26,7 +26,7 @@ class PluginTest(test.NoDBTestCase): @mock.patch("nova.api.openstack.APIRouterV21.api_extension_namespace") def test_plugin_framework_index(self, mock_namespace): - mock_namespace.return_value = 'nova.api.v3.test_extensions' + mock_namespace.return_value = 'nova.api.v21.test_extensions' app = fakes.wsgi_app_v21(init_only='test-basic') req = fakes.HTTPRequest.blank('/v2/fake/test') diff --git a/nova/tests/unit/api/openstack/compute/test_v3_extensions.py b/nova/tests/unit/api/openstack/compute/test_v3_extensions.py deleted file mode 100644 index 4ae6d0c4e9..0000000000 --- a/nova/tests/unit/api/openstack/compute/test_v3_extensions.py +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 2013 IBM Corp. -# -# 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 oslo_config import cfg -import stevedore -import webob.exc - -from nova.api import openstack -from nova.api.openstack import compute -from nova.api.openstack.compute import extension_info -from nova.api.openstack import extensions -from nova import exception -from nova import test - -CONF = cfg.CONF - - -class fake_bad_extension(object): - name = "fake_bad_extension" - alias = "fake-bad" - - -class fake_stevedore_enabled_extensions(object): - def __init__(self, namespace, check_func, invoke_on_load=False, - invoke_args=(), invoke_kwds=None): - self.extensions = [] - - def map(self, func, *args, **kwds): - pass - - def __iter__(self): - return iter(self.extensions) - - -class fake_loaded_extension_info(object): - def __init__(self): - self.extensions = {} - - def register_extension(self, ext): - self.extensions[ext] = ext - return True - - def get_extensions(self): - return {'core1': None, 'core2': None, 'noncore1': None} - - -class ExtensionLoadingTestCase(test.NoDBTestCase): - - def _set_v3_core(self, core_extensions): - openstack.API_V3_CORE_EXTENSIONS = core_extensions - - def test_extensions_loaded(self): - app = compute.APIRouterV3() - self.assertIn('servers', app._loaded_extension_info.extensions) - - def test_check_bad_extension(self): - loaded_ext_info = extension_info.LoadedExtensionInfo() - self.assertFalse(loaded_ext_info._check_extension(fake_bad_extension)) - - def test_extensions_blacklist(self): - app = compute.APIRouterV3() - self.assertIn('os-hosts', app._loaded_extension_info.extensions) - CONF.set_override('extensions_blacklist', ['os-hosts'], 'osapi_v21') - app = compute.APIRouterV3() - self.assertNotIn('os-hosts', app._loaded_extension_info.extensions) - - def test_extensions_whitelist_accept(self): - # NOTE(maurosr): just to avoid to get an exception raised for not - # loading all core api. - v3_core = openstack.API_V3_CORE_EXTENSIONS - openstack.API_V3_CORE_EXTENSIONS = set(['servers']) - self.addCleanup(self._set_v3_core, v3_core) - - app = compute.APIRouterV3() - self.assertIn('os-hosts', app._loaded_extension_info.extensions) - CONF.set_override('extensions_whitelist', ['servers', 'os-hosts'], - 'osapi_v21') - app = compute.APIRouterV3() - self.assertIn('os-hosts', app._loaded_extension_info.extensions) - - def test_extensions_whitelist_block(self): - # NOTE(maurosr): just to avoid to get an exception raised for not - # loading all core api. - v3_core = openstack.API_V3_CORE_EXTENSIONS - openstack.API_V3_CORE_EXTENSIONS = set(['servers']) - self.addCleanup(self._set_v3_core, v3_core) - - app = compute.APIRouterV3() - self.assertIn('os-hosts', app._loaded_extension_info.extensions) - CONF.set_override('extensions_whitelist', ['servers'], 'osapi_v21') - app = compute.APIRouterV3() - self.assertNotIn('os-hosts', app._loaded_extension_info.extensions) - - def test_blacklist_overrides_whitelist(self): - # NOTE(maurosr): just to avoid to get an exception raised for not - # loading all core api. - v3_core = openstack.API_V3_CORE_EXTENSIONS - openstack.API_V3_CORE_EXTENSIONS = set(['servers']) - self.addCleanup(self._set_v3_core, v3_core) - - app = compute.APIRouterV3() - self.assertIn('os-hosts', app._loaded_extension_info.extensions) - CONF.set_override('extensions_whitelist', ['servers', 'os-hosts'], - 'osapi_v21') - CONF.set_override('extensions_blacklist', ['os-hosts'], 'osapi_v21') - app = compute.APIRouterV3() - self.assertNotIn('os-hosts', app._loaded_extension_info.extensions) - self.assertIn('servers', app._loaded_extension_info.extensions) - self.assertEqual(len(app._loaded_extension_info.extensions), 1) - - def test_get_missing_core_extensions(self): - v3_core = openstack.API_V3_CORE_EXTENSIONS - openstack.API_V3_CORE_EXTENSIONS = set(['core1', 'core2']) - self.addCleanup(self._set_v3_core, v3_core) - self.assertEqual(len(compute.APIRouterV3.get_missing_core_extensions( - ['core1', 'core2', 'noncore1'])), 0) - missing_core = compute.APIRouterV3.get_missing_core_extensions( - ['core1']) - self.assertEqual(len(missing_core), 1) - self.assertIn('core2', missing_core) - missing_core = compute.APIRouterV3.get_missing_core_extensions([]) - self.assertEqual(len(missing_core), 2) - self.assertIn('core1', missing_core) - self.assertIn('core2', missing_core) - missing_core = compute.APIRouterV3.get_missing_core_extensions( - ['noncore1']) - self.assertEqual(len(missing_core), 2) - self.assertIn('core1', missing_core) - self.assertIn('core2', missing_core) - - def test_core_extensions_present(self): - self.stubs.Set(stevedore.enabled, 'EnabledExtensionManager', - fake_stevedore_enabled_extensions) - self.stubs.Set(extension_info, 'LoadedExtensionInfo', - fake_loaded_extension_info) - v3_core = openstack.API_V3_CORE_EXTENSIONS - openstack.API_V3_CORE_EXTENSIONS = set(['core1', 'core2']) - self.addCleanup(self._set_v3_core, v3_core) - # if no core API extensions are missing then an exception will - # not be raised when creating an instance of compute.APIRouterV3 - compute.APIRouterV3() - - def test_core_extensions_missing(self): - self.stubs.Set(stevedore.enabled, 'EnabledExtensionManager', - fake_stevedore_enabled_extensions) - self.stubs.Set(extension_info, 'LoadedExtensionInfo', - fake_loaded_extension_info) - self.assertRaises(exception.CoreAPIMissing, compute.APIRouterV3) - - def test_extensions_expected_error(self): - @extensions.expected_errors(404) - def fake_func(): - raise webob.exc.HTTPNotFound() - - self.assertRaises(webob.exc.HTTPNotFound, fake_func) - - def test_extensions_expected_error_from_list(self): - @extensions.expected_errors((404, 403)) - def fake_func(): - raise webob.exc.HTTPNotFound() - - self.assertRaises(webob.exc.HTTPNotFound, fake_func) - - def test_extensions_unexpected_error(self): - @extensions.expected_errors(404) - def fake_func(): - raise webob.exc.HTTPConflict() - - self.assertRaises(webob.exc.HTTPInternalServerError, fake_func) - - def test_extensions_unexpected_error_from_list(self): - @extensions.expected_errors((404, 413)) - def fake_func(): - raise webob.exc.HTTPConflict() - - self.assertRaises(webob.exc.HTTPInternalServerError, fake_func) - - def test_extensions_unexpected_policy_not_authorized_error(self): - @extensions.expected_errors(404) - def fake_func(): - raise exception.PolicyNotAuthorized(action="foo") - - self.assertRaises(exception.PolicyNotAuthorized, fake_func) diff --git a/nova/tests/unit/api/openstack/test_api_version_request.py b/nova/tests/unit/api/openstack/test_api_version_request.py index 519ed97165..114c1aff3f 100644 --- a/nova/tests/unit/api/openstack/test_api_version_request.py +++ b/nova/tests/unit/api/openstack/test_api_version_request.py @@ -73,53 +73,53 @@ class APIVersionRequestTests(test.NoDBTestCase): api_version_request.APIVersionRequest, "2.1 ") def test_version_comparisons(self): - v1 = api_version_request.APIVersionRequest("2.0") - v2 = api_version_request.APIVersionRequest("2.5") - v3 = api_version_request.APIVersionRequest("5.23") - v4 = api_version_request.APIVersionRequest("2.0") + vers1 = api_version_request.APIVersionRequest("2.0") + vers2 = api_version_request.APIVersionRequest("2.5") + vers3 = api_version_request.APIVersionRequest("5.23") + vers4 = api_version_request.APIVersionRequest("2.0") v_null = api_version_request.APIVersionRequest() - self.assertTrue(v_null < v2) - self.assertTrue(v1 < v2) - self.assertTrue(v1 <= v2) - self.assertTrue(v1 <= v4) - self.assertTrue(v2 > v_null) - self.assertTrue(v3 > v2) - self.assertTrue(v1 >= v4) - self.assertTrue(v3 >= v2) - self.assertTrue(v1 != v2) - self.assertTrue(v1 == v4) - self.assertTrue(v1 != v_null) + self.assertTrue(v_null < vers2) + self.assertTrue(vers1 < vers2) + self.assertTrue(vers1 <= vers2) + self.assertTrue(vers1 <= vers4) + self.assertTrue(vers2 > v_null) + self.assertTrue(vers3 > vers2) + self.assertTrue(vers1 >= vers4) + self.assertTrue(vers3 >= vers2) + self.assertTrue(vers1 != vers2) + self.assertTrue(vers1 == vers4) + self.assertTrue(vers1 != v_null) self.assertTrue(v_null == v_null) - self.assertRaises(TypeError, v1.__lt__, "2.1") + self.assertRaises(TypeError, vers1.__lt__, "2.1") def test_version_matches(self): - v1 = api_version_request.APIVersionRequest("2.0") - v2 = api_version_request.APIVersionRequest("2.5") - v3 = api_version_request.APIVersionRequest("2.45") - v4 = api_version_request.APIVersionRequest("3.3") - v5 = api_version_request.APIVersionRequest("3.23") - v6 = api_version_request.APIVersionRequest("2.0") - v7 = api_version_request.APIVersionRequest("3.3") - v8 = api_version_request.APIVersionRequest("4.0") + vers1 = api_version_request.APIVersionRequest("2.0") + vers2 = api_version_request.APIVersionRequest("2.5") + vers3 = api_version_request.APIVersionRequest("2.45") + vers4 = api_version_request.APIVersionRequest("3.3") + vers5 = api_version_request.APIVersionRequest("3.23") + vers6 = api_version_request.APIVersionRequest("2.0") + vers7 = api_version_request.APIVersionRequest("3.3") + vers8 = api_version_request.APIVersionRequest("4.0") v_null = api_version_request.APIVersionRequest() - self.assertTrue(v2.matches(v1, v3)) - self.assertTrue(v2.matches(v1, v_null)) - self.assertTrue(v1.matches(v6, v2)) - self.assertTrue(v4.matches(v2, v7)) - self.assertTrue(v4.matches(v_null, v7)) - self.assertTrue(v4.matches(v_null, v8)) - self.assertFalse(v1.matches(v2, v3)) - self.assertFalse(v5.matches(v2, v4)) - self.assertFalse(v2.matches(v3, v1)) + self.assertTrue(vers2.matches(vers1, vers3)) + self.assertTrue(vers2.matches(vers1, v_null)) + self.assertTrue(vers1.matches(vers6, vers2)) + self.assertTrue(vers4.matches(vers2, vers7)) + self.assertTrue(vers4.matches(v_null, vers7)) + self.assertTrue(vers4.matches(v_null, vers8)) + self.assertFalse(vers1.matches(vers2, vers3)) + self.assertFalse(vers5.matches(vers2, vers4)) + self.assertFalse(vers2.matches(vers3, vers1)) - self.assertRaises(ValueError, v_null.matches, v1, v3) + self.assertRaises(ValueError, v_null.matches, vers1, vers3) def test_get_string(self): - v1_string = "3.23" - v1 = api_version_request.APIVersionRequest(v1_string) - self.assertEqual(v1_string, v1.get_string()) + vers1_string = "3.23" + vers1 = api_version_request.APIVersionRequest(vers1_string) + self.assertEqual(vers1_string, vers1.get_string()) self.assertRaises(ValueError, api_version_request.APIVersionRequest().get_string) diff --git a/setup.cfg b/setup.cfg index a344bef8db..c00b69b7a6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -69,7 +69,7 @@ console_scripts = nova-spicehtml5proxy = nova.cmd.spicehtml5proxy:main nova-xvpvncproxy = nova.cmd.xvpvncproxy:main -nova.api.v3.extensions = +nova.api.v21.extensions = access_ips = nova.api.openstack.compute.access_ips:AccessIPs admin_actions = nova.api.openstack.compute.admin_actions:AdminActions admin_password = nova.api.openstack.compute.admin_password:AdminPassword @@ -156,7 +156,7 @@ nova.api.v3.extensions = virtual_interfaces = nova.api.openstack.compute.virtual_interfaces:VirtualInterfaces volumes = nova.api.openstack.compute.volumes:Volumes -nova.api.v3.extensions.server.create = +nova.api.v21.extensions.server.create = access_ips = nova.api.openstack.compute.access_ips:AccessIPs availability_zone = nova.api.openstack.compute.availability_zone:AvailabilityZone block_device_mapping = nova.api.openstack.compute.block_device_mapping:BlockDeviceMapping @@ -170,20 +170,20 @@ nova.api.v3.extensions.server.create = security_groups = nova.api.openstack.compute.security_groups:SecurityGroups user_data = nova.api.openstack.compute.user_data:UserData -nova.api.v3.extensions.server.rebuild = +nova.api.v21.extensions.server.rebuild = access_ips = nova.api.openstack.compute.access_ips:AccessIPs disk_config = nova.api.openstack.compute.disk_config:DiskConfig personality = nova.api.openstack.compute.personality:Personality preserve_ephemeral_rebuild = nova.api.openstack.compute.preserve_ephemeral_rebuild:PreserveEphemeralRebuild -nova.api.v3.extensions.server.update = +nova.api.v21.extensions.server.update = access_ips = nova.api.openstack.compute.access_ips:AccessIPs disk_config = nova.api.openstack.compute.disk_config:DiskConfig -nova.api.v3.extensions.server.resize = - disk_config = nova.api.openstack.compute.disk_config:DiskConfig +nova.api.v21.extensions.server.resize = + disk_config = nova.api.openstack.compute.disk_config:DiskConfig -nova.api.v3.test_extensions = +nova.api.v21.test_extensions = basic = nova.tests.unit.api.openstack.compute.basic:Basic microversions = nova.tests.unit.api.openstack.compute.microversions:Microversions