Use oslo.serialization

Replace usage of deprecated jsonutils module from oslo-incubator
and use oslo.serialization instead.

A followup-patch will sync with oslo-incubator and remove
the jsonutils module from manila.

Partial-Bug: #1382189

Change-Id: Iafa5090fd0c960ae8e996229ea3352f890decc6c

manila/api/middleware/auth.py

@@ -19,13 +19,13 @@ Common Auth Middleware.
 import os
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob.dec
 import webob.exc
 
 from manila.api.openstack import wsgi
 from manila import context
 from manila.i18n import _
-from manila.openstack.common import jsonutils
 from manila.openstack.common import log as logging
 from manila import wsgi as base_wsgi
 

manila/api/openstack/wsgi.py

@@ -15,13 +15,13 @@
 
 import inspect
 import math
+from oslo.serialization import jsonutils
 import six
 import time
 import webob
 
 from manila import exception
 from manila.i18n import _
-from manila.openstack.common import jsonutils
 from manila.openstack.common import log as logging
 from manila import utils
 from manila import wsgi

manila/api/v1/limits.py

@@ -24,6 +24,7 @@ import math
 import re
 import time
 
+from oslo.serialization import jsonutils
 from oslo.utils import importutils
 import webob.dec
 import webob.exc
@@ -32,7 +33,6 @@ from manila.api.openstack import wsgi
 from manila.api.views import limits as limits_views
 from manila.api import xmlutil
 from manila.i18n import _
-from manila.openstack.common import jsonutils
 from manila import quota
 from manila import wsgi as base_wsgi
 

manila/rpc.py

@@ -28,10 +28,10 @@ __all__ = [
 
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 
 import manila.context
 import manila.exception
-from manila.openstack.common import jsonutils
 
 CONF = cfg.CONF
 TRANSPORT = None

manila/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 manila.openstack.common import jsonutils
 from manila import rpc
 
 CONF = cfg.CONF

manila/scheduler/scheduler_options.py

@@ -24,10 +24,10 @@ import datetime
 import os
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 
 from manila.i18n import _
-from manila.openstack.common import jsonutils
 from manila.openstack.common import log as logging
 
 scheduler_json_config_location_opt = cfg.StrOpt(

manila/share/rpcapi.py

@@ -18,8 +18,8 @@ Client side of the share RPC API.
 
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 
-from manila.openstack.common import jsonutils
 from manila import rpc
 
 CONF = cfg.CONF

manila/tests/api/contrib/test_admin_actions.py

@@ -17,12 +17,12 @@ import shutil
 import tempfile
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from manila import context
 from manila import db
 from manila import exception
-from manila.openstack.common import jsonutils
 from manila.share import api as share_api
 from manila import test
 from manila.tests.api.contrib import stubs

manila/tests/api/middleware/test_faults.py

@@ -15,13 +15,13 @@
 
 from xml.dom import minidom
 
+from oslo.serialization import jsonutils
 import webob
 import webob.dec
 import webob.exc
 
 from manila.api import common
 from manila.api.openstack import wsgi
-from manila.openstack.common import jsonutils
 from manila import test
 
 

manila/tests/api/test_extensions.py

@@ -17,11 +17,11 @@
 import iso8601
 from lxml import etree
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from manila.api.v1 import router
 from manila.api import xmlutil
-from manila.openstack.common import jsonutils
 from manila import test
 
 CONF = cfg.CONF

manila/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 manila.api.v1 import limits
 from manila.api import views
 from manila.api import xmlutil
 import manila.context
-from manila.openstack.common import jsonutils
 from manila import test
 
 

manila/tests/api/v1/test_share_metadata.py

@@ -16,13 +16,13 @@
 import uuid
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 from manila.api.v1 import share_metadata
 from manila.api.v1 import shares
 import manila.db
 from manila import exception
-from manila.openstack.common import jsonutils
 from manila import test
 from manila.tests.api import fakes
 

manila/tests/integrated/api/client.py

@@ -15,8 +15,9 @@
 import httplib
 import urlparse
 
+from oslo.serialization import jsonutils
+
 from manila.i18n import _
-from manila.openstack.common import jsonutils
 from manila.openstack.common import log as logging
 
 

manila/tests/scheduler/test_host_filters.py

@@ -15,8 +15,9 @@
 Tests For Scheduler Host Filters.
 """
 
+from oslo.serialization import jsonutils
+
 from manila import context
-from manila.openstack.common import jsonutils
 from manila.openstack.common.scheduler import filters
 from manila import test
 from manila.tests.scheduler import fakes

manila/tests/scheduler/test_scheduler_options.py

@@ -18,9 +18,9 @@ Tests For PickledScheduler.
 
 import datetime
 
+from oslo.serialization import jsonutils
 import six
 
-from manila.openstack.common import jsonutils
 from manila.scheduler import scheduler_options
 from manila import test
 

manila/tests/share/test_rpcapi.py

@@ -19,11 +19,11 @@ Unit Tests for manila.share.rpcapi.
 import copy
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import six
 
 from manila import context
 from manila import db
-from manila.openstack.common import jsonutils
 from manila.share import rpcapi as share_rpcapi
 from manila import test
 

openstack-common.conf

@@ -9,6 +9,7 @@ module=excutils
 module=fileutils
 # TODO(jaegerandi) remove importutils with next sync of oslo-incubator
 module=importutils
+# TODO(jaegerandi) remove jsonutils with next sync of oslo-incubator
 module=jsonutils
 module=local
 module=lockutils

requirements.txt

@@ -20,6 +20,7 @@ oslo.db>=1.0.0  # Apache-2.0
 oslo.i18n>=1.0.0  # Apache-2.0
 oslo.messaging>=1.4.0
 oslo.rootwrap>=1.3.0
+oslo.serialization>=1.0.0               # Apache-2.0
 oslo.utils>=1.0.0                       # Apache-2.0
 paramiko>=1.13.0
 Paste