Merge "Switch to oslo.serialization"

ceilometer/alarm/notifier/rest.py

@@ -1,5 +1,5 @@
 #
-# Copyright 2013 eNovance
+# Copyright 2013-2014 eNovance
 #
 # Author: Mehdi Abaakouk <mehdi.abaakouk@enovance.com>
 #
@@ -18,13 +18,13 @@
 
 import eventlet
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import requests
 import six.moves.urllib.parse as urlparse
 
 from ceilometer.alarm import notifier
 from ceilometer.openstack.common import context
 from ceilometer.openstack.common.gettextutils import _
-from ceilometer.openstack.common import jsonutils
 from ceilometer.openstack.common import log
 
 LOG = log.getLogger(__name__)

ceilometer/messaging.py

@@ -17,9 +17,9 @@
 
 from oslo.config import cfg
 import oslo.messaging
+from oslo.serialization import jsonutils
 
 from ceilometer.openstack.common import context
-from ceilometer.openstack.common import jsonutils
 
 DEFAULT_URL = "__default__"
 TRANSPORTS = {}

ceilometer/tests/publisher/test_utils.py

@@ -18,9 +18,9 @@
 # under the License.
 """Tests for ceilometer/publisher/utils.py
 """
+from oslo.serialization import jsonutils
 from oslotest import base
 
-from ceilometer.openstack.common import jsonutils
 from ceilometer.publisher import utils
 
 

openstack-common.conf

@@ -5,7 +5,6 @@ module=config
 module=context
 module=eventlet_backdoor
 module=gettextutils
-module=jsonutils
 module=local
 module=log
 module=log_handler

requirements.txt

@@ -20,6 +20,7 @@ pbr>=0.6,!=0.7,<1.0
 pecan>=0.5.0
 posix_ipc
 oslo.messaging>=1.4.0.0a3
+oslo.serialization>=0.1.0
 oslo.utils>=0.2.0                       # Apache-2.0
 pysnmp>=4.2.1,<5.0.0
 python-ceilometerclient>=1.0.6