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

diff --git a/etc/api-paste.ini b/etc/api-paste.ini
index 29f01e20b24b826af2597e450db0a1d07cf4d878..4fb3ddbae36fca6a736c062ea95ac912b8d012c1 100644 (file)
--- 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 7c95038622db28a36dbb1f7715b51bd6519de076..0dbb3f665ce5ed696a2837c7bd330bff5ad5b8d0 100644 (file)
--- 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 a0cd2cd6551aa15ac84af475c13f6141b560311d..6f346ed4af76946f01e7ad512002b73f10e9719c 100644 (file)
--- 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 d5dca1513a68ba8c42dc74377f8e69109e09868e..12c543be8af84a2bb65998bda34e11cfeb1f0527 100644 (file)
--- 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 7fea9c3e0598afe590ef38c1842c69e368d06f9b..29929682c74282a4571fd31d345dc6ebc5a8a079 100644 (file)
--- 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