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: I950f1afb1b4600dfc1f38d1a7d9322f240f444a6

diff --git a/cinder/openstack/common/config/generator.py b/cinder/openstack/common/config/generator.py
index bb20dfb27c7ae92577f7fcaf927e927d59d0017b..a376b2b34379bd8948aa7781d63f063094fb2706 100644 (file)
--- a/cinder/openstack/common/config/generator.py
+++ b/cinder/openstack/common/config/generator.py
@@ -27,8 +27,8 @@ import socket
 import sys
 import textwrap
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 import six
 import stevedore.named
 

diff --git a/cinder/openstack/common/periodic_task.py b/cinder/openstack/common/periodic_task.py
index c9d4f8973e5251cf4c170ea8e561f44ba929ba35..1ffd9a21f2beeec19265a2db68d3d8a0624d5d8f 100644 (file)
--- a/cinder/openstack/common/periodic_task.py
+++ b/cinder/openstack/common/periodic_task.py
@@ -16,7 +16,7 @@ import logging
 import random
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from cinder.openstack.common._i18n import _, _LE, _LI

diff --git a/cinder/openstack/common/scheduler/filters/extra_specs_ops.py b/cinder/openstack/common/scheduler/filters/extra_specs_ops.py
index 54450d36c9fd0a5b1a3a527f6c35a79a6c295860..735e3037c77fdd8460b93a9c806c4861a0a74b54 100644 (file)
--- a/cinder/openstack/common/scheduler/filters/extra_specs_ops.py
+++ b/cinder/openstack/common/scheduler/filters/extra_specs_ops.py
@@ -15,7 +15,7 @@
 
 import operator
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 
 # 1. The following operations are supported:
 #   =, s==, s!=, s>=, s>, s<=, s<, <in>, <is>, <or>, ==, !=, >=, <=

diff --git a/cinder/openstack/common/scheduler/filters/json_filter.py b/cinder/openstack/common/scheduler/filters/json_filter.py
index 25402c76cd5b2121a008fe562bf7c7b10e6f52ca..74d4443e1e97b5e11cb94f9ebaa2e8f7557da8e7 100644 (file)
--- a/cinder/openstack/common/scheduler/filters/json_filter.py
+++ b/cinder/openstack/common/scheduler/filters/json_filter.py
@@ -15,7 +15,7 @@
 
 import operator
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 
 from cinder.openstack.common.scheduler import filters