13 files changed, 16 insertions, 16 deletions
diff --git a/openstack/common/apiclient/base.py b/openstack/common/apiclient/base.py
index 53681d58..c0c23c00 100644
--- a/openstack/common/apiclient/base.py
+++ b/openstack/common/apiclient/base.py
@@ -40,7 +40,7 @@ Base utilities to build API operation managers and objects on top of.
 import abc
 import copy
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 from six.moves.urllib import parse
 
diff --git a/openstack/common/apiclient/client.py b/openstack/common/apiclient/client.py
index 0944650f..39595f9b 100644
--- a/openstack/common/apiclient/client.py
+++ b/openstack/common/apiclient/client.py
@@ -34,8 +34,8 @@ try:
 except ImportError:
     import json
 
-from oslo.utils import encodeutils
-from oslo.utils import importutils
+from oslo_utils import encodeutils
+from oslo_utils import importutils
 import requests
 
 from openstack.common._i18n import _
diff --git a/openstack/common/apiclient/utils.py b/openstack/common/apiclient/utils.py
index be595d61..c713d622 100644
--- a/openstack/common/apiclient/utils.py
+++ b/openstack/common/apiclient/utils.py
@@ -24,7 +24,7 @@
 #
 ########################################################################
 
-from oslo.utils import encodeutils
+from oslo_utils import encodeutils
 from oslo_utils import uuidutils
 import six
 
diff --git a/openstack/common/cache/_backends/memory.py b/openstack/common/cache/_backends/memory.py
index 03062cb8..f784479c 100644
--- a/openstack/common/cache/_backends/memory.py
+++ b/openstack/common/cache/_backends/memory.py
@@ -14,8 +14,8 @@
 
 import collections
 
-from oslo.utils import timeutils
 from oslo_concurrency import lockutils
+from oslo_utils import timeutils
 
 from openstack.common.cache import backends
 
diff --git a/openstack/common/cliutils.py b/openstack/common/cliutils.py
index 495313e7..96b4fedc 100644
--- a/openstack/common/cliutils.py
+++ b/openstack/common/cliutils.py
@@ -24,8 +24,8 @@ import os
 import sys
 import textwrap
 
-from oslo.utils import encodeutils
-from oslo.utils import strutils
+from oslo_utils import encodeutils
+from oslo_utils import strutils
 import prettytable
 import six
 from six import moves
diff --git a/openstack/common/crypto/utils.py b/openstack/common/crypto/utils.py
index 30c64cb0..e3b7a87e 100644
--- a/openstack/common/crypto/utils.py
+++ b/openstack/common/crypto/utils.py
@@ -29,7 +29,7 @@ import base64
 
 from Crypto.Hash import HMAC
 from Crypto import Random
-from oslo.utils import importutils
+from oslo_utils import importutils
 import six
 
 from openstack.common._i18n import _
diff --git a/openstack/common/fileutils.py b/openstack/common/fileutils.py
index 6cacf22b..9097c35d 100644
--- a/openstack/common/fileutils.py
+++ b/openstack/common/fileutils.py
@@ -20,7 +20,7 @@ import os
 import stat
 import tempfile
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 LOG = logging.getLogger(__name__)
 
diff --git a/openstack/common/imageutils.py b/openstack/common/imageutils.py
index 459d6b65..7d78d113 100644
--- a/openstack/common/imageutils.py
+++ b/openstack/common/imageutils.py
@@ -21,7 +21,7 @@ Helper methods to deal with images.
 
 import re
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 
 from openstack.common._i18n import _
 
diff --git a/openstack/common/memorycache.py b/openstack/common/memorycache.py
index 91e107fa..e72c26df 100644
--- a/openstack/common/memorycache.py
+++ b/openstack/common/memorycache.py
@@ -18,8 +18,8 @@
 
 import copy
 
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import timeutils
 
 memcache_opts = [
     cfg.ListOpt('memcached_servers',
diff --git a/openstack/common/quota.py b/openstack/common/quota.py
index 5634f094..54cac7d1 100644
--- a/openstack/common/quota.py
+++ b/openstack/common/quota.py
@@ -20,9 +20,9 @@ import copy
 import datetime
 import logging
 
-from oslo.utils import importutils
-from oslo.utils import timeutils
 from oslo_config import cfg
+from oslo_utils import importutils
+from oslo_utils import timeutils
 import six
 
 from openstack.common._i18n import _, _LE
diff --git a/openstack/common/report/guru_meditation_report.py b/openstack/common/report/guru_meditation_report.py
index 6f4a6530..b5ccb002 100644
--- a/openstack/common/report/guru_meditation_report.py
+++ b/openstack/common/report/guru_meditation_report.py
@@ -56,7 +56,7 @@ import os
 import signal
 import sys
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from openstack.common.report.generators import conf as cgen
 from openstack.common.report.generators import threading as tgen
diff --git a/openstack/common/scheduler/filters/extra_specs_ops.py b/openstack/common/scheduler/filters/extra_specs_ops.py
index 54450d36..735e3037 100644
--- a/openstack/common/scheduler/filters/extra_specs_ops.py
+++ b/openstack/common/scheduler/filters/extra_specs_ops.py
@@ -15,7 +15,7 @@
 
 import operator
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 
 # 1. The following operations are supported:
 #   =, s==, s!=, s>=, s>, s<=, s<, <in>, <is>, <or>, ==, !=, >=, <=
diff --git a/tests/unit/reports/test_guru_meditation_report.py b/tests/unit/reports/test_guru_meditation_report.py
index 11b2df45..3b9dc3d4 100644
--- a/tests/unit/reports/test_guru_meditation_report.py
+++ b/tests/unit/reports/test_guru_meditation_report.py
@@ -150,7 +150,7 @@ class TestGuruMeditationReport(base.BaseTestCase):
         os.kill(os.getpid(), signal.SIGUSR1)
         self.assertIn('Guru Meditation', sys.stderr.getvalue())
 
-    @mock.patch('oslo.utils.timeutils.strtime', return_value="NOW")
+    @mock.patch('oslo_utils.timeutils.strtime', return_value="NOW")
     def test_register_autorun_log_dir(self, mock_strtime):
         log_dir = self.useFixture(fixtures.TempDir()).path
         gmr.TextGuruMeditation.setup_autorun(