Use oslo serialization jsonutils
Change-Id: I081697d987fc7c2bcd4ae73b97aedc058c57a84f Partial-bug: #1552282
This commit is contained in:
parent
70190b66ba
commit
aaeda502bb
|
@ -28,6 +28,7 @@ oslo.config>=3.10.0 # Apache-2.0
|
||||||
oslo.log>=1.14.0 # Apache-2.0
|
oslo.log>=1.14.0 # Apache-2.0
|
||||||
oslo.messaging>=4.5.0 # Apache-2.0
|
oslo.messaging>=4.5.0 # Apache-2.0
|
||||||
oslo.rootwrap>=2.0.0 # Apache-2.0
|
oslo.rootwrap>=2.0.0 # Apache-2.0
|
||||||
|
oslo.serialization>=1.10.0 # Apache-2.0
|
||||||
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
|
||||||
python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
|
python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
|
||||||
tosca-parser>=0.5.0 # Apache-2.0
|
tosca-parser>=0.5.0 # Apache-2.0
|
||||||
|
|
|
@ -1,186 +0,0 @@
|
||||||
# Copyright 2010 United States Government as represented by the
|
|
||||||
# Administrator of the National Aeronautics and Space Administration.
|
|
||||||
# Copyright 2011 Justin Santa Barbara
|
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
'''
|
|
||||||
JSON related utilities.
|
|
||||||
|
|
||||||
This module provides a few things:
|
|
||||||
|
|
||||||
1) A handy function for getting an object down to something that can be
|
|
||||||
JSON serialized. See to_primitive().
|
|
||||||
|
|
||||||
2) Wrappers around loads() and dumps(). The dumps() wrapper will
|
|
||||||
automatically use to_primitive() for you if needed.
|
|
||||||
|
|
||||||
3) This sets up anyjson to use the loads() and dumps() wrappers if anyjson
|
|
||||||
is available.
|
|
||||||
'''
|
|
||||||
|
|
||||||
|
|
||||||
import codecs
|
|
||||||
import datetime
|
|
||||||
import functools
|
|
||||||
import inspect
|
|
||||||
import itertools
|
|
||||||
import sys
|
|
||||||
|
|
||||||
if sys.version_info < (2, 7):
|
|
||||||
# On Python <= 2.6, json module is not C boosted, so try to use
|
|
||||||
# simplejson module if available
|
|
||||||
try:
|
|
||||||
import simplejson as json
|
|
||||||
except ImportError:
|
|
||||||
import json
|
|
||||||
else:
|
|
||||||
import json
|
|
||||||
|
|
||||||
import six
|
|
||||||
import six.moves.xmlrpc_client as xmlrpclib
|
|
||||||
|
|
||||||
from tacker.openstack.common import gettextutils
|
|
||||||
from tacker.openstack.common import importutils
|
|
||||||
from tacker.openstack.common import strutils
|
|
||||||
from tacker.openstack.common import timeutils
|
|
||||||
|
|
||||||
netaddr = importutils.try_import("netaddr")
|
|
||||||
|
|
||||||
_nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod,
|
|
||||||
inspect.isfunction, inspect.isgeneratorfunction,
|
|
||||||
inspect.isgenerator, inspect.istraceback, inspect.isframe,
|
|
||||||
inspect.iscode, inspect.isbuiltin, inspect.isroutine,
|
|
||||||
inspect.isabstract]
|
|
||||||
|
|
||||||
_simple_types = (six.string_types + six.integer_types
|
|
||||||
+ (type(None), bool, float))
|
|
||||||
|
|
||||||
|
|
||||||
def to_primitive(value, convert_instances=False, convert_datetime=True,
|
|
||||||
level=0, max_depth=3):
|
|
||||||
"""Convert a complex object into primitives.
|
|
||||||
|
|
||||||
Handy for JSON serialization. We can optionally handle instances,
|
|
||||||
but since this is a recursive function, we could have cyclical
|
|
||||||
data structures.
|
|
||||||
|
|
||||||
To handle cyclical data structures we could track the actual objects
|
|
||||||
visited in a set, but not all objects are hashable. Instead we just
|
|
||||||
track the depth of the object inspections and don't go too deep.
|
|
||||||
|
|
||||||
Therefore, convert_instances=True is lossy ... be aware.
|
|
||||||
|
|
||||||
"""
|
|
||||||
# handle obvious types first - order of basic types determined by running
|
|
||||||
# full tests on nova project, resulting in the following counts:
|
|
||||||
# 572754 <type 'NoneType'>
|
|
||||||
# 460353 <type 'int'>
|
|
||||||
# 379632 <type 'unicode'>
|
|
||||||
# 274610 <type 'str'>
|
|
||||||
# 199918 <type 'dict'>
|
|
||||||
# 114200 <type 'datetime.datetime'>
|
|
||||||
# 51817 <type 'bool'>
|
|
||||||
# 26164 <type 'list'>
|
|
||||||
# 6491 <type 'float'>
|
|
||||||
# 283 <type 'tuple'>
|
|
||||||
# 19 <type 'long'>
|
|
||||||
if isinstance(value, _simple_types):
|
|
||||||
return value
|
|
||||||
|
|
||||||
if isinstance(value, datetime.datetime):
|
|
||||||
if convert_datetime:
|
|
||||||
return timeutils.strtime(value)
|
|
||||||
else:
|
|
||||||
return value
|
|
||||||
|
|
||||||
# value of itertools.count doesn't get caught by nasty_type_tests
|
|
||||||
# and results in infinite loop when list(value) is called.
|
|
||||||
if type(value) == itertools.count:
|
|
||||||
return six.text_type(value)
|
|
||||||
|
|
||||||
# FIXME(vish): Workaround for LP bug 852095. Without this workaround,
|
|
||||||
# tests that raise an exception in a mocked method that
|
|
||||||
# has a @wrap_exception with a notifier will fail. If
|
|
||||||
# we up the dependency to 0.5.4 (when it is released) we
|
|
||||||
# can remove this workaround.
|
|
||||||
if getattr(value, '__module__', None) == 'mox':
|
|
||||||
return 'mock'
|
|
||||||
|
|
||||||
if level > max_depth:
|
|
||||||
return '?'
|
|
||||||
|
|
||||||
# The try block may not be necessary after the class check above,
|
|
||||||
# but just in case ...
|
|
||||||
try:
|
|
||||||
recursive = functools.partial(to_primitive,
|
|
||||||
convert_instances=convert_instances,
|
|
||||||
convert_datetime=convert_datetime,
|
|
||||||
level=level,
|
|
||||||
max_depth=max_depth)
|
|
||||||
if isinstance(value, dict):
|
|
||||||
return dict((k, recursive(v)) for k, v in six.iteritems(value))
|
|
||||||
elif isinstance(value, (list, tuple)):
|
|
||||||
return [recursive(lv) for lv in value]
|
|
||||||
|
|
||||||
# It's not clear why xmlrpclib created their own DateTime type, but
|
|
||||||
# for our purposes, make it a datetime type which is explicitly
|
|
||||||
# handled
|
|
||||||
if isinstance(value, xmlrpclib.DateTime):
|
|
||||||
value = datetime.datetime(*tuple(value.timetuple())[:6])
|
|
||||||
|
|
||||||
if convert_datetime and isinstance(value, datetime.datetime):
|
|
||||||
return timeutils.strtime(value)
|
|
||||||
elif isinstance(value, gettextutils.Message):
|
|
||||||
return value.data
|
|
||||||
elif hasattr(value, 'iteritems'):
|
|
||||||
return recursive(dict(value.iteritems()), level=level + 1)
|
|
||||||
elif hasattr(value, '__iter__'):
|
|
||||||
return recursive(list(value))
|
|
||||||
elif convert_instances and hasattr(value, '__dict__'):
|
|
||||||
# Likely an instance of something. Watch for cycles.
|
|
||||||
# Ignore class member vars.
|
|
||||||
return recursive(value.__dict__, level=level + 1)
|
|
||||||
elif netaddr and isinstance(value, netaddr.IPAddress):
|
|
||||||
return six.text_type(value)
|
|
||||||
else:
|
|
||||||
if any(test(value) for test in _nasty_type_tests):
|
|
||||||
return six.text_type(value)
|
|
||||||
return value
|
|
||||||
except TypeError:
|
|
||||||
# Class objects are tricky since they may define something like
|
|
||||||
# __iter__ defined but it isn't callable as list().
|
|
||||||
return six.text_type(value)
|
|
||||||
|
|
||||||
|
|
||||||
def dumps(value, default=to_primitive, **kwargs):
|
|
||||||
return json.dumps(value, default=default, **kwargs)
|
|
||||||
|
|
||||||
|
|
||||||
def loads(s, encoding='utf-8'):
|
|
||||||
return json.loads(strutils.safe_decode(s, encoding))
|
|
||||||
|
|
||||||
|
|
||||||
def load(fp, encoding='utf-8'):
|
|
||||||
return json.load(codecs.getreader(encoding)(fp))
|
|
||||||
|
|
||||||
|
|
||||||
try:
|
|
||||||
import anyjson
|
|
||||||
except ImportError:
|
|
||||||
pass
|
|
||||||
else:
|
|
||||||
anyjson._modules.append((__name__, 'dumps', TypeError,
|
|
||||||
'loads', ValueError, 'load'))
|
|
||||||
anyjson.force_implementation(__name__)
|
|
|
@ -58,12 +58,12 @@ import abc
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse as urllib_parse
|
from six.moves.urllib import parse as urllib_parse
|
||||||
from six.moves.urllib import request as urlrequest
|
from six.moves.urllib import request as urlrequest
|
||||||
|
|
||||||
from tacker.openstack.common.gettextutils import _
|
from tacker.openstack.common.gettextutils import _
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
|
@ -15,8 +15,9 @@
|
||||||
|
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
|
|
||||||
from tacker.api import extensions
|
from tacker.api import extensions
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
from tacker import wsgi
|
from tacker import wsgi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@ import abc
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
import routes
|
import routes
|
||||||
import webob
|
import webob
|
||||||
import webtest
|
import webtest
|
||||||
|
@ -24,7 +25,6 @@ import webtest
|
||||||
from tacker.api import extensions
|
from tacker.api import extensions
|
||||||
from tacker.common import config
|
from tacker.common import config
|
||||||
from tacker.common import exceptions
|
from tacker.common import exceptions
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
from tacker.plugins.common import constants
|
from tacker.plugins.common import constants
|
||||||
from tacker.tests import base
|
from tacker.tests import base
|
||||||
from tacker.tests.unit import extension_stubs as ext_stubs
|
from tacker.tests.unit import extension_stubs as ext_stubs
|
||||||
|
|
|
@ -19,6 +19,7 @@ import fixtures
|
||||||
import mock
|
import mock
|
||||||
import six
|
import six
|
||||||
|
|
||||||
|
from oslo_serialization import jsonutils as json
|
||||||
from six.moves.urllib import request as urlrequest
|
from six.moves.urllib import request as urlrequest
|
||||||
|
|
||||||
import tacker
|
import tacker
|
||||||
|
@ -27,7 +28,6 @@ from tacker.common import exceptions
|
||||||
from tacker import context
|
from tacker import context
|
||||||
from tacker import manager
|
from tacker import manager
|
||||||
from tacker.openstack.common import importutils
|
from tacker.openstack.common import importutils
|
||||||
from tacker.openstack.common import jsonutils as json
|
|
||||||
from tacker.openstack.common import policy as common_policy
|
from tacker.openstack.common import policy as common_policy
|
||||||
from tacker import policy
|
from tacker import policy
|
||||||
from tacker.tests import base
|
from tacker.tests import base
|
||||||
|
|
|
@ -20,6 +20,7 @@ import time
|
||||||
from heatclient import exc as heatException
|
from heatclient import exc as heatException
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
from six import iteritems
|
from six import iteritems
|
||||||
from toscaparser.tosca_template import ToscaTemplate
|
from toscaparser.tosca_template import ToscaTemplate
|
||||||
from toscaparser.utils import yamlparser
|
from toscaparser.utils import yamlparser
|
||||||
|
@ -29,7 +30,6 @@ import yaml
|
||||||
from tacker.common import clients
|
from tacker.common import clients
|
||||||
from tacker.common import log
|
from tacker.common import log
|
||||||
from tacker.extensions import vnfm
|
from tacker.extensions import vnfm
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
from tacker.vm.infra_drivers import abstract_driver
|
from tacker.vm.infra_drivers import abstract_driver
|
||||||
from tacker.vm.tosca import utils as toscautils
|
from tacker.vm.tosca import utils as toscautils
|
||||||
|
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
|
|
||||||
import abc
|
import abc
|
||||||
|
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from tacker.api import extensions
|
from tacker.api import extensions
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
from tacker.vm import constants
|
from tacker.vm import constants
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -16,11 +16,11 @@
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from tacker.agent.linux import utils
|
from tacker.agent.linux import utils
|
||||||
from tacker.common import log
|
from tacker.common import log
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
from tacker.vm.mgmt_drivers import abstract_driver
|
from tacker.vm.mgmt_drivers import abstract_driver
|
||||||
from tacker.vm.mgmt_drivers import constants as mgmt_constants
|
from tacker.vm.mgmt_drivers import constants as mgmt_constants
|
||||||
|
|
||||||
|
|
|
@ -21,13 +21,13 @@ import time
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from tacker.common import clients
|
from tacker.common import clients
|
||||||
from tacker.common import driver_manager
|
from tacker.common import driver_manager
|
||||||
from tacker import context as t_context
|
from tacker import context as t_context
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
from tacker.vm.infra_drivers.heat import heat
|
from tacker.vm.infra_drivers.heat import heat
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@ import eventlet.wsgi
|
||||||
# eventlet.patcher.monkey_patch(all=False, socket=True, thread=True)
|
# eventlet.patcher.monkey_patch(all=False, socket=True, thread=True)
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
|
from oslo_serialization import jsonutils
|
||||||
import routes.middleware
|
import routes.middleware
|
||||||
import six
|
import six
|
||||||
import webob.dec
|
import webob.dec
|
||||||
|
@ -42,7 +43,6 @@ from tacker import context
|
||||||
from tacker.db import api
|
from tacker.db import api
|
||||||
from tacker.openstack.common import excutils
|
from tacker.openstack.common import excutils
|
||||||
from tacker.openstack.common import gettextutils
|
from tacker.openstack.common import gettextutils
|
||||||
from tacker.openstack.common import jsonutils
|
|
||||||
from tacker.openstack.common import service as common_service
|
from tacker.openstack.common import service as common_service
|
||||||
from tacker.openstack.common import systemd
|
from tacker.openstack.common import systemd
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue