From a52f7cf5866d6850d357fabffb59958c8d56d0c5 Mon Sep 17 00:00:00 2001
From: Amrith Kumar <amrith@tesora.com>
Date: Wed, 10 Dec 2014 13:53:33 -0500
Subject: [PATCH] Obsolete oslo-incubator modules - jsonutils (now
 oslo.serialization)

This change is part of a multi-part change set to handle obsolete and
graduated oslo modules. This commit handles the jsonutils module which
is now oslo.serialization.jsonutils. The change here is to remove it
from openstack-common.conf and point all people who used to use that
at oslo.serialization. requirements.txt has been updated to point to
this dependency.

The file jsonutils.py is not being deleted because of dependencies in
oslo-incubator.

Change has been rebased on https://review.openstack.org/#/c/129294/

Change-Id: I2a7d4c41ce77d6375fa08033514baa815a087016
Partial-Bug: #1380789
blueprint: retire-unused-oslo-incubator-modules
---
 openstack-common.conf                           | 1 -
 requirements.txt                                | 3 ++-
 trove/common/limits.py                          | 2 +-
 trove/common/wsgi.py                            | 2 +-
 trove/tests/unittests/api/common/test_limits.py | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/openstack-common.conf b/openstack-common.conf
index f8d80d966c..6f6aeb01a1 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -6,7 +6,6 @@ module=eventlet_backdoor
 module=exception
 module=fileutils
 module=gettextutils
-module=jsonutils
 module=local
 module=log
 module=loopingcall
diff --git a/requirements.txt b/requirements.txt
index 9ebb429a3d..92f6274a1e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,7 +28,8 @@ jsonschema>=2.0.0,<3.0.0
 Jinja2>=2.6  # BSD License (3 clause)
 pexpect>=3.1 # ISC License
 oslo.config>=1.4.0  # Apache-2.0
-oslo.utils>=1.1.0                       # Apache-2.0
+oslo.serialization>=1.0.0
+oslo.utils>=1.1.0
 MySQL-python
 Babel>=1.3
 six>=1.7.0
diff --git a/trove/common/limits.py b/trove/common/limits.py
index 566cd0d13f..f0cfa522b2 100644
--- a/trove/common/limits.py
+++ b/trove/common/limits.py
@@ -30,7 +30,7 @@ from oslo.utils import importutils
 
 from trove.common import cfg
 from trove.common import wsgi as base_wsgi
-from trove.openstack.common import jsonutils
+from oslo.serialization import jsonutils
 from trove.openstack.common import wsgi
 from trove.openstack.common.gettextutils import _
 
diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py
index febdc49747..05da44c83f 100644
--- a/trove/common/wsgi.py
+++ b/trove/common/wsgi.py
@@ -30,7 +30,7 @@ from trove.common import context as rd_context
 from trove.common import exception
 from trove.common import utils
 from trove.openstack.common.gettextutils import _
-from trove.openstack.common import jsonutils
+from oslo.serialization import jsonutils
 
 from trove.openstack.common import pastedeploy
 from trove.openstack.common import service
diff --git a/trove/tests/unittests/api/common/test_limits.py b/trove/tests/unittests/api/common/test_limits.py
index 396b273c90..356f667b12 100644
--- a/trove/tests/unittests/api/common/test_limits.py
+++ b/trove/tests/unittests/api/common/test_limits.py
@@ -29,7 +29,7 @@ from trove.common import limits
 from trove.common.limits import Limit
 from trove.limits import views
 from trove.limits.service import LimitsController
-from trove.openstack.common import jsonutils
+from oslo.serialization import jsonutils
 from trove.quota.quota import QUOTAS
 
 TEST_LIMITS = [