Switch to oslo.serialization

Very simple import change in each file, just touches a whole
lot of files. jsonutils has graduated into a standalone library
and has been removed from the oslo-incubator repository.
We should be using the library for all projects.
This commit doesn't change files synced from oslo-incubator, and
doesn't remove the 'module=jsonutils' in openstack-common.conf.
Another sync commit will cover that.

Change-Id: I56ea380a85e8a3c1b42b2425430fc28409937365

diff --git a/cinder/api/middleware/auth.py b/cinder/api/middleware/auth.py
index 74d3afbbfcd520c530aaa25980e68507d6b71d93..cf898c9b07d780e57e877272a930772dd33360d5 100644 (file)
--- a/cinder/api/middleware/auth.py
+++ b/cinder/api/middleware/auth.py
@@ -21,13 +21,13 @@ Common Auth Middleware.
 import os
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob.dec
 import webob.exc
 
 from cinder.api.openstack import wsgi
 from cinder import context
 from cinder.i18n import _
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.middleware import request_id
 from cinder import wsgi as base_wsgi

diff --git a/cinder/api/openstack/wsgi.py b/cinder/api/openstack/wsgi.py
index ff744f67d644e4049954e68818b96cd3c6ca3710..46762d273bb9d5d91436860d9960766336cf7741 100644 (file)
--- a/cinder/api/openstack/wsgi.py
+++ b/cinder/api/openstack/wsgi.py
@@ -21,13 +21,13 @@ from xml.dom import minidom
 from xml.parsers import expat
 
 from lxml import etree
+from oslo.serialization import jsonutils
 import six
 import webob
 
 from cinder import exception
 from cinder import i18n
 from cinder.i18n import _, _LI
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder import wsgi

diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py
index cf9be30adf92e9bd5f43cd26a23079da881e352c..de45e99aac7418937a9f4198f0e3b2f2665eedc9 100644 (file)
--- a/cinder/api/v1/limits.py
+++ b/cinder/api/v1/limits.py
@@ -24,6 +24,7 @@ import math
 import re
 import time
 
+from oslo.serialization import jsonutils
 import webob.dec
 import webob.exc
 
@@ -32,7 +33,6 @@ from cinder.api.views import limits as limits_views
 from cinder.api import xmlutil
 from cinder.i18n import _
 from cinder.openstack.common import importutils
-from cinder.openstack.common import jsonutils
 from cinder import quota
 from cinder import wsgi as base_wsgi
 

diff --git a/cinder/api/v2/limits.py b/cinder/api/v2/limits.py
index b285b08b5128b91a9999434328a686233b92b782..5fba22076c9c84a1e066737c613448d6d6bdd288 100644 (file)
--- a/cinder/api/v2/limits.py
+++ b/cinder/api/v2/limits.py
@@ -24,6 +24,7 @@ import math
 import re
 import time
 
+from oslo.serialization import jsonutils
 import webob.dec
 import webob.exc
 
@@ -32,7 +33,6 @@ from cinder.api.views import limits as limits_views
 from cinder.api import xmlutil
 from cinder.i18n import _
 from cinder.openstack.common import importutils
-from cinder.openstack.common import jsonutils
 from cinder import quota
 from cinder import wsgi as base_wsgi
 

diff --git a/cinder/backup/driver.py b/cinder/backup/driver.py
index f844e0ad3f698b2f3f2719d0df61be0990a2b5c3..c235c52b8c574442e1e835e201a8a5dba3b1e893 100644 (file)
--- a/cinder/backup/driver.py
+++ b/cinder/backup/driver.py
@@ -18,12 +18,12 @@
 import abc
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import six
 
 from cinder.db import base
 from cinder import exception
 from cinder.i18n import _, _LI
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 
 service_opts = [

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index 19876ed197d4c817c8b1b77542bdf2414d2a6c71..60f9fe09d5e56db46c31fedf3750707ef80a1f1f 100644 (file)
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -28,11 +28,11 @@ import time
 
 import glanceclient.exc
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 

diff --git a/cinder/rpc.py b/cinder/rpc.py
index 67d3b3d2c4831bdc3dd1ad719a383c8fdb4481e0..f07cf054562621425e5453a829a79f71c735441a 100644 (file)
--- a/cinder/rpc.py
+++ b/cinder/rpc.py
@@ -28,11 +28,11 @@ __all__ = [
 
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 from osprofiler import profiler
 
 import cinder.context
 import cinder.exception
-from cinder.openstack.common import jsonutils
 
 CONF = cfg.CONF
 TRANSPORT = None

diff --git a/cinder/scheduler/rpcapi.py b/cinder/scheduler/rpcapi.py
index f6cab644b569c47e1aafb566aac4e3b3fac480d7..53fadad84211d5cac954734fdac7a52b1174b5a5 100644 (file)
--- a/cinder/scheduler/rpcapi.py
+++ b/cinder/scheduler/rpcapi.py
@@ -18,8 +18,8 @@ Client side of the scheduler manager RPC API.
 
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 
-from cinder.openstack.common 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 64963f9e31fd8a6bb9742897936e74c6c74722d1..e9da48fde62cb42a4173a7020f63c588db3b8e6a 100644 (file)
--- a/cinder/tests/api/contrib/test_admin_actions.py
+++ b/cinder/tests/api/contrib/test_admin_actions.py
@@ -14,6 +14,7 @@ import ast
 import tempfile
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 from webob import exc
 
@@ -22,7 +23,6 @@ from cinder.brick.local_dev import lvm as brick_lvm
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import timeutils
 from cinder import test
 from cinder.tests.api import fakes

diff --git a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py b/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
index 88a47e17c5e46ed0448c6957e347c9001798b2c5..4007695ce70f89e0dc02b6b8857cd48905d3da87 100644 (file)
--- a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
+++ b/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
@@ -15,10 +15,10 @@
 
 
 from lxml import etree
+from oslo.serialization import jsonutils
 import webob
 
 from cinder.api.contrib import extended_snapshot_attributes
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 from cinder import volume

diff --git a/cinder/tests/api/contrib/test_scheduler_hints.py b/cinder/tests/api/contrib/test_scheduler_hints.py
index ae5c17abc275a095c95e38b833d6aee4ebc5c5b2..42a6115758a6a451f53374c35586af2faecbc506 100644 (file)
--- a/cinder/tests/api/contrib/test_scheduler_hints.py
+++ b/cinder/tests/api/contrib/test_scheduler_hints.py
@@ -15,9 +15,10 @@
 
 import datetime
 
+from oslo.serialization import jsonutils
+
 import cinder
 from cinder.api.openstack import wsgi
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 from cinder.tests.api.v2 import stubs

diff --git a/cinder/tests/api/contrib/test_snapshot_actions.py b/cinder/tests/api/contrib/test_snapshot_actions.py
index 37b4d1971c2befda833946b28c4a9275d5a77016..b35d9af471239f93aae238c75d0ea89e1df73efa 100644 (file)
--- a/cinder/tests/api/contrib/test_snapshot_actions.py
+++ b/cinder/tests/api/contrib/test_snapshot_actions.py
@@ -12,10 +12,10 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from oslo.serialization import jsonutils
 import webob
 
 from cinder import db
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 from cinder.tests.api.v2 import stubs

diff --git a/cinder/tests/api/contrib/test_volume_actions.py b/cinder/tests/api/contrib/test_volume_actions.py
index 65c51c77f0befa507fafa4e6ad3e34e22b1a26da..a8c0cecd986e8ea968721a92bd4df226b8f5b721 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_actions.py
+++ b/cinder/tests/api/contrib/test_volume_actions.py
@@ -19,12 +19,12 @@ import uuid
 import mock
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 import webob
 
 from cinder.api.contrib import volume_actions
 from cinder import exception
 from cinder.image.glance import GlanceImageService
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 from cinder.tests.api.v2 import stubs

diff --git a/cinder/tests/api/contrib/test_volume_manage.py b/cinder/tests/api/contrib/test_volume_manage.py
index 82bad3c109e5daa55101633cbf441f9831c5e778..54e312c7f471247389a2c70ccd824078d66a3e2c 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_manage.py
+++ b/cinder/tests/api/contrib/test_volume_manage.py
@@ -13,11 +13,11 @@
 #   under the License.
 
 import mock
+from oslo.serialization import jsonutils
 import webob
 
 from cinder import context
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 

diff --git a/cinder/tests/api/contrib/test_volume_unmanage.py b/cinder/tests/api/contrib/test_volume_unmanage.py
index 6538cbb153a44b09eef1bd51010898ca3634602c..c80c00d48af0320af4412abe02018f795f6608ee 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_unmanage.py
+++ b/cinder/tests/api/contrib/test_volume_unmanage.py
@@ -13,11 +13,11 @@
 #   under the License.
 
 import mock
+from oslo.serialization import jsonutils
 import webob
 
 from cinder import context
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 

diff --git a/cinder/tests/api/middleware/test_faults.py b/cinder/tests/api/middleware/test_faults.py
index 4464cb949440ed3a96f068a0311250dbe5331e28..af7a7fd50eb55c24136dcd9c863f6b13a7787425 100644 (file)
--- a/cinder/tests/api/middleware/test_faults.py
+++ b/cinder/tests/api/middleware/test_faults.py
@@ -18,6 +18,7 @@ from xml.dom import minidom
 
 import mock
 from oslo.i18n import _lazy
+from oslo.serialization import jsonutils
 import webob.dec
 import webob.exc
 
@@ -26,7 +27,6 @@ from cinder.api.openstack import wsgi
 from cinder import exception
 from cinder import i18n as cinder_i18n
 from cinder.i18n import _
-from cinder.openstack.common import jsonutils
 from cinder import test
 
 

diff --git a/cinder/tests/api/test_extensions.py b/cinder/tests/api/test_extensions.py
index 22a9e22150202962903f6ca0aade23b231310a22..a875c8541f32be2c732e54ebd2b2308d9c883451 100644 (file)
--- a/cinder/tests/api/test_extensions.py
+++ b/cinder/tests/api/test_extensions.py
@@ -17,12 +17,12 @@
 import iso8601
 from lxml import etree
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from cinder.api import extensions
 from cinder.api.v1 import router
 from cinder.api import xmlutil
-from cinder.openstack.common import jsonutils
 from cinder import test
 
 

diff --git a/cinder/tests/api/v1/test_limits.py b/cinder/tests/api/v1/test_limits.py
index 935a1c3944ecc1e98a1c700fb949f2743725b56a..4ab32200ec48db7deccd0f26051270ab2e6b5910 100644 (file)
--- a/cinder/tests/api/v1/test_limits.py
+++ b/cinder/tests/api/v1/test_limits.py
@@ -21,6 +21,7 @@ import httplib
 from xml.dom import minidom
 
 from lxml import etree
+from oslo.serialization import jsonutils
 import six
 import webob
 
@@ -28,7 +29,6 @@ from cinder.api.v1 import limits
 from cinder.api import views
 from cinder.api import xmlutil
 import cinder.context
-from cinder.openstack.common import jsonutils
 from cinder import test
 
 

diff --git a/cinder/tests/api/v1/test_snapshot_metadata.py b/cinder/tests/api/v1/test_snapshot_metadata.py
index 7f254a16f6a377993f7c691956091822f90f1109..01c4321aee4722c75469cd1811825f0afd7d04c7 100644 (file)
--- a/cinder/tests/api/v1/test_snapshot_metadata.py
+++ b/cinder/tests/api/v1/test_snapshot_metadata.py
@@ -16,6 +16,7 @@
 import uuid
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from cinder.api import extensions
@@ -23,7 +24,6 @@ from cinder.api.v1 import snapshot_metadata
 from cinder.api.v1 import snapshots
 import cinder.db
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 

diff --git a/cinder/tests/api/v1/test_volume_metadata.py b/cinder/tests/api/v1/test_volume_metadata.py
index e6fe56fd57c32df49d881282593ef596bf6e6b80..0b1188f025e5a169e87122b33f30b070de5e1a52 100644 (file)
--- a/cinder/tests/api/v1/test_volume_metadata.py
+++ b/cinder/tests/api/v1/test_volume_metadata.py
@@ -16,6 +16,7 @@
 import uuid
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from cinder.api import extensions
@@ -23,7 +24,6 @@ from cinder.api.v1 import volume_metadata
 from cinder.api.v1 import volumes
 import cinder.db
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 from cinder.tests.api.v1 import stubs

diff --git a/cinder/tests/api/v2/test_limits.py b/cinder/tests/api/v2/test_limits.py
index 5d377728030aef8b851d3e44cf0e2b599671e39f..638b700cc17fffa8680db5ce4b0ab0ccdd8e2e3f 100644 (file)
--- a/cinder/tests/api/v2/test_limits.py
+++ b/cinder/tests/api/v2/test_limits.py
@@ -21,6 +21,7 @@ import httplib
 from xml.dom import minidom
 
 from lxml import etree
+from oslo.serialization import jsonutils
 import six
 import webob
 
@@ -28,7 +29,6 @@ from cinder.api.v2 import limits
 from cinder.api import views
 from cinder.api import xmlutil
 import cinder.context
-from cinder.openstack.common import jsonutils
 from cinder import test
 
 

diff --git a/cinder/tests/api/v2/test_snapshot_metadata.py b/cinder/tests/api/v2/test_snapshot_metadata.py
index e27b25d88136312265c04fce669793b5d6e7b91e..28aa3eda63725e9275f9e3da166037fdec56632c 100644 (file)
--- a/cinder/tests/api/v2/test_snapshot_metadata.py
+++ b/cinder/tests/api/v2/test_snapshot_metadata.py
@@ -16,6 +16,7 @@
 import uuid
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from cinder.api import extensions
@@ -23,7 +24,6 @@ from cinder.api.v2 import snapshot_metadata
 from cinder.api.v2 import snapshots
 import cinder.db
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 

diff --git a/cinder/tests/api/v2/test_volume_metadata.py b/cinder/tests/api/v2/test_volume_metadata.py
index a5a999041d3b78039b10af99a473b53ecc8c577f..6e90c4495ab2c637e1eeaf48539c23c0d41706df 100644 (file)
--- a/cinder/tests/api/v2/test_volume_metadata.py
+++ b/cinder/tests/api/v2/test_volume_metadata.py
@@ -16,6 +16,7 @@
 import uuid
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from cinder.api import extensions
@@ -23,7 +24,6 @@ from cinder.api.v2 import volume_metadata
 from cinder.api.v2 import volumes
 from cinder import db
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes
 from cinder.tests.api.v2 import stubs

diff --git a/cinder/tests/integrated/api/client.py b/cinder/tests/integrated/api/client.py
index b8d5970180fcbf3997fefc26b3d74876afc9e699..795b933d28b908e96c03b5fa6e8199fe75cf2309 100644 (file)
--- a/cinder/tests/integrated/api/client.py
+++ b/cinder/tests/integrated/api/client.py
@@ -13,11 +13,11 @@
 #    under the License.
 
 import netaddr
+from oslo.serialization import jsonutils
 import requests
 import six.moves.urllib.parse as urlparse
 
 from cinder.i18n import _
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 
 

diff --git a/cinder/tests/scheduler/test_host_filters.py b/cinder/tests/scheduler/test_host_filters.py
index d93cc7ec44624c52b9fe9205a2e83e48a8b6b7f6..9736e093ecb7f80603a2128eb2e560700582c74f 100644 (file)
--- a/cinder/tests/scheduler/test_host_filters.py
+++ b/cinder/tests/scheduler/test_host_filters.py
@@ -16,10 +16,10 @@ Tests For Scheduler Host Filters.
 """
 
 import mock
+from oslo.serialization import jsonutils
 
 from cinder import context
 from cinder import db
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common.scheduler import filters
 from cinder import test
 from cinder.tests.scheduler import fakes

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

diff --git a/cinder/tests/test_backup_ceph.py b/cinder/tests/test_backup_ceph.py
index 75fc6cc1179392fc03e6192e659693f6e106476a..b161cc142156d18fa2c88e3e053fc16ba498a23e 100644 (file)
--- a/cinder/tests/test_backup_ceph.py
+++ b/cinder/tests/test_backup_ceph.py
@@ -21,6 +21,7 @@ import tempfile
 import uuid
 
 import mock
+from oslo.serialization import jsonutils
 import six
 
 from cinder.backup import driver
@@ -29,7 +30,6 @@ from cinder import context
 from cinder import db
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import test

diff --git a/cinder/tests/test_backup_driver_base.py b/cinder/tests/test_backup_driver_base.py
index 1fbb6797a58799897910bc9e056042ef6c79cb09..67a2d8f0dbbef5a9385d0c88d771e4b7b2aca668 100644 (file)
--- a/cinder/tests/test_backup_driver_base.py
+++ b/cinder/tests/test_backup_driver_base.py
@@ -17,12 +17,12 @@
 import uuid
 
 import mock
+from oslo.serialization import jsonutils
 
 from cinder.backup import driver
 from cinder import context
 from cinder import db
 from cinder import exception
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.backup import fake_service
 

diff --git a/cinder/tests/test_coraid.py b/cinder/tests/test_coraid.py
index 38eeb7ef545467b8d4d973a076f841b7fd785703..bc528e1c9869f8fcea645e9d913ea7342042da8e 100644 (file)
--- a/cinder/tests/test_coraid.py
+++ b/cinder/tests/test_coraid.py
@@ -19,11 +19,11 @@ import math
 import mock
 import mox
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 
 from cinder.brick.initiator import connector
 from cinder import exception
 from cinder.image import image_utils
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units
 from cinder import test

diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py
index 4eaf8d47c1456d45566e32a140bdc5e3b4054591..32628dbb61c273b201ac327df76de304db4aa601 100644 (file)
--- a/cinder/tests/test_volume.py
+++ b/cinder/tests/test_volume.py
@@ -30,6 +30,7 @@ import eventlet
 import mock
 import mox
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 from stevedore import extension
 from taskflow.engines.action_engine import engine
 
@@ -43,7 +44,6 @@ from cinder.image import image_utils
 from cinder import keymgr
 from cinder.openstack.common import fileutils
 from cinder.openstack.common import importutils
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder.openstack.common import units

diff --git a/cinder/tests/test_volume_rpcapi.py b/cinder/tests/test_volume_rpcapi.py
index 82fe6396d275cc5980dbbd46ef47808aaf1caba3..a94ee5bcb6de904a5c50a386a757088a97a62b3f 100644 (file)
--- a/cinder/tests/test_volume_rpcapi.py
+++ b/cinder/tests/test_volume_rpcapi.py
@@ -18,10 +18,10 @@ Unit Tests for cinder.volume.rpcapi
 import copy
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 
 from cinder import context
 from cinder import db
-from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.volume import rpcapi as volume_rpcapi
 

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index caee1003f7878306eec60080329b53ba548cb1cf..4bafa7a1507e859735df8bd9857c8791040b6483 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/cinder/volume/drivers/coraid.py
@@ -27,11 +27,11 @@ import urllib
 import urllib2
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import six.moves.urllib.parse as urlparse
 
 from cinder import exception
 from cinder.i18n import _
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import units

diff --git a/cinder/volume/drivers/emc/emc_vnx_cli.py b/cinder/volume/drivers/emc/emc_vnx_cli.py
index 903d2161a5c602577eca48ebbbad87f4697e6dd4..41fa66b49d7d7b335ffa3a0e53e6c1b061bb3f4f 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vnx_cli.py
+++ b/cinder/volume/drivers/emc/emc_vnx_cli.py
@@ -22,13 +22,13 @@ import re
 import time
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils as json
 import six
 
 from cinder import exception
 from cinder.exception import EMCVnxCLICmdError
 from cinder.i18n import _
 from cinder.openstack.common import excutils
-from cinder.openstack.common import jsonutils as json
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall

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

diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 05c18fe0ed146676e79e9183dbc85847135ba18e..def590c457932c78241c67009ddeb85c1470fe98 100644 (file)
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -41,6 +41,7 @@ import time
 
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 from osprofiler import profiler
 
 from cinder import compute
@@ -52,7 +53,6 @@ from cinder.image import glance
 from cinder import manager
 from cinder.openstack.common import excutils
 from cinder.openstack.common import importutils
-from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import periodic_task
 from cinder.openstack.common import timeutils

diff --git a/cinder/volume/rpcapi.py b/cinder/volume/rpcapi.py
index a48c5f07525227e8a9c6d9ee65dae29381a36711..544fc2a54f38d5bb438172020c69dcb01d8c5fa1 100644 (file)
--- a/cinder/volume/rpcapi.py
+++ b/cinder/volume/rpcapi.py
@@ -18,8 +18,8 @@ Client side of the volume RPC API.
 
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 
-from cinder.openstack.common import jsonutils
 from cinder import rpc
 from cinder.volume import utils
 

diff --git a/requirements.txt b/requirements.txt
index eb6b6e65ac97e5797814f193abcc215aa5d06993..9507c57a484f58ea605061264a1c24dee7f4255d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,6 +17,7 @@ oslo.config>=1.4.0  # Apache-2.0
 oslo.db>=1.0.0  # Apache-2.0
 oslo.messaging>=1.4.0
 oslo.rootwrap>=1.3.0
+oslo.serialization>=1.0.0               # Apache-2.0
 osprofiler>=0.3.0                       # Apache-2.0
 paramiko>=1.13.0
 Paste