From 5281e52512fc5b9b1017cf5c5da40cc92a7fe775 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Tue, 28 Apr 2015 22:08:39 +0000 Subject: [PATCH] Drop use of 'oslo' namespace package The Oslo libraries have moved all of their code out of the 'oslo' namespace package into per-library packages. The namespace package was retained during kilo for backwards compatibility, but will be removed by the liberty-2 milestone. This change removes the use of the namespace package, replacing it with the new package names. The patches in the libraries will be put on hold until application patches have landed, or L2, whichever comes first. At that point, new versions of the libraries without namespace packages will be released as a major version update. Please merge this patch, or an equivalent, before L2 to avoid problems with those library releases. Blueprint: remove-namespace-packages https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages Change-Id: If8a132de65ba1e57ea93f98daac66816a3cefaa8 --- etc/api-paste.ini | 4 ++-- neutron/openstack/common/cache/_backends/memory.py | 2 +- neutron/openstack/common/cache/cache.py | 2 +- neutron/openstack/common/middleware/catch_errors.py | 2 +- neutron/openstack/common/middleware/request_id.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/etc/api-paste.ini b/etc/api-paste.ini index 29f01e20b..4fb3ddbae 100644 --- a/etc/api-paste.ini +++ b/etc/api-paste.ini @@ -9,10 +9,10 @@ noauth = request_id catch_errors extensions neutronapiapp_v2_0 keystone = request_id catch_errors authtoken keystonecontext extensions neutronapiapp_v2_0 [filter:request_id] -paste.filter_factory = oslo.middleware:RequestId.factory +paste.filter_factory = oslo_middleware:RequestId.factory [filter:catch_errors] -paste.filter_factory = oslo.middleware:CatchErrors.factory +paste.filter_factory = oslo_middleware:CatchErrors.factory [filter:keystonecontext] paste.filter_factory = neutron.auth:NeutronKeystoneContext.factory diff --git a/neutron/openstack/common/cache/_backends/memory.py b/neutron/openstack/common/cache/_backends/memory.py index 7c9503862..0dbb3f665 100644 --- a/neutron/openstack/common/cache/_backends/memory.py +++ b/neutron/openstack/common/cache/_backends/memory.py @@ -14,7 +14,7 @@ import collections -from oslo.utils import timeutils +from oslo_utils import timeutils from oslo_concurrency import lockutils from neutron.openstack.common.cache import backends diff --git a/neutron/openstack/common/cache/cache.py b/neutron/openstack/common/cache/cache.py index a0cd2cd65..6f346ed4a 100644 --- a/neutron/openstack/common/cache/cache.py +++ b/neutron/openstack/common/cache/cache.py @@ -45,7 +45,7 @@ def _get_oslo_configs(): # at the top of this file, lets import cfg # here and assume that the caller of this # function already took care of this dependency. - from oslo.config import cfg + from oslo_config import cfg return [ cfg.StrOpt('cache_url', default='memory://', diff --git a/neutron/openstack/common/middleware/catch_errors.py b/neutron/openstack/common/middleware/catch_errors.py index d5dca1513..12c543be8 100644 --- a/neutron/openstack/common/middleware/catch_errors.py +++ b/neutron/openstack/common/middleware/catch_errors.py @@ -12,7 +12,7 @@ """Compatibility shim for Kilo, while operators migrate to oslo.middleware.""" -from oslo.middleware import catch_errors +from oslo_middleware import catch_errors from neutron.openstack.common import versionutils diff --git a/neutron/openstack/common/middleware/request_id.py b/neutron/openstack/common/middleware/request_id.py index 7fea9c3e0..29929682c 100644 --- a/neutron/openstack/common/middleware/request_id.py +++ b/neutron/openstack/common/middleware/request_id.py @@ -12,7 +12,7 @@ """Compatibility shim for Kilo, while operators migrate to oslo.middleware.""" -from oslo.middleware import request_id +from oslo_middleware import request_id from neutron.openstack.common import versionutils -- 2.45.2