Merge "Switch to oslo.serialization"

heat/api/aws/ec2token.py

@@ -14,6 +14,7 @@
 import hashlib
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils as json
 from oslo.utils import importutils
 import requests
 import webob
@@ -24,7 +25,6 @@ from heat.common.i18n import _
 from heat.common.i18n import _LE
 from heat.common.i18n import _LI
 from heat.common import wsgi
-from heat.openstack.common import jsonutils as json
 from heat.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

heat/common/messaging.py

@@ -18,9 +18,9 @@
 import eventlet
 from oslo.config import cfg
 import oslo.messaging
+from oslo.serialization import jsonutils
 
 from heat.common import context
-from heat.openstack.common import jsonutils
 
 
 TRANSPORT = None

heat/engine/resources/server.py

@@ -15,6 +15,7 @@ import copy
 import uuid
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 
 from heat.common import exception
 from heat.common.i18n import _
@@ -26,7 +27,6 @@ from heat.engine.resources.neutron import subnet
 from heat.engine import scheduler
 from heat.engine import stack_user
 from heat.engine import support
-from heat.openstack.common import jsonutils
 from heat.openstack.common import log as logging
 from heat.openstack.common import uuidutils
 

heat/engine/service.py

@@ -19,6 +19,7 @@ import os
 import eventlet
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import requests
 import six
@@ -44,7 +45,6 @@ from heat.engine import resources
 from heat.engine import stack_lock
 from heat.engine import template as templatem
 from heat.engine import watchrule
-from heat.openstack.common import jsonutils
 from heat.openstack.common import log as logging
 from heat.openstack.common import service
 from heat.openstack.common import threadgroup

heat/tests/test_engine_service.py

@@ -25,6 +25,7 @@ from oslo.config import cfg
 from oslo import messaging
 from oslo.messaging.rpc import client as rpc_client
 from oslo.messaging.rpc import dispatcher
+from oslo.serialization import jsonutils
 import six
 
 from heat.common import exception
@@ -45,7 +46,6 @@ from heat.engine import service
 from heat.engine import stack_lock
 from heat.engine import template as templatem
 from heat.engine import watchrule
-from heat.openstack.common import jsonutils
 from heat.openstack.common import threadgroup
 from heat.rpc import api as engine_api
 from heat.tests.common import HeatTestCase

openstack-common.conf

@@ -6,7 +6,6 @@ module=context
 module=crypto
 module=eventlet_backdoor
 module=gettextutils
-module=jsonutils
 module=local
 module=log
 module=loopingcall

requirements.txt

@@ -17,6 +17,7 @@ oslo.config>=1.4.0  # Apache-2.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
 oslo.utils>=1.0.0  # Apache-2.0
 PasteDeploy>=1.5.0
 posix_ipc