diff --git a/ironic/common/glance_service/service_utils.py b/ironic/common/glance_service/service_utils.py index baa8e88407..74c5cddb2a 100644 --- a/ironic/common/glance_service/service_utils.py +++ b/ironic/common/glance_service/service_utils.py @@ -20,8 +20,8 @@ import logging import random from oslo.config import cfg -from oslo.serialization import jsonutils from oslo.utils import timeutils +from oslo_serialization import jsonutils import six import six.moves.urllib.parse as urlparse diff --git a/ironic/common/rpc.py b/ironic/common/rpc.py index 613918892e..de6f98f55b 100644 --- a/ironic/common/rpc.py +++ b/ironic/common/rpc.py @@ -29,7 +29,7 @@ __all__ = [ from oslo.config import cfg from oslo import messaging -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from ironic.common import context as ironic_context from ironic.common import exception diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py index c8801be375..5b848ad9ea 100644 --- a/ironic/drivers/modules/agent_client.py +++ b/ironic/drivers/modules/agent_client.py @@ -13,7 +13,7 @@ # limitations under the License. from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import requests from ironic.common import exception diff --git a/ironic/openstack/common/log.py b/ironic/openstack/common/log.py index 782e4d2327..5bf73f2630 100644 --- a/ironic/openstack/common/log.py +++ b/ironic/openstack/common/log.py @@ -39,7 +39,7 @@ import sys import traceback from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo.utils import importutils import six from six import moves diff --git a/ironic/openstack/common/policy.py b/ironic/openstack/common/policy.py index 1e93e87639..772fedb8c8 100644 --- a/ironic/openstack/common/policy.py +++ b/ironic/openstack/common/policy.py @@ -95,7 +95,7 @@ import os import re from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils import six import six.moves.urllib.parse as urlparse import six.moves.urllib.request as urlrequest diff --git a/ironic/tests/drivers/test_pxe.py b/ironic/tests/drivers/test_pxe.py index d1c86c5f55..5bde1f0cd7 100644 --- a/ironic/tests/drivers/test_pxe.py +++ b/ironic/tests/drivers/test_pxe.py @@ -23,7 +23,7 @@ import tempfile import fixtures import mock from oslo.config import cfg -from oslo.serialization import jsonutils as json +from oslo_serialization import jsonutils as json from ironic.common import dhcp_factory from ironic.common import exception diff --git a/ironic/tests/test_glance_service.py b/ironic/tests/test_glance_service.py index 2f8a9483f1..0ab3c14fcb 100644 --- a/ironic/tests/test_glance_service.py +++ b/ironic/tests/test_glance_service.py @@ -33,7 +33,7 @@ from ironic.tests import matchers from ironic.tests import stubs from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils CONF = cfg.CONF