Switch to non-namespaced module imports

Looks like we missed a few

Change-Id: I803c09170c9dbc9439d71259f6b632c4cbb6037f

oslo_vmware/_i18n.py

@@ -16,10 +16,10 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 
 """
 
-from oslo import i18n
+import oslo_i18n
 
 
-_translators = i18n.TranslatorFactory(domain='oslo.vmware')
+_translators = oslo_i18n.TranslatorFactory(domain='oslo.vmware')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary

oslo_vmware/api.py

@@ -24,9 +24,9 @@ in case of connection problems or server API call overload.
 import logging
 
 from oslo_concurrency import lockutils
+from oslo_utils import excutils
 import six
 
-from oslo.utils import excutils
 from oslo_vmware._i18n import _, _LE, _LI, _LW
 from oslo_vmware.common import loopingcall
 from oslo_vmware import exceptions

oslo_vmware/common/loopingcall.py

@@ -20,8 +20,8 @@ import sys
 
 from eventlet import event
 from eventlet import greenthread
+from oslo_utils import timeutils
 
-from oslo.utils import timeutils
 from oslo_vmware._i18n import _LE, _LW
 
 LOG = logging.getLogger(__name__)

oslo_vmware/rw_handles.py

@@ -24,13 +24,13 @@ glance server.
 import logging
 import ssl
 
+from oslo_utils import excutils
+from oslo_utils import netutils
 import requests
 import six
 import six.moves.urllib.parse as urlparse
 from urllib3 import connection as httplib
 
-from oslo.utils import excutils
-from oslo.utils import netutils
 from oslo_vmware._i18n import _, _LE, _LW
 from oslo_vmware import exceptions
 from oslo_vmware import vim_util

oslo_vmware/service.py

@@ -21,6 +21,7 @@ import logging
 import os
 
 import netaddr
+from oslo_utils import timeutils
 import requests
 import six
 import six.moves.http_client as httplib
@@ -30,7 +31,6 @@ from suds import client
 from suds import plugin
 from suds import transport
 
-from oslo.utils import timeutils
 from oslo_vmware._i18n import _
 from oslo_vmware import exceptions
 from oslo_vmware import vim_util

oslo_vmware/tests/objects/test_datastore.py

@@ -13,9 +13,9 @@
 #    under the License.
 
 import mock
+from oslo_utils import units
 import six.moves.urllib.parse as urlparse
 
-from oslo.utils import units
 from oslo_vmware import constants
 from oslo_vmware.objects import datastore
 from oslo_vmware.tests import base

oslo_vmware/tests/test_service.py

@@ -392,7 +392,7 @@ class MemoryCacheTest(base.TestCase):
         cache2 = service.Service().client.options.cache
         self.assertIs(cache1, cache2)
 
-    @mock.patch('oslo.utils.timeutils.utcnow_ts')
+    @mock.patch('oslo_utils.timeutils.utcnow_ts')
     def test_cache_timeout(self, mock_utcnow_ts):
         mock_utcnow_ts.side_effect = [100, 125, 150, 175, 195, 200, 225]
 

oslo_vmware/vim_util.py

@@ -19,9 +19,9 @@ The VMware API utility module.
 
 import logging
 
+from oslo_utils import timeutils
 from suds import sudsobject
 
-from oslo.utils import timeutils
 from oslo_vmware._i18n import _LW
 
 

tests/objects/test_datastore.py

@@ -13,9 +13,9 @@
 #    under the License.
 
 import mock
+from oslo_utils import units
 import six.moves.urllib.parse as urlparse
 
-from oslo.utils import units
 from oslo.vmware import constants
 from oslo.vmware.objects import datastore
 from oslo.vmware import vim_util

tests/test_service.py

@@ -359,7 +359,7 @@ class MemoryCacheTest(base.TestCase):
         cache2 = service.Service().client.options.cache
         self.assertIs(cache1, cache2)
 
-    @mock.patch('oslo.utils.timeutils.utcnow_ts')
+    @mock.patch('oslo_utils.timeutils.utcnow_ts')
     def test_cache_timeout(self, mock_utcnow_ts):
         mock_utcnow_ts.side_effect = [100, 125, 150, 175, 195, 200, 225]