Move oslo.serialization to oslo_serialization namespace

This is the fifth in a series of changes to move to using
the new oslo_<library> namespace that is being used for
oslo libraries.

There is currently a shim in place that is allowing the old
oslo.<library> imports to work, but we need to be prepared for
when the shims go away.  Thus, we need patches like this one to
move to the new namespace.

This patch also updates our hacking check to ensure that no instances
of oslo.utils sneak back in.

Change-Id: Ida0f9512a816d45ec5cae4dc4da4dbc923a67cf4
Partial-bug: 1409733

diff --git a/cinder/api/middleware/auth.py b/cinder/api/middleware/auth.py
index 5d4546bafaacb0562d7ddede4000d5716abfe980..7fee956b1e7c8d7a22f763a31aaafc762f2cd808 100644 (file)
--- a/cinder/api/middleware/auth.py
+++ b/cinder/api/middleware/auth.py
@@ -20,8 +20,8 @@ Common Auth Middleware.
 
 import os
 
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob.dec
 import webob.exc
 

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index 6b3a1ee2f38e4aaf7e8e68369807f1254044bedd..703f7124339cb3f950b2c561ea32cb095b16a313 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -21,7 +21,7 @@ from xml.dom import minidom
 from xml.parsers import expat
 
 from lxml import etree
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import excutils
 import six
 import webob

diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py
index 7793b20ac780cd6dea470497cd1a764ebcf4199b..f521d9055334dfb753c36589dfac8a45249f4552 100644 (file)
--- a/cinder/api/v1/limits.py
+++ b/cinder/api/v1/limits.py
@@ -24,7 +24,7 @@ import math
 import re
 import time
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 import webob.dec
 import webob.exc

diff --git a/cinder/api/v2/limits.py b/cinder/api/v2/limits.py
index 6df83b98302414558905edfad539ce6c36e60b33..abad4b9e4f147e4198df1c1b4002e80c4d20921b 100644 (file)
--- a/cinder/api/v2/limits.py
+++ b/cinder/api/v2/limits.py
@@ -24,7 +24,7 @@ import math
 import re
 import time
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 import webob.dec
 import webob.exc

diff --git a/cinder/backup/driver.py b/cinder/backup/driver.py
index bd4bcdac175b3b9c66be55790d25a0cc76ad97c5..0f20a1275f7edfea00b8f02d001c9f55214c02ef 100644 (file)
--- a/cinder/backup/driver.py
+++ b/cinder/backup/driver.py
@@ -17,8 +17,8 @@
 
 import abc
 
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import six
 
 from cinder.db import base

diff --git a/cinder/hacking/checks.py b/cinder/hacking/checks.py
index b7965ec5b776e9df6d90d4cfe81b5b5d63ed4ef6..231d65999f91949c59f226d718ec0f82df68e78c 100644 (file)
--- a/cinder/hacking/checks.py
+++ b/cinder/hacking/checks.py
@@ -44,7 +44,7 @@ no_audit_log = re.compile(r"(.)*LOG\.audit(.)*")
 # NOTE(jsbryant): When other oslo libraries switch over non-namespaced
 # imports, we will need to add them to the regex below.
 oslo_namespace_imports = re.compile(r"from[\s]*oslo[.](concurrency|db"
-                                    "|config|utils)")
+                                    "|config|utils|serialization)")
 
 
 def no_vi_headers(physical_line, line_number, lines):

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index 1f85429f3bec5e7e79e1d8f12227d39989c561b2..ef76aeb0ac35f6146264c049bd04c0d184b1d327 100644 (file)
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -27,8 +27,8 @@ import sys
 import time
 
 import glanceclient.exc
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import six.moves.urllib.parse as urlparse
 

diff --git a/cinder/rpc.py b/cinder/rpc.py
index 49491db3a2787b2b9d81b0a754efae35b0566585..432741a321fa4bbb66fe4dfc44b943b0ad1d7d0a 100644 (file)
--- a/cinder/rpc.py
+++ b/cinder/rpc.py
@@ -27,8 +27,8 @@ __all__ = [
 ]
 
 from oslo import messaging
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 from osprofiler import profiler
 
 import cinder.context

diff --git a/cinder/scheduler/rpcapi.py b/cinder/scheduler/rpcapi.py
index 189333e818d6e5874ecf96f353bac3d71abefda0..2e5a1a1771f8dafef6bb549e3469122e900c2fe7 100644 (file)
--- a/cinder/scheduler/rpcapi.py
+++ b/cinder/scheduler/rpcapi.py
@@ -17,8 +17,8 @@ Client side of the scheduler manager RPC API.
 """
 
 from oslo import messaging
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 
 from cinder import rpc
 

diff --git a/cinder/tests/api/contrib/test_admin_actions.py b/cinder/tests/api/contrib/test_admin_actions.py
index a037bcc4a4bdc83f954cb89b011b8e670510a4bd..82cbb723171cabfa2ea975d394e6e7e12b51b943 100644 (file)
--- a/cinder/tests/api/contrib/test_admin_actions.py
+++ b/cinder/tests/api/contrib/test_admin_actions.py
@@ -13,10 +13,10 @@
 import ast
 
 import fixtures
-from oslo.serialization import jsonutils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
+from oslo_serialization import jsonutils
 from oslo_utils import timeutils
 import webob
 from webob import exc

diff --git a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py b/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
index 4007695ce70f89e0dc02b6b8857cd48905d3da87..c1e6496edaf37625fd90b9d4fd9c0251a276e699 100644 (file)
--- a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
+++ b/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
@@ -15,7 +15,7 @@
 
 
 from lxml import etree
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import webob
 
 from cinder.api.contrib import extended_snapshot_attributes

diff --git a/cinder/tests/api/contrib/test_scheduler_hints.py b/cinder/tests/api/contrib/test_scheduler_hints.py
index 42a6115758a6a451f53374c35586af2faecbc506..1098ee207d5de86cb8bd4cceb24598bd1ac5f035 100644 (file)
--- a/cinder/tests/api/contrib/test_scheduler_hints.py
+++ b/cinder/tests/api/contrib/test_scheduler_hints.py
@@ -15,7 +15,7 @@
 
 import datetime
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 import cinder
 from cinder.api.openstack import wsgi

diff --git a/cinder/tests/api/contrib/test_snapshot_actions.py b/cinder/tests/api/contrib/test_snapshot_actions.py
index b35d9af471239f93aae238c75d0ea89e1df73efa..f955428ac0d253440703bd749e3fbd584b4f6556 100644 (file)
--- a/cinder/tests/api/contrib/test_snapshot_actions.py
+++ b/cinder/tests/api/contrib/test_snapshot_actions.py
@@ -12,7 +12,7 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import webob
 
 from cinder import db

diff --git a/cinder/tests/api/contrib/test_volume_actions.py b/cinder/tests/api/contrib/test_volume_actions.py
index 8b57043b5ac2c0fd38784f8f9c8fd1c6cacc36c6..15845f6fe3f6427b474e85841aa248f76c069141 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_actions.py
+++ b/cinder/tests/api/contrib/test_volume_actions.py
@@ -18,8 +18,8 @@ import uuid
 
 import mock
 from oslo import messaging
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob
 
 from cinder.api.contrib import volume_actions

diff --git a/cinder/tests/api/contrib/test_volume_manage.py b/cinder/tests/api/contrib/test_volume_manage.py
index 54e312c7f471247389a2c70ccd824078d66a3e2c..9363e26476768783d6f379313d8a287a05e09655 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_manage.py
+++ b/cinder/tests/api/contrib/test_volume_manage.py
@@ -13,7 +13,7 @@
 #   under the License.
 
 import mock
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import webob
 
 from cinder import context

diff --git a/cinder/tests/api/contrib/test_volume_unmanage.py b/cinder/tests/api/contrib/test_volume_unmanage.py
index 88c1d8698c9a0f4fb3a85f4d8fe54977c09e57a3..2939a61b8a2a06e556372523cd6aef6e762b4b4c 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_unmanage.py
+++ b/cinder/tests/api/contrib/test_volume_unmanage.py
@@ -13,7 +13,7 @@
 #   under the License.
 
 import mock
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import webob
 
 from cinder import context

diff --git a/cinder/tests/api/middleware/test_faults.py b/cinder/tests/api/middleware/test_faults.py
index e8f2425c201161f10db54fcc9e5061e248dc4acd..684f7c1094756b0f894d8c6b7c71f4cda505a580 100644 (file)
--- a/cinder/tests/api/middleware/test_faults.py
+++ b/cinder/tests/api/middleware/test_faults.py
@@ -16,8 +16,8 @@
 from xml.dom import minidom
 
 import mock
-from oslo.serialization import jsonutils
 from oslo_i18n import fixture as i18n_fixture
+from oslo_serialization import jsonutils
 import webob.dec
 
 from cinder.api import common

diff --git a/cinder/tests/api/test_extensions.py b/cinder/tests/api/test_extensions.py
index a7acdff45cf7f070ac6ba7e90d331c865cbfcc45..374021ba09dab645b5630244695f282a8fd7f874 100644 (file)
--- a/cinder/tests/api/test_extensions.py
+++ b/cinder/tests/api/test_extensions.py
@@ -16,8 +16,8 @@
 
 import iso8601
 from lxml import etree
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/tests/api/v1/test_limits.py b/cinder/tests/api/v1/test_limits.py
index 4ab32200ec48db7deccd0f26051270ab2e6b5910..92db5852197ed9ea0ab0d3dc5cbfae0f1e75069d 100644 (file)
--- a/cinder/tests/api/v1/test_limits.py
+++ b/cinder/tests/api/v1/test_limits.py
@@ -21,7 +21,7 @@ import httplib
 from xml.dom import minidom
 
 from lxml import etree
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import webob
 

diff --git a/cinder/tests/api/v1/test_snapshot_metadata.py b/cinder/tests/api/v1/test_snapshot_metadata.py
index c80ca3b8327adedbb457f7ef6ae5a0f603cd14a5..89d1faf82601f767869f476133b169922402159d 100644 (file)
--- a/cinder/tests/api/v1/test_snapshot_metadata.py
+++ b/cinder/tests/api/v1/test_snapshot_metadata.py
@@ -15,8 +15,8 @@
 
 import uuid
 
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/tests/api/v1/test_volume_metadata.py b/cinder/tests/api/v1/test_volume_metadata.py
index e0be0ca834e29b1a7fd446dc8041dd3d1df03157..5cb270c40805fa16dd66388b1849d573c4026640 100644 (file)
--- a/cinder/tests/api/v1/test_volume_metadata.py
+++ b/cinder/tests/api/v1/test_volume_metadata.py
@@ -15,8 +15,8 @@
 
 import uuid
 
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/tests/api/v2/test_limits.py b/cinder/tests/api/v2/test_limits.py
index 638b700cc17fffa8680db5ce4b0ab0ccdd8e2e3f..459bce894edb05063e7ede1651f63a92d12e2780 100644 (file)
--- a/cinder/tests/api/v2/test_limits.py
+++ b/cinder/tests/api/v2/test_limits.py
@@ -21,7 +21,7 @@ import httplib
 from xml.dom import minidom
 
 from lxml import etree
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 import webob
 

diff --git a/cinder/tests/api/v2/test_snapshot_metadata.py b/cinder/tests/api/v2/test_snapshot_metadata.py
index e7e4a3aaed82ea9322e6fce3b51be711e98e1a25..2fd62ca3707762107cab57ec913bd9bef01fb01f 100644 (file)
--- a/cinder/tests/api/v2/test_snapshot_metadata.py
+++ b/cinder/tests/api/v2/test_snapshot_metadata.py
@@ -15,8 +15,8 @@
 
 import uuid
 
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/tests/api/v2/test_volume_metadata.py b/cinder/tests/api/v2/test_volume_metadata.py
index a3ed0155144f989e08aa20dad330c94d44948db1..ffc745df88b9158a328d4f76132dfbe5cb463f89 100644 (file)
--- a/cinder/tests/api/v2/test_volume_metadata.py
+++ b/cinder/tests/api/v2/test_volume_metadata.py
@@ -15,8 +15,8 @@
 
 import uuid
 
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index 95e4196777a3259a105f8a85b7ce17f9ef94c2df..73acf9c104a2f3f84633e5b2436bac136944ccbe 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/cinder/tests/integrated/api/client.py
@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from oslo_utils import netutils
 import requests
 import six.moves.urllib.parse as urlparse

diff --git a/cinder/tests/scheduler/test_host_filters.py b/cinder/tests/scheduler/test_host_filters.py
index 172b872474ddb27fe2dd0ef0b876147ced3fdfb7..bb4d96692c11406c701140128031a0503141f037 100644 (file)
--- a/cinder/tests/scheduler/test_host_filters.py
+++ b/cinder/tests/scheduler/test_host_filters.py
@@ -16,7 +16,7 @@ Tests For Scheduler Host Filters.
 """
 
 import mock
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from requests import exceptions as request_exceptions
 
 from cinder.compute import nova

diff --git a/cinder/tests/scheduler/test_scheduler_options.py b/cinder/tests/scheduler/test_scheduler_options.py
index bd9bd052a7b19146457508bf42046138a006c4fa..ec758840e372ef0ec2d48329871a724e67555ac6 100644 (file)
--- a/cinder/tests/scheduler/test_scheduler_options.py
+++ b/cinder/tests/scheduler/test_scheduler_options.py
@@ -18,7 +18,7 @@ Tests For PickledScheduler.
 
 import datetime
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import six
 
 from cinder.scheduler import scheduler_options

diff --git a/cinder/tests/test_backup_ceph.py b/cinder/tests/test_backup_ceph.py
index 4dd5815c6bf5b7aa9c610eb56e677f7f8c09050f..2e6ea938ae1a29f2f263f01cfcb629d95b0be70a 100644 (file)
--- a/cinder/tests/test_backup_ceph.py
+++ b/cinder/tests/test_backup_ceph.py
@@ -21,8 +21,8 @@ import tempfile
 import uuid
 
 import mock
-from oslo.serialization import jsonutils
 from oslo_concurrency import processutils
+from oslo_serialization import jsonutils
 import six
 
 from cinder.backup import driver

diff --git a/cinder/tests/test_backup_driver_base.py b/cinder/tests/test_backup_driver_base.py
index fd91e07389c1d5f22139b878812c4efc524377cb..ce23c32a7519621e02d5b1064ae0ac7838312de3 100644 (file)
--- a/cinder/tests/test_backup_driver_base.py
+++ b/cinder/tests/test_backup_driver_base.py
@@ -17,7 +17,7 @@
 import uuid
 
 import mock
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from cinder.backup import driver
 from cinder import context

diff --git a/cinder/tests/test_coraid.py b/cinder/tests/test_coraid.py
index a55a339f7fe057b3982e9420fa2f681950248aac..9bbc7ec415fe957b7e3a6c9450d7a5d547b265b2 100644 (file)
--- a/cinder/tests/test_coraid.py
+++ b/cinder/tests/test_coraid.py
@@ -18,8 +18,8 @@ import math
 
 import mock
 import mox
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 from oslo_utils import units
 
 from cinder.brick.initiator import connector

diff --git a/cinder/tests/test_hacking.py b/cinder/tests/test_hacking.py
index 5dfb27b2fa3c36c01cccee43d9fee88a6fc682c0..3dbb22e764b04dfdb206f83a79a0d213323ccaca 100644 (file)
--- a/cinder/tests/test_hacking.py
+++ b/cinder/tests/test_hacking.py
@@ -155,3 +155,7 @@ class HackingTestCase(test.TestCase):
             "from oslo.utils import foo"))))
         self.assertEqual(0, len(list(checks.check_oslo_namespace_imports(
             "from oslo_utils import bar"))))
+        self.assertEqual(1, len(list(checks.check_oslo_namespace_imports(
+            "from oslo.serialization import foo"))))
+        self.assertEqual(0, len(list(checks.check_oslo_namespace_imports(
+            "from oslo_serialization import bar"))))

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index da0dfd427a092c753b6f759454743ce6eed777f8..f5ea37e512fac8c298f0f347d4fc6f50d7be2992 100644 (file)
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -29,8 +29,8 @@ import tempfile
 import eventlet
 import mock
 import mox
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 from oslo_utils import importutils
 from oslo_utils import timeutils
 from oslo_utils import units

diff --git a/cinder/tests/test_volume_rpcapi.py b/cinder/tests/test_volume_rpcapi.py
index 33ba3c8ff4c31ca1d9975c8a87c5f4598c11d2c4..2fd17e51ad75232ffb5065ff0d94c2dd6e7fb7a5 100644 (file)
--- a/cinder/tests/test_volume_rpcapi.py
+++ b/cinder/tests/test_volume_rpcapi.py
@@ -17,8 +17,8 @@ Unit Tests for cinder.volume.rpcapi
 """
 import copy
 
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 
 from cinder import context
 from cinder import db

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index e0c4bca8c9fa58bbec9a370204a66e92d60e79ca..ea8c4fdf83d27cdf947002246c23e3fe77b1a4d9 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -26,9 +26,9 @@ import math
 import urllib
 import urllib2
 
-from oslo.serialization import jsonutils
 from oslo_concurrency import lockutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 from oslo_utils import units
 import six.moves.urllib.parse as urlparse
 

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index 4d72a3fa8aaad4f50fae35b3fd0f366fea8565c3..5389b99f7c2eb959218bf0070b8e180d83d4d08e 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@ -21,10 +21,10 @@ import random
 import re
 import time
 
-from oslo.serialization import jsonutils as json
 from oslo_concurrency import lockutils
 from oslo_concurrency import processutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils as json
 from oslo_utils import excutils
 from oslo_utils import timeutils
 import six

diff --git a/cinder/volume/drivers/nexenta/jsonrpc.py b/cinder/volume/drivers/nexenta/jsonrpc.py
index fc1152b583f1ee0032f2a177d3589fc38931a38e..8da7676625d29d78d300a0103a321cd8515e13d4 100644 (file)
--- a/cinder/volume/drivers/nexenta/jsonrpc.py
+++ b/cinder/volume/drivers/nexenta/jsonrpc.py
@@ -23,7 +23,7 @@
 
 import urllib2
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 from cinder.i18n import _, _LE, _LI
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 186b783c49617319e7c9f432f61f5e5f763de2b3..4c3c31b93fb3361b4a5d240e93d1f4ae3c08cf41 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -40,8 +40,8 @@ intact.
 import time
 
 from oslo import messaging
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import importutils
 from oslo_utils import timeutils

diff --git a/cinder/volume/rpcapi.py b/cinder/volume/rpcapi.py
index 99fe88208bb647a77b349289b3cd88a456d2c1b8..e82692992e93872e581b2f675c89b0cc7b1384b0 100644 (file)
--- a/cinder/volume/rpcapi.py
+++ b/cinder/volume/rpcapi.py
@@ -17,8 +17,8 @@ Client side of the volume RPC API.
 """
 
 from oslo import messaging
-from oslo.serialization import jsonutils
 from oslo_config import cfg
+from oslo_serialization import jsonutils
 
 from cinder import rpc
 from cinder.volume import utils