From d248cca5e50798616f8dda5d36b550b3542ac6dd Mon Sep 17 00:00:00 2001
From: Anish Bhatt <anish@chelsio.com>
Date: Thu, 19 Mar 2015 01:08:06 -0700
Subject: [PATCH] Change leftover oslo.* to oslo_*

Use oslo_i18n instead of "from oslo import i18n"
Use oslo_messaging instead of "from oslo import messaging"

Partial-Bug: 1409733

Change-Id: If119603e4f89965d0c9e5917b2772ae0e7ddf3d2
---
 cinder/i18n.py         | 2 +-
 cinder/objects/base.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cinder/i18n.py b/cinder/i18n.py
index 0f120028a9b..1b3965bf0ee 100644
--- a/cinder/i18n.py
+++ b/cinder/i18n.py
@@ -18,7 +18,7 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html .
 
 """
 
-from oslo import i18n
+import oslo_i18n as i18n
 
 from cinder.openstack.common import gettextutils
 
diff --git a/cinder/objects/base.py b/cinder/objects/base.py
index 22ef47c7bb7..38cd679b80d 100644
--- a/cinder/objects/base.py
+++ b/cinder/objects/base.py
@@ -22,8 +22,8 @@ import functools
 import traceback
 
 import netaddr
-from oslo import messaging
 from oslo_log import log as logging
+import oslo_messaging as messaging
 from oslo_utils import timeutils
 import six