diff --git a/ceilometer/alarm/notifier/rest.py b/ceilometer/alarm/notifier/rest.py index 1312be3c7..56bed5981 100644 --- a/ceilometer/alarm/notifier/rest.py +++ b/ceilometer/alarm/notifier/rest.py @@ -15,9 +15,9 @@ """Rest alarm notifier.""" import eventlet -from oslo.serialization import jsonutils from oslo_config import cfg from oslo_context import context +from oslo_serialization import jsonutils import requests import six.moves.urllib.parse as urlparse diff --git a/ceilometer/messaging.py b/ceilometer/messaging.py index 765740584..60bb166fe 100644 --- a/ceilometer/messaging.py +++ b/ceilometer/messaging.py @@ -14,9 +14,9 @@ # under the License. import oslo.messaging -from oslo.serialization import jsonutils from oslo_config import cfg from oslo_context import context +from oslo_serialization import jsonutils DEFAULT_URL = "__default__" TRANSPORTS = {} diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py index 8af8b38db..fcb39ba34 100644 --- a/ceilometer/storage/impl_sqlalchemy.py +++ b/ceilometer/storage/impl_sqlalchemy.py @@ -20,8 +20,8 @@ import os from oslo.db import exception as dbexc from oslo.db.sqlalchemy import session as db_session -from oslo.serialization import jsonutils from oslo_config import cfg +from oslo_serialization import jsonutils from oslo_utils import timeutils import six import sqlalchemy as sa diff --git a/ceilometer/storage/sqlalchemy/migrate_repo/versions/038_normalise_tables.py b/ceilometer/storage/sqlalchemy/migrate_repo/versions/038_normalise_tables.py index 22b7e1246..f05a176ef 100644 --- a/ceilometer/storage/sqlalchemy/migrate_repo/versions/038_normalise_tables.py +++ b/ceilometer/storage/sqlalchemy/migrate_repo/versions/038_normalise_tables.py @@ -13,7 +13,7 @@ import hashlib import migrate -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import sqlalchemy as sa diff --git a/ceilometer/tests/alarm/test_notifier.py b/ceilometer/tests/alarm/test_notifier.py index 2e3a9a7dd..fb82a9ef9 100644 --- a/ceilometer/tests/alarm/test_notifier.py +++ b/ceilometer/tests/alarm/test_notifier.py @@ -14,9 +14,9 @@ # under the License. import mock -from oslo.serialization import jsonutils from oslo_config import fixture as fixture_config from oslo_context import context +from oslo_serialization import jsonutils from oslotest import mockpatch import requests import six.moves.urllib.parse as urlparse diff --git a/ceilometer/tests/api/v2/test_alarm_scenarios.py b/ceilometer/tests/api/v2/test_alarm_scenarios.py index 93cdcc972..1f8e5dee2 100644 --- a/ceilometer/tests/api/v2/test_alarm_scenarios.py +++ b/ceilometer/tests/api/v2/test_alarm_scenarios.py @@ -19,7 +19,7 @@ import uuid import mock import oslo.messaging.conffixture -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six from six import moves diff --git a/ceilometer/tests/api/v2/test_list_meters_scenarios.py b/ceilometer/tests/api/v2/test_list_meters_scenarios.py index 37b2c788e..8e9fffe81 100644 --- a/ceilometer/tests/api/v2/test_list_meters_scenarios.py +++ b/ceilometer/tests/api/v2/test_list_meters_scenarios.py @@ -19,7 +19,7 @@ import base64 import datetime -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import webtest.app from ceilometer.publisher import utils diff --git a/ceilometer/tests/publisher/test_utils.py b/ceilometer/tests/publisher/test_utils.py index a4eb52653..47b661134 100644 --- a/ceilometer/tests/publisher/test_utils.py +++ b/ceilometer/tests/publisher/test_utils.py @@ -14,7 +14,7 @@ # under the License. """Tests for ceilometer/publisher/utils.py """ -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslotest import base from ceilometer.publisher import utils