From 0bcd309b75c6fd5c2706d0b9588b4f3641bdf94a Mon Sep 17 00:00:00 2001
From: Ghe Rivero <ghe@rivero.io>
Date: Fri, 10 Oct 2014 08:28:20 +0000
Subject: [PATCH] Migration to oslo.serialization

oslo.serialization library has graduated and now provides
all the jsonutils API that was available in oslo-incubator.

Change-Id: Ie80d58db4a96a10a57f975984fe69dead95c6d63
---
 ironic/common/glance_service/service_utils.py | 2 +-
 ironic/common/rpc.py                          | 3 ++-
 ironic/drivers/modules/agent_client.py        | 2 +-
 ironic/tests/drivers/test_pxe.py              | 2 +-
 ironic/tests/test_glance_service.py           | 2 +-
 openstack-common.conf                         | 1 -
 requirements.txt                              | 1 +
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ironic/common/glance_service/service_utils.py b/ironic/common/glance_service/service_utils.py
index c402f9e4cc..849d088993 100644
--- a/ironic/common/glance_service/service_utils.py
+++ b/ironic/common/glance_service/service_utils.py
@@ -18,12 +18,12 @@ import copy
 import logging
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 from oslo.utils import timeutils
 import six
 import six.moves.urllib.parse as urlparse
 
 from ironic.common import exception
-from ironic.openstack.common import jsonutils
 
 
 CONF = cfg.CONF
diff --git a/ironic/common/rpc.py b/ironic/common/rpc.py
index dc849659a1..613918892e 100644
--- a/ironic/common/rpc.py
+++ b/ironic/common/rpc.py
@@ -29,10 +29,11 @@ __all__ = [
 
 from oslo.config import cfg
 from oslo import messaging
+from oslo.serialization import jsonutils
 
 from ironic.common import context as ironic_context
 from ironic.common import exception
-from ironic.openstack.common import jsonutils
+
 
 CONF = cfg.CONF
 TRANSPORT = None
diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py
index b07b29be96..41f8fe613f 100644
--- a/ironic/drivers/modules/agent_client.py
+++ b/ironic/drivers/modules/agent_client.py
@@ -13,11 +13,11 @@
 # limitations under the License.
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 import requests
 
 from ironic.common import exception
 from ironic.common.i18n import _
-from ironic.openstack.common import jsonutils
 from ironic.openstack.common import log
 
 agent_opts = [
diff --git a/ironic/tests/drivers/test_pxe.py b/ironic/tests/drivers/test_pxe.py
index 8deb9870eb..75dc5d0304 100644
--- a/ironic/tests/drivers/test_pxe.py
+++ b/ironic/tests/drivers/test_pxe.py
@@ -23,6 +23,7 @@ import os
 import tempfile
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils as json
 
 from ironic.common import dhcp_factory
 from ironic.common import exception
@@ -37,7 +38,6 @@ from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules import iscsi_deploy
 from ironic.drivers.modules import pxe
 from ironic.openstack.common import fileutils
-from ironic.openstack.common import jsonutils as json
 from ironic.tests.conductor import utils as mgr_utils
 from ironic.tests.db import base as db_base
 from ironic.tests.db import utils as db_utils
diff --git a/ironic/tests/test_glance_service.py b/ironic/tests/test_glance_service.py
index 57eaa00837..44abd85c57 100644
--- a/ironic/tests/test_glance_service.py
+++ b/ironic/tests/test_glance_service.py
@@ -28,12 +28,12 @@ from ironic.common.glance_service import base_image_service
 from ironic.common.glance_service import service_utils
 from ironic.common import image_service as service
 from ironic.openstack.common import context
-from ironic.openstack.common import jsonutils
 from ironic.tests import base
 from ironic.tests import matchers
 from ironic.tests import stubs
 
 from oslo.config import cfg
+from oslo.serialization import jsonutils
 
 CONF = cfg.CONF
 
diff --git a/openstack-common.conf b/openstack-common.conf
index fa6f2ddccc..c6c6d49b81 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -6,7 +6,6 @@ module=context
 module=fileutils
 module=gettextutils
 module=imageutils
-module=jsonutils
 module=lockutils
 module=log
 module=loopingcall
diff --git a/requirements.txt b/requirements.txt
index a0e2676053..e6dfe08b5d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,6 +26,7 @@ oslo.config>=1.4.0  # Apache-2.0
 oslo.db>=1.0.0  # Apache-2.0
 oslo.rootwrap>=1.3.0
 oslo.i18n>=1.0.0  # Apache-2.0
+oslo.serialization>=1.0.0               # Apache-2.0
 oslo.utils>=1.0.0                       # Apache-2.0
 pecan>=0.5.0
 six>=1.7.0