Switch to oslo.serialization

Change-Id: I983bb5b6e2c7fbbd8556ff0f99212803cb0269e9

glance/api/middleware/context.py

@@ -14,12 +14,12 @@
 #    under the License.
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob.exc
 
 from glance.api import policy
 from glance.common import wsgi
 import glance.context
-from glance.openstack.common import jsonutils
 import glance.openstack.common.log as logging
 
 

glance/api/policy.py

@@ -20,10 +20,10 @@ import copy
 import os.path
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 
 from glance.common import exception
 import glance.domain.proxy
-from glance.openstack.common import jsonutils
 import glance.openstack.common.log as logging
 from glance.openstack.common import policy
 

glance/api/v2/image_members.py

@@ -16,6 +16,7 @@
 import copy
 
 import glance_store
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 import webob
@@ -27,7 +28,6 @@ from glance.common import wsgi
 import glance.db
 import glance.gateway
 import glance.notifier
-from glance.openstack.common import jsonutils
 import glance.schema
 
 

glance/api/v2/images.py

@@ -17,6 +17,7 @@ import re
 
 import glance_store
 from oslo.config import cfg
+from oslo.serialization import jsonutils as json
 from oslo.utils import timeutils
 import six
 import six.moves.urllib.parse as urlparse
@@ -31,7 +32,6 @@ import glance.db
 import glance.gateway
 import glance.notifier
 from glance.openstack.common import gettextutils
-from glance.openstack.common import jsonutils as json
 import glance.openstack.common.log as logging
 import glance.schema
 

glance/api/v2/metadef_namespaces.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils as json
 import six
 import six.moves.urllib.parse as urlparse
 import webob.exc
@@ -34,7 +35,6 @@ import glance.db
 import glance.gateway
 from glance import i18n
 import glance.notifier
-from glance.openstack.common import jsonutils as json
 import glance.openstack.common.log as logging
 import glance.schema
 

glance/api/v2/metadef_objects.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils as json
 import six
 import webob.exc
 from wsme.rest.json import fromjson
@@ -30,7 +31,6 @@ from glance.common import wsme_utils
 import glance.db
 from glance import i18n
 import glance.notifier
-from glance.openstack.common import jsonutils as json
 import glance.openstack.common.log as logging
 import glance.schema
 

glance/api/v2/metadef_properties.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo.serialization import jsonutils as json
 import six
 import webob.exc
 from wsme.rest.json import fromjson
@@ -30,7 +31,6 @@ import glance.db
 import glance.gateway
 from glance import i18n
 import glance.notifier
-from glance.openstack.common import jsonutils as json
 import glance.openstack.common.log as logging
 import glance.schema
 

glance/api/v2/metadef_resource_types.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo.serialization import jsonutils as json
 import six
 import webob.exc
 from wsme.rest.json import fromjson
@@ -30,7 +31,6 @@ import glance.db
 import glance.gateway
 from glance import i18n
 import glance.notifier
-from glance.openstack.common import jsonutils as json
 import glance.openstack.common.log as logging
 import glance.schema
 

glance/api/v2/model/metadef_namespace.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo.serialization import jsonutils as json
 import wsme
 from wsme.rest.json import fromjson
 from wsme import types
@@ -21,7 +22,6 @@ from glance.api.v2.model.metadef_object import MetadefObject
 from glance.api.v2.model.metadef_property_type import PropertyType
 from glance.api.v2.model.metadef_resource_type import ResourceTypeAssociation
 from glance.common.wsme_utils import WSMEModelTransformer
-from glance.openstack.common import jsonutils as json
 
 
 class Namespace(types.Base, WSMEModelTransformer):

glance/api/v2/tasks.py

@@ -18,6 +18,7 @@ import copy
 
 import glance_store
 from oslo.config import cfg
+import oslo.serialization.jsonutils as json
 from oslo.utils import timeutils
 import six
 import six.moves.urllib.parse as urlparse
@@ -31,7 +32,6 @@ import glance.db
 import glance.gateway
 import glance.notifier
 from glance.openstack.common import gettextutils
-import glance.openstack.common.jsonutils as json
 import glance.openstack.common.log as logging
 import glance.schema
 

glance/api/versions.py

@@ -16,10 +16,10 @@
 import httplib
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob.dec
 
 from glance.common import wsgi
-from glance.openstack.common import jsonutils
 
 
 CONF = cfg.CONF

glance/cmd/replicator.py

@@ -23,11 +23,11 @@ import optparse
 import os
 import sys
 
+from oslo.serialization import jsonutils
 import six.moves.urllib.parse as urlparse
 
 from glance.common import utils
 from glance.openstack.common import gettextutils
-from glance.openstack.common import jsonutils
 from glance.openstack.common import log
 
 LOG = log.getLogger(__name__)

glance/common/auth.py

@@ -29,10 +29,10 @@ Keystone (an identity management system).
     http://service_endpoint/
 """
 import httplib2
+from oslo.serialization import jsonutils
 import six.moves.urllib.parse as urlparse
 
 from glance.common import exception
-from glance.openstack.common import jsonutils
 import glance.openstack.common.log as logging
 
 

glance/common/wsgi.py

@@ -35,6 +35,7 @@ from eventlet.green import ssl
 import eventlet.greenio
 import eventlet.wsgi
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import routes
 import routes.middleware
 import six
@@ -45,7 +46,6 @@ from webob import multidict
 from glance.common import exception
 from glance.common import utils
 from glance import i18n
-from glance.openstack.common import jsonutils
 import glance.openstack.common.log as logging
 from glance.openstack.common import processutils
 

glance/db/__init__.py

@@ -17,6 +17,7 @@
 #    under the License.
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils as json
 from oslo.utils import importutils
 from wsme.rest.json import fromjson
 from wsme.rest.json import tojson
@@ -27,7 +28,6 @@ from glance.common import exception
 from glance.common import location_strategy
 import glance.domain
 import glance.domain.proxy
-from glance.openstack.common import jsonutils as json
 
 CONF = cfg.CONF
 CONF.import_opt('image_size_cap', 'glance.common.config')

glance/db/sqlalchemy/models.py

@@ -21,6 +21,7 @@ SQLAlchemy models for glance data
 import uuid
 
 from oslo.db.sqlalchemy import models
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 from sqlalchemy import BigInteger
 from sqlalchemy import Boolean
@@ -37,8 +38,6 @@ from sqlalchemy import Text
 from sqlalchemy.types import TypeDecorator
 from sqlalchemy import UniqueConstraint
 
-from glance.openstack.common import jsonutils
-
 
 BASE = declarative_base()
 

glance/image_cache/client.py

@@ -15,9 +15,10 @@
 
 import os
 
+from oslo.serialization import jsonutils as json
+
 from glance.common import client as base_client
 from glance.common import exception
-import glance.openstack.common.jsonutils as json
 
 
 class CacheClient(base_client.BaseClient):

glance/registry/client/v1/api.py

@@ -20,9 +20,9 @@ Registry's Client API
 import os
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 
 from glance.common import exception
-from glance.openstack.common import jsonutils
 import glance.openstack.common.log as logging
 from glance.registry.client.v1 import client
 

glance/registry/client/v1/client.py

@@ -18,12 +18,12 @@ Simple client class to speak with any RESTful service that implements
 the Glance Registry API
 """
 
+from oslo.serialization import jsonutils
 from oslo.utils import excutils
 
 from glance.common.client import BaseClient
 from glance.common import crypt
 from glance.openstack.common import gettextutils
-from glance.openstack.common import jsonutils
 import glance.openstack.common.log as logging
 from glance.registry.api.v1 import images
 

glance/tests/functional/__init__.py

@@ -33,12 +33,12 @@ import tempfile
 import time
 
 import fixtures
+from oslo.serialization import jsonutils
 import six.moves.urllib.parse as urlparse
 import testtools
 
 from glance.common import utils
 from glance.db.sqlalchemy import api as db_api
-from glance.openstack.common import jsonutils
 from glance import tests as glance_tests
 from glance.tests import utils as test_utils
 

glance/tests/functional/db/test_rpc_endpoint.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.serialization import jsonutils
 import requests
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 

glance/tests/functional/test_api.py

@@ -17,8 +17,8 @@
 
 
 import httplib2
+from oslo.serialization import jsonutils
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 

glance/tests/functional/test_bin_glance_cache_manage.py

@@ -21,10 +21,10 @@ import os
 import sys
 
 import httplib2
+from oslo.serialization import jsonutils
 from oslo.utils import units
 from six.moves import xrange
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 from glance.tests.utils import execute
 from glance.tests.utils import minimal_headers

glance/tests/functional/test_cache_middleware.py

@@ -27,10 +27,10 @@ import sys
 import time
 
 import httplib2
+from oslo.serialization import jsonutils
 from oslo.utils import units
 from six.moves import xrange
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 from glance.tests.functional.store_utils import get_http_uri
 from glance.tests.functional.store_utils import setup_http

glance/tests/functional/test_scrubber.py

@@ -19,11 +19,11 @@ import time
 
 import glance_store.location
 import httplib2
+from oslo.serialization import jsonutils
 from oslo.utils import units
 from six.moves import xrange
 
 from glance.common import crypt
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 from glance.tests.utils import execute
 

glance/tests/functional/v1/test_api.py

@@ -18,9 +18,9 @@
 import hashlib
 
 import httplib2
+from oslo.serialization import jsonutils
 from oslo.utils import units
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 from glance.tests.utils import minimal_headers
 from glance.tests.utils import skip_if_disabled

glance/tests/functional/v1/test_copy_to_file.py

@@ -24,10 +24,10 @@ import tempfile
 import time
 
 import httplib2
+from oslo.serialization import jsonutils
 from oslo.utils import units
 from six.moves import xrange
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 from glance.tests.functional.store_utils import get_http_uri
 from glance.tests.functional.store_utils import setup_http

glance/tests/functional/v1/test_misc.py

@@ -16,9 +16,9 @@ import hashlib
 import os
 
 import httplib2
+from oslo.serialization import jsonutils
 from oslo.utils import units
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 from glance.tests.utils import execute
 from glance.tests.utils import minimal_headers

glance/tests/functional/v1/test_ssl.py

@@ -34,10 +34,10 @@ import tempfile
 import uuid
 
 import httplib2
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 from oslo.utils import units
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 from glance.tests.utils import minimal_headers
 from glance.tests.utils import skip_if_disabled

glance/tests/functional/v2/test_images.py

@@ -19,10 +19,10 @@ import signal
 import tempfile
 import uuid
 
+from oslo.serialization import jsonutils
 import requests
 import six
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 

glance/tests/functional/v2/test_metadef_namespaces.py

@@ -15,9 +15,9 @@
 
 import uuid
 
+from oslo.serialization import jsonutils
 import requests
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 TENANT1 = str(uuid.uuid4())

glance/tests/functional/v2/test_metadef_objects.py

@@ -15,9 +15,9 @@
 
 import uuid
 
+from oslo.serialization import jsonutils
 import requests
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 TENANT1 = str(uuid.uuid4())

glance/tests/functional/v2/test_metadef_properties.py

@@ -15,9 +15,9 @@
 
 import uuid
 
+from oslo.serialization import jsonutils
 import requests
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 TENANT1 = str(uuid.uuid4())

glance/tests/functional/v2/test_metadef_resourcetypes.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo.serialization import jsonutils as json
 import six
 import webob.exc
 from wsme.rest.json import fromjson
@@ -30,7 +31,6 @@ import glance.db
 import glance.gateway
 from glance import i18n
 import glance.notifier
-from glance.openstack.common import jsonutils as json
 import glance.openstack.common.log as logging
 import glance.schema
 

glance/tests/functional/v2/test_schemas.py

@@ -13,9 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.serialization import jsonutils
 import requests
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 

glance/tests/functional/v2/test_tasks.py

@@ -16,9 +16,9 @@
 
 import uuid
 
+from oslo.serialization import jsonutils
 import requests
 
-from glance.openstack.common import jsonutils
 from glance.tests import functional
 
 

glance/tests/integration/legacy_functional/test_v1_api.py

@@ -15,11 +15,11 @@ import hashlib
 import os
 import tempfile
 
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 from oslo.utils import units
 import testtools
 
-from glance.openstack.common import jsonutils
 from glance.tests.integration.legacy_functional import base
 from glance.tests.utils import minimal_headers
 

glance/tests/integration/v2/test_property_quota_violations.py

@@ -14,8 +14,8 @@
 #    under the License.
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 
-from glance.openstack.common import jsonutils
 from glance.tests.integration.v2 import base
 
 CONF = cfg.CONF

glance/tests/integration/v2/test_tasks_api.py

@@ -15,10 +15,10 @@
 
 import time
 
+from oslo.serialization import jsonutils as json
 from oslo.utils import timeutils
 
 from glance.api.v2 import tasks
-import glance.openstack.common.jsonutils as json
 from glance.tests.integration.v2 import base
 
 TENANT1 = '6838eb7b-6ded-434a-882c-b344c77fe8df'

glance/tests/unit/base.py

@@ -21,8 +21,8 @@ import glance_store as store
 from glance_store import location
 from oslo.config import cfg
 from oslo.db import options
+from oslo.serialization import jsonutils
 
-from glance.openstack.common import jsonutils
 from glance.tests import stubs
 from glance.tests import utils as test_utils
 

glance/tests/unit/common/test_rpc.py

@@ -17,13 +17,13 @@
 import datetime
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import routes
 import webob
 
 from glance.common import exception
 from glance.common import rpc
 from glance.common import wsgi
-from glance.openstack.common import jsonutils
 from glance.tests.unit import base
 from glance.tests import utils as test_utils
 

glance/tests/unit/common/test_wsgi.py

@@ -22,6 +22,7 @@ from babel import localedata
 import eventlet.patcher
 import fixtures
 import mock
+from oslo.serialization import jsonutils
 import routes
 import six
 import webob
@@ -32,7 +33,6 @@ from glance.common import exception
 from glance.common import utils
 from glance.common import wsgi
 from glance import i18n
-from glance.openstack.common import jsonutils
 from glance.tests import utils as test_utils
 
 

glance/tests/unit/test_auth.py

@@ -14,6 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import stubout
 import webob
@@ -22,7 +23,6 @@ from glance.api import authorization
 from glance.common import auth
 from glance.common import exception
 import glance.domain
-from glance.openstack.common import jsonutils
 from glance.tests.unit import utils as unittest_utils
 from glance.tests import utils
 

glance/tests/unit/test_glance_replicator.py

@@ -19,10 +19,10 @@ import UserDict
 import uuid
 
 import fixtures
+from oslo.serialization import jsonutils
 import six
 
 from glance.cmd import replicator as glance_replicator
-from glance.openstack.common import jsonutils
 from glance.tests.unit import utils as unit_test_utils
 from glance.tests import utils as test_utils
 

glance/tests/unit/test_migrations.py

@@ -37,6 +37,7 @@ from oslo.config import cfg
 from oslo.db.sqlalchemy import test_base
 from oslo.db.sqlalchemy import test_migrations
 from oslo.db.sqlalchemy import utils as db_utils
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import sqlalchemy
 
@@ -47,7 +48,6 @@ from glance.db import migration
 from glance.db.sqlalchemy import migrate_repo
 from glance.db.sqlalchemy.migrate_repo.schema import from_migration_import
 from glance.db.sqlalchemy import models
-from glance.openstack.common import jsonutils
 
 
 CONF = cfg.CONF

glance/tests/unit/test_versions.py

@@ -13,11 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.serialization import jsonutils
 import webob
 
 from glance.api.middleware import version_negotiation
 from glance.api import versions
-from glance.openstack.common import jsonutils
 from glance.tests.unit import base
 
 

glance/tests/unit/v1/test_api.py

@@ -23,6 +23,7 @@ import uuid
 import glance_store as store
 import mock
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import routes
 import six
@@ -37,7 +38,6 @@ from glance.common import exception
 import glance.context
 from glance.db.sqlalchemy import api as db_api
 from glance.db.sqlalchemy import models as db_models
-from glance.openstack.common import jsonutils
 import glance.registry.client.v1.api as registry
 from glance.tests.unit import base
 import glance.tests.unit.utils as unit_test_utils

glance/tests/unit/v1/test_registry_api.py

@@ -20,6 +20,7 @@ import uuid
 
 import mock
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import routes
 import six
@@ -31,7 +32,6 @@ from glance.common import crypt
 from glance import context
 from glance.db.sqlalchemy import api as db_api
 from glance.db.sqlalchemy import models as db_models
-from glance.openstack.common import jsonutils
 from glance.registry.api import v1 as rserver
 from glance.tests.unit import base
 from glance.tests import utils as test_utils

glance/tests/unit/v2/test_image_members_resource.py

@@ -17,10 +17,10 @@ import datetime
 
 import glance_store
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import webob
 
 import glance.api.v2.image_members
-from glance.openstack.common import jsonutils
 import glance.tests.unit.utils as unit_test_utils
 import glance.tests.utils as test_utils
 

glance/tests/unit/v2/test_images_resource.py

@@ -19,13 +19,13 @@ import uuid
 
 import glance_store as store
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import six
 import testtools
 import webob
 
 import glance.api.v2.images
 from glance.common import exception
-from glance.openstack.common import jsonutils
 import glance.schema
 from glance.tests.unit import base
 import glance.tests.unit.utils as unit_test_utils

glance/tests/unit/v2/test_registry_api.py

@@ -19,6 +19,7 @@ import datetime
 import uuid
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import routes
 import six
@@ -29,7 +30,6 @@ import glance.common.config
 import glance.context
 from glance.db.sqlalchemy import api as db_api
 from glance.db.sqlalchemy import models as db_models
-from glance.openstack.common import jsonutils
 from glance.registry.api import v2 as rserver
 from glance.tests.unit import base
 from glance.tests import utils as test_utils

glance/tests/unit/v2/test_tasks_resource.py

@@ -18,13 +18,13 @@ import datetime
 import uuid
 
 import mock
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import webob
 
 import glance.api.v2.tasks
 import glance.domain
 import glance.gateway
-from glance.openstack.common import jsonutils
 from glance.tests.unit import base
 import glance.tests.unit.utils as unit_test_utils
 import glance.tests.utils as test_utils

glance/tests/utils.py

@@ -25,6 +25,7 @@ import subprocess
 
 import fixtures
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 import stubout
@@ -38,7 +39,6 @@ from glance.common import wsgi
 from glance import context
 from glance.db.sqlalchemy import api as db_api
 from glance.db.sqlalchemy import models as db_models
-from glance.openstack.common import jsonutils
 
 CONF = cfg.CONF
 

openstack-common.conf

@@ -4,7 +4,6 @@
 module=fileutils
 module=gettextutils
 module=install_venv_common
-module=jsonutils
 module=local
 module=lockutils
 module=log

requirements.txt

@@ -53,6 +53,7 @@ six>=1.7.0
 oslo.db>=1.0.0  # Apache-2.0
 oslo.i18n>=1.0.0  # Apache-2.0
 oslo.messaging>=1.4.0
+oslo.serialization>=1.0.0               # Apache-2.0
 
 retrying>=1.2.2 # Apache-2.0
 osprofiler>=0.3.0                       # Apache-2.0