From c4c20a734c41caa98060a804538308068965d475 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Wed, 27 Aug 2014 16:47:01 +0200 Subject: [PATCH] Switch to oslo.serialization Change-Id: I86749bca273097a6aa70e63a1dbd8e20af22f8e1 --- ceilometer/alarm/notifier/rest.py | 4 ++-- ceilometer/messaging.py | 2 +- ceilometer/tests/publisher/test_utils.py | 2 +- openstack-common.conf | 1 - requirements.txt | 1 + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py index 1648cde1b..56660b022 100644 --- a/ceilometer/alarm/notifier/rest.py +++ b/ceilometer/alarm/notifier/rest.py @@ -1,5 +1,5 @@ # -# Copyright 2013 eNovance +# Copyright 2013-2014 eNovance # # Author: Mehdi Abaakouk # @@ -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__) diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py index 6d40871bd..d97a241be 100644 --- a/ceilometer/messaging.py +++ b/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 = {} diff --git a/ceilometer/tests/publisher/test_utils.py b/ceilometer/tests/publisher/test_utils.py index db77aa9a7..479fc5c9d 100644 --- a/ceilometer/tests/publisher/test_utils.py +++ b/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 diff --git a/openstack-common.conf b/openstack-common.conf index 84e18253a..0cc63dd1a 100644 --- a/openstack-common.conf +++ b/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 diff --git a/requirements.txt b/requirements.txt index 5b83f131e..60d3de4f6 100644 --- a/requirements.txt +++ b/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