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

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

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

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
 

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
 

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 = [

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
 

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

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
 
 

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

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

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

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

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

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
 

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
 

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
 
 

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
 
 

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
 
 

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
 

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

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
 
 

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
 

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

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
 
 

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

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
 

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

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
 

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

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

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
 

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

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

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
 

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

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
 

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