Merge "Use jsonutils from oslo.serialization"

32 files changed, 35 insertions, 33 deletions

diff --git a/keystone/auth/controllers.py b/keystone/auth/controllers.py
index 21e4c9bbd..87ebb7cc2 100644
--- a/keystone/auth/controllers.py
+++ b/keystone/auth/controllers.py
@@ -15,6 +15,7 @@
 import sys
 
 from keystoneclient.common import cms
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 
@@ -28,7 +29,6 @@ from keystone.contrib import federation
 from keystone import exception
 from keystone.i18n import _, _LI
 from keystone.openstack.common import importutils
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/auth/plugins/mapped.py b/keystone/auth/plugins/mapped.py
index 80aa664df..a42112f11 100644
--- a/keystone/auth/plugins/mapped.py
+++ b/keystone/auth/plugins/mapped.py
@@ -12,6 +12,7 @@
 
 import functools
 
+from oslo.serialization import jsonutils
 from pycadf import cadftaxonomy as taxonomy
 from six.moves.urllib import parse
 
@@ -21,7 +22,6 @@ from keystone.contrib import federation
 from keystone.contrib.federation import utils
 from keystone.models import token_model
 from keystone import notifications
-from keystone.openstack.common import jsonutils
 
 
 @dependency.requires('federation_api', 'identity_api', 'token_provider_api')
diff --git a/keystone/common/sql/core.py b/keystone/common/sql/core.py
index 872b701a8..6956c537b 100644
--- a/keystone/common/sql/core.py
+++ b/keystone/common/sql/core.py
@@ -26,6 +26,7 @@ from oslo.db import exception as db_exception
 from oslo.db import options as db_options
 from oslo.db.sqlalchemy import models
 from oslo.db.sqlalchemy import session as db_session
+from oslo.serialization import jsonutils
 import six
 import sqlalchemy as sql
 from sqlalchemy.ext import declarative
@@ -35,7 +36,6 @@ from sqlalchemy import types as sql_types
 from keystone.common import utils
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py b/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py
index 158bca65a..ca080d7cc 100644
--- a/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py
+++ b/keystone/common/sql/migrate_repo/versions/042_endpoint_enabled.py
@@ -28,12 +28,11 @@ column.
 
 """
 
+from oslo.serialization import jsonutils
 from oslo.utils import strutils
 import sqlalchemy as sql
 from sqlalchemy.orm import Session
 
-from keystone.openstack.common import jsonutils
-
 
 def _migrate_enabled_from_extra(migrate_engine, endpoint_table):
     """Remove `enabled` from `extra`, put it in the `enabled` column."""
diff --git a/keystone/common/sql/migrate_repo/versions/044_service_enabled.py b/keystone/common/sql/migrate_repo/versions/044_service_enabled.py
index fcb04c73e..1c63f562e 100644
--- a/keystone/common/sql/migrate_repo/versions/044_service_enabled.py
+++ b/keystone/common/sql/migrate_repo/versions/044_service_enabled.py
@@ -28,12 +28,11 @@ column.
 
 """
 
+from oslo.serialization import jsonutils
 from oslo.utils import strutils
 import sqlalchemy as sql
 from sqlalchemy.orm import sessionmaker
 
-from keystone.openstack.common import jsonutils
-
 
 def _migrate_enabled_from_extra(migrate_engine, service_table):
     """Remove `enabled` from `extra`, put it in the `enabled` column."""
diff --git a/keystone/common/sql/migration_helpers.py b/keystone/common/sql/migration_helpers.py
index ff9e7d2ce..606786031 100644
--- a/keystone/common/sql/migration_helpers.py
+++ b/keystone/common/sql/migration_helpers.py
@@ -20,6 +20,7 @@ import sys
 import migrate
 from migrate import exceptions
 from oslo.db.sqlalchemy import migration
+from oslo.serialization import jsonutils
 import six
 import sqlalchemy
 
@@ -30,7 +31,6 @@ from keystone import contrib
 from keystone import exception
 from keystone.i18n import _
 from keystone.openstack.common import importutils
-from keystone.openstack.common import jsonutils
 
 
 CONF = config.CONF
diff --git a/keystone/common/utils.py b/keystone/common/utils.py
index 08f9d8b21..11144e248 100644
--- a/keystone/common/utils.py
+++ b/keystone/common/utils.py
@@ -23,6 +23,7 @@ import hashlib
 import os
 import pwd
 
+from oslo.serialization import jsonutils
 from oslo.utils import strutils
 import passlib.hash
 import six
@@ -32,7 +33,6 @@ from keystone.common import config
 from keystone.common import environment
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py
index 7d1d06d1a..6ccd7e2a4 100644
--- a/keystone/common/wsgi.py
+++ b/keystone/common/wsgi.py
@@ -21,6 +21,7 @@
 import copy
 
 from oslo import i18n
+from oslo.serialization import jsonutils
 import routes.middleware
 import six
 import webob.dec
@@ -35,7 +36,6 @@ from keystone.i18n import _LI
 from keystone.i18n import _LW
 from keystone.models import token_model
 from keystone.openstack.common import importutils
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/contrib/ec2/controllers.py b/keystone/contrib/ec2/controllers.py
index eb3fd76d6..c8625a863 100644
--- a/keystone/contrib/ec2/controllers.py
+++ b/keystone/contrib/ec2/controllers.py
@@ -37,6 +37,7 @@ import sys
 import uuid
 
 from keystoneclient.contrib.ec2 import utils as ec2_utils
+from oslo.serialization import jsonutils
 import six
 
 from keystone.common import controller
@@ -46,7 +47,6 @@ from keystone.common import wsgi
 from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
-from keystone.openstack.common import jsonutils
 
 
 @dependency.requires('assignment_api', 'catalog_api', 'credential_api',
diff --git a/keystone/contrib/federation/backends/sql.py b/keystone/contrib/federation/backends/sql.py
index 9a8d9655e..63afe0105 100644
--- a/keystone/contrib/federation/backends/sql.py
+++ b/keystone/contrib/federation/backends/sql.py
@@ -12,10 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo.serialization import jsonutils
+
 from keystone.common import sql
 from keystone.contrib.federation import core
 from keystone import exception
-from keystone.openstack.common import jsonutils
 
 
 class FederationProtocolModel(sql.ModelBase, sql.DictBase):
diff --git a/keystone/contrib/oauth1/backends/sql.py b/keystone/contrib/oauth1/backends/sql.py
index 9ad6cd4d6..0da772864 100644
--- a/keystone/contrib/oauth1/backends/sql.py
+++ b/keystone/contrib/oauth1/backends/sql.py
@@ -16,6 +16,7 @@ import datetime
 import random
 import uuid
 
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 
@@ -23,7 +24,6 @@ from keystone.common import sql
 from keystone.contrib.oauth1 import core
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import jsonutils
 
 
 class Consumer(sql.ModelBase, sql.DictBase):
diff --git a/keystone/contrib/oauth1/controllers.py b/keystone/contrib/oauth1/controllers.py
index 837e5fd25..9316466f1 100644
--- a/keystone/contrib/oauth1/controllers.py
+++ b/keystone/contrib/oauth1/controllers.py
@@ -14,6 +14,7 @@
 
 """Extensions supporting OAuth1."""
 
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 
 from keystone.common import controller
@@ -26,7 +27,6 @@ from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
 from keystone import notifications
-from keystone.openstack.common import jsonutils
 
 
 CONF = config.CONF
diff --git a/keystone/controllers.py b/keystone/controllers.py
index 52514af18..7bf469127 100644
--- a/keystone/controllers.py
+++ b/keystone/controllers.py
@@ -12,13 +12,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo.serialization import jsonutils
 import webob
 
 from keystone.common import extension
 from keystone.common import json_home
 from keystone.common import wsgi
 from keystone import exception
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 
 
diff --git a/keystone/credential/controllers.py b/keystone/credential/controllers.py
index 03626a955..5c171e5a3 100644
--- a/keystone/credential/controllers.py
+++ b/keystone/credential/controllers.py
@@ -14,13 +14,14 @@
 
 import hashlib
 
+from oslo.serialization import jsonutils
+
 from keystone.common import controller
 from keystone.common import dependency
 from keystone.common import validation
 from keystone.credential import schema
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import jsonutils
 
 
 @dependency.requires('credential_api')
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index 3d831b13c..83cd593dd 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo.serialization import jsonutils
 import six
 import webob.dec
 
@@ -23,7 +24,6 @@ from keystone.common import wsgi
 from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 from keystone.openstack.common import versionutils
 
diff --git a/keystone/tests/rest.py b/keystone/tests/rest.py
index f90220cd1..c483fc606 100644
--- a/keystone/tests/rest.py
+++ b/keystone/tests/rest.py
@@ -15,12 +15,12 @@
 import io
 
 from lxml import etree
+from oslo.serialization import jsonutils
 import six
 import webtest
 
 from keystone.auth import controllers as auth_controllers
 from keystone.common import serializer
-from keystone.openstack.common import jsonutils
 from keystone import tests
 from keystone.tests import default_fixtures
 from keystone.tests.ksfixtures import database
diff --git a/keystone/tests/test_exception.py b/keystone/tests/test_exception.py
index 4bdcd7576..9b88b6685 100644
--- a/keystone/tests/test_exception.py
+++ b/keystone/tests/test_exception.py
@@ -14,11 +14,11 @@
 
 import uuid
 
+from oslo.serialization import jsonutils
 import six
 
 from keystone.common import wsgi
 from keystone import exception
-from keystone.openstack.common import jsonutils
 from keystone import tests
 
 
diff --git a/keystone/tests/test_keystoneclient.py b/keystone/tests/test_keystoneclient.py
index 72991a146..237906f84 100644
--- a/keystone/tests/test_keystoneclient.py
+++ b/keystone/tests/test_keystoneclient.py
@@ -17,11 +17,11 @@ import os
 import uuid
 
 import mock
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import webob
 
 from keystone import config
-from keystone.openstack.common import jsonutils
 from keystone import tests
 from keystone.tests import default_fixtures
 from keystone.tests.ksfixtures import appserver
diff --git a/keystone/tests/test_middleware.py b/keystone/tests/test_middleware.py
index cf0298984..e0bf101f3 100644
--- a/keystone/tests/test_middleware.py
+++ b/keystone/tests/test_middleware.py
@@ -12,11 +12,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo.serialization import jsonutils
 import webob
 
 from keystone import config
 from keystone import middleware
-from keystone.openstack.common import jsonutils
 from keystone import tests
 
 
diff --git a/keystone/tests/test_v3.py b/keystone/tests/test_v3.py
index f18bd10f1..8d1648307 100644
--- a/keystone/tests/test_v3.py
+++ b/keystone/tests/test_v3.py
@@ -16,6 +16,7 @@ import datetime
 import uuid
 
 from lxml import etree
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 from testtools import matchers
@@ -27,7 +28,6 @@ from keystone.common import serializer
 from keystone import config
 from keystone import exception
 from keystone import middleware
-from keystone.openstack.common import jsonutils
 from keystone.policy.backends import rules
 from keystone import tests
 from keystone.tests.ksfixtures import database
diff --git a/keystone/tests/test_v3_federation.py b/keystone/tests/test_v3_federation.py
index ae3f48dea..edcce0082 100644
--- a/keystone/tests/test_v3_federation.py
+++ b/keystone/tests/test_v3_federation.py
@@ -17,6 +17,7 @@ import uuid
 
 from lxml import etree
 import mock
+from oslo.serialization import jsonutils
 from oslotest import mockpatch
 import saml2
 from saml2 import saml
@@ -32,7 +33,6 @@ from keystone.contrib.federation import idp as keystone_idp
 from keystone.contrib.federation import utils as mapping_utils
 from keystone import exception
 from keystone import notifications
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 from keystone.tests import federation_fixtures
 from keystone.tests import mapping_fixtures
diff --git a/keystone/tests/test_v3_filters.py b/keystone/tests/test_v3_filters.py
index c5421e6e9..c7c45b572 100644
--- a/keystone/tests/test_v3_filters.py
+++ b/keystone/tests/test_v3_filters.py
@@ -15,8 +15,9 @@
 
 import uuid
 
+from oslo.serialization import jsonutils
+
 from keystone import config
-from keystone.openstack.common import jsonutils
 from keystone.policy.backends import rules
 from keystone.tests import filtering
 from keystone.tests.ksfixtures import temporaryfile
diff --git a/keystone/tests/test_v3_oauth1.py b/keystone/tests/test_v3_oauth1.py
index 64a43de25..597ce7720 100644
--- a/keystone/tests/test_v3_oauth1.py
+++ b/keystone/tests/test_v3_oauth1.py
@@ -15,6 +15,7 @@
 import copy
 import uuid
 
+from oslo.serialization import jsonutils
 from six.moves import urllib
 
 from keystone import config
@@ -22,7 +23,6 @@ from keystone.contrib import oauth1
 from keystone.contrib.oauth1 import controllers
 from keystone.contrib.oauth1 import core
 from keystone import exception
-from keystone.openstack.common import jsonutils
 from keystone.tests.ksfixtures import temporaryfile
 from keystone.tests import test_v3
 
diff --git a/keystone/tests/test_v3_protection.py b/keystone/tests/test_v3_protection.py
index f06ecffed..b425b2b1c 100644
--- a/keystone/tests/test_v3_protection.py
+++ b/keystone/tests/test_v3_protection.py
@@ -15,9 +15,10 @@
 
 import uuid
 
+from oslo.serialization import jsonutils
+
 from keystone import config
 from keystone import exception
-from keystone.openstack.common import jsonutils
 from keystone.policy.backends import rules
 from keystone import tests
 from keystone.tests.ksfixtures import temporaryfile
diff --git a/keystone/tests/test_versions.py b/keystone/tests/test_versions.py
index 6954da33b..582d50c4e 100644
--- a/keystone/tests/test_versions.py
+++ b/keystone/tests/test_versions.py
@@ -18,12 +18,12 @@ import functools
 import random
 
 import mock
+from oslo.serialization import jsonutils
 from testtools import matchers as tt_matchers
 
 from keystone.common import json_home
 from keystone import config
 from keystone import controllers
-from keystone.openstack.common import jsonutils
 from keystone import tests
 from keystone.tests import matchers
 
diff --git a/keystone/tests/test_wsgi.py b/keystone/tests/test_wsgi.py
index 11dfb133b..761e91e72 100644
--- a/keystone/tests/test_wsgi.py
+++ b/keystone/tests/test_wsgi.py
@@ -18,6 +18,7 @@ import uuid
 
 import mock
 from oslo import i18n
+from oslo.serialization import jsonutils
 import six
 from testtools import matchers
 import webob
@@ -25,7 +26,6 @@ import webob
 from keystone.common import environment
 from keystone.common import wsgi
 from keystone import exception
-from keystone.openstack.common import jsonutils
 from keystone import tests
 
 
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py
index 12d8ab6b8..16ced0ed9 100644
--- a/keystone/token/controllers.py
+++ b/keystone/token/controllers.py
@@ -16,6 +16,7 @@ import datetime
 import sys
 
 from keystoneclient.common import cms
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 
@@ -26,7 +27,6 @@ from keystone import config
 from keystone import exception
 from keystone.i18n import _
 from keystone.models import token_model
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 from keystone.token import provider
 
diff --git a/keystone/token/providers/common.py b/keystone/token/providers/common.py
index b313fc712..ddd7d69e6 100644
--- a/keystone/token/providers/common.py
+++ b/keystone/token/providers/common.py
@@ -12,6 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 from six.moves.urllib import parse
@@ -21,7 +22,6 @@ from keystone import config
 from keystone.contrib import federation
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 from keystone import token
 from keystone.token import provider
diff --git a/keystone/token/providers/pki.py b/keystone/token/providers/pki.py
index 2156e43ad..8069886bb 100644
--- a/keystone/token/providers/pki.py
+++ b/keystone/token/providers/pki.py
@@ -15,12 +15,12 @@
 """Keystone PKI Token Provider"""
 
 from keystoneclient.common import cms
+from oslo.serialization import jsonutils
 
 from keystone.common import environment
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 from keystone.token.providers import common
 
diff --git a/keystone/token/providers/pkiz.py b/keystone/token/providers/pkiz.py
index a343b7edd..0460e192a 100644
--- a/keystone/token/providers/pkiz.py
+++ b/keystone/token/providers/pkiz.py
@@ -13,12 +13,12 @@
 """Keystone Compressed PKI Token Provider"""
 
 from keystoneclient.common import cms
+from oslo.serialization import jsonutils
 
 from keystone.common import environment
 from keystone import config
 from keystone import exception
 from keystone.i18n import _
-from keystone.openstack.common import jsonutils
 from keystone.openstack.common import log
 from keystone.token.providers import common
 
diff --git a/openstack-common.conf b/openstack-common.conf
index 15be48a62..fd6cb41df 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -3,7 +3,6 @@
 module=config
 module=gettextutils
 module=importutils
-module=jsonutils
 module=log
 module=policy
 module=processutils
diff --git a/requirements.txt b/requirements.txt
index db8ef51c4..994acb39a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,6 +22,7 @@ oslo.config>=1.4.0  # Apache-2.0
 oslo.messaging>=1.4.0
 oslo.db>=1.0.0  # Apache-2.0
 oslo.i18n>=1.0.0  # Apache-2.0
+oslo.serialization>=1.0.0               # Apache-2.0
 oslo.utils>=1.0.0                       # Apache-2.0
 Babel>=1.3
 oauthlib>=0.6