Switch to using 'oslo_utils' vs 'oslo.utils'

Prefer the non-deprecated 'oslo_utils' instead of
the namespaced 'oslo.utils' wherever it was previously
used.

Change-Id: I9a78150ef5266e1ff22147278162fe3cfe1b2e3f

taskflow/atom.py

@@ -15,7 +15,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 from taskflow import exceptions

taskflow/engines/action_engine/engine.py

@@ -19,7 +19,7 @@ import contextlib
 import threading
 
 from concurrent import futures
-from oslo.utils import excutils
+from oslo_utils import excutils
 import six
 
 from taskflow.engines.action_engine import compiler

taskflow/engines/action_engine/executor.py

@@ -20,10 +20,10 @@ from multiprocessing import managers
 import os
 import pickle
 
-from oslo.utils import excutils
-from oslo.utils import reflection
-from oslo.utils import timeutils
-from oslo.utils import uuidutils
+from oslo_utils import excutils
+from oslo_utils import reflection
+from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import six
 from six.moves import queue as compat_queue
 

taskflow/engines/helpers.py

@@ -18,8 +18,8 @@ import contextlib
 import itertools
 import traceback
 
-from oslo.utils import importutils
-from oslo.utils import reflection
+from oslo_utils import importutils
+from oslo_utils import reflection
 import six
 import stevedore.driver
 

taskflow/engines/worker_based/endpoint.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 
 from taskflow.engines.action_engine import executor
 

taskflow/engines/worker_based/executor.py

@@ -17,8 +17,8 @@
 import functools
 import threading
 
-from oslo.utils import reflection
-from oslo.utils import timeutils
+from oslo_utils import reflection
+from oslo_utils import timeutils
 
 from taskflow.engines.action_engine import executor
 from taskflow.engines.worker_based import cache

taskflow/engines/worker_based/protocol.py

@@ -20,8 +20,8 @@ import threading
 from concurrent import futures
 import jsonschema
 from jsonschema import exceptions as schema_exc
-from oslo.utils import reflection
-from oslo.utils import timeutils
+from oslo_utils import reflection
+from oslo_utils import timeutils
 import six
 
 from taskflow.engines.action_engine import executor

taskflow/engines/worker_based/worker.py

@@ -21,7 +21,7 @@ import string
 import sys
 
 from concurrent import futures
-from oslo.utils import reflection
+from oslo_utils import reflection
 
 from taskflow.engines.worker_based import endpoint
 from taskflow.engines.worker_based import server

taskflow/examples/create_parallel_volume.py

@@ -28,7 +28,7 @@ top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                        os.pardir))
 sys.path.insert(0, top_dir)
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 
 from taskflow import engines
 from taskflow.listeners import printing

taskflow/examples/fake_billing.py

@@ -27,7 +27,7 @@ top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                        os.pardir))
 sys.path.insert(0, top_dir)
 
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from taskflow import engines
 from taskflow.listeners import printing

taskflow/examples/resume_vm_boot.py

@@ -31,7 +31,7 @@ top_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
 sys.path.insert(0, top_dir)
 sys.path.insert(0, self_dir)
 
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from taskflow import engines
 from taskflow import exceptions as exc

taskflow/flow.py

@@ -16,7 +16,7 @@
 
 import abc
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 # Link metadata keys that have inherent/special meaning.

taskflow/jobs/backends/impl_zookeeper.py

@@ -24,8 +24,8 @@ from kazoo import exceptions as k_exceptions
 from kazoo.protocol import paths as k_paths
 from kazoo.recipe import watchers
 from oslo.serialization import jsonutils
-from oslo.utils import excutils
-from oslo.utils import uuidutils
+from oslo_utils import excutils
+from oslo_utils import uuidutils
 import six
 
 from taskflow import exceptions as excp

taskflow/jobs/job.py

@@ -17,7 +17,7 @@
 
 import abc
 
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 import six
 
 

taskflow/listeners/base.py

@@ -18,7 +18,7 @@ from __future__ import absolute_import
 
 import abc
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 import six
 
 from taskflow import logging

taskflow/persistence/backends/impl_sqlalchemy.py

@@ -24,7 +24,7 @@ import copy
 import functools
 import time
 
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 import sqlalchemy as sa
 from sqlalchemy import exc as sa_exc

taskflow/persistence/backends/sqlalchemy/models.py

@@ -16,8 +16,8 @@
 #    under the License.
 
 from oslo.serialization import jsonutils
-from oslo.utils import timeutils
-from oslo.utils import uuidutils
+from oslo_utils import timeutils
+from oslo_utils import uuidutils
 from sqlalchemy import Column, String, DateTime, Enum
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import ForeignKey

taskflow/persistence/logbook.py

@@ -18,8 +18,8 @@
 import abc
 import copy
 
-from oslo.utils import timeutils
-from oslo.utils import uuidutils
+from oslo_utils import timeutils
+from oslo_utils import uuidutils
 import six
 
 from taskflow import exceptions as exc

taskflow/storage.py

@@ -17,8 +17,8 @@
 import abc
 import contextlib
 
-from oslo.utils import reflection
-from oslo.utils import uuidutils
+from oslo_utils import reflection
+from oslo_utils import uuidutils
 import six
 
 from taskflow import exceptions

taskflow/task.py

@@ -18,7 +18,7 @@
 import abc
 import copy
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 from taskflow import atom

taskflow/tests/unit/jobs/base.py

@@ -18,7 +18,7 @@ import contextlib
 import time
 
 from kazoo.recipe import watchers
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from taskflow import exceptions as excp
 from taskflow.persistence.backends import impl_dir

taskflow/tests/unit/jobs/test_zk_job.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 from oslo.serialization import jsonutils
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 import six
 import testtools
 from zake import fake_client

taskflow/tests/unit/persistence/base.py

@@ -16,7 +16,7 @@
 
 import contextlib
 
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from taskflow import exceptions as exc
 from taskflow.persistence import logbook

taskflow/tests/unit/persistence/test_zk_persistence.py

@@ -17,7 +17,7 @@
 import contextlib
 
 from kazoo import exceptions as kazoo_exceptions
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 import testtools
 from zake import fake_client
 

taskflow/tests/unit/test_engine_helpers.py

@@ -81,7 +81,7 @@ class FlowFromDetailTestCase(test.TestCase):
         _lb, flow_detail = p_utils.temporary_flow_detail()
         flow_detail.meta = dict(factory=dict(name=name))
 
-        with mock.patch('oslo.utils.importutils.import_class',
+        with mock.patch('oslo_utils.importutils.import_class',
                         return_value=lambda: 'RESULT') as mock_import:
             result = taskflow.engines.flow_from_detail(flow_detail)
             mock_import.assert_called_onec_with(name)
@@ -92,7 +92,7 @@ class FlowFromDetailTestCase(test.TestCase):
         _lb, flow_detail = p_utils.temporary_flow_detail()
         flow_detail.meta = dict(factory=dict(name=name, args=['foo']))
 
-        with mock.patch('oslo.utils.importutils.import_class',
+        with mock.patch('oslo_utils.importutils.import_class',
                         return_value=lambda x: 'RESULT %s' % x) as mock_import:
             result = taskflow.engines.flow_from_detail(flow_detail)
             mock_import.assert_called_onec_with(name)

taskflow/tests/unit/test_listeners.py

@@ -19,7 +19,7 @@ import logging
 import time
 
 from oslo.serialization import jsonutils
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 from zake import fake_client
 

taskflow/tests/unit/test_storage.py

@@ -17,7 +17,7 @@
 import contextlib
 import threading
 
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from taskflow import exceptions
 from taskflow.persistence import backends

taskflow/tests/unit/test_types.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 import networkx as nx
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 
 from taskflow import exceptions as excp

taskflow/tests/unit/worker_based/test_endpoint.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 
 from taskflow.engines.worker_based import endpoint as ep
 from taskflow import task

taskflow/tests/unit/worker_based/test_executor.py

@@ -17,7 +17,7 @@
 import time
 
 from concurrent import futures
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from taskflow.engines.worker_based import executor
 from taskflow.engines.worker_based import protocol as pr

taskflow/tests/unit/worker_based/test_message_pump.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from taskflow.engines.worker_based import protocol as pr
 from taskflow.engines.worker_based import proxy

taskflow/tests/unit/worker_based/test_pipeline.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 from concurrent import futures
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 from taskflow.engines.action_engine import executor as base_executor
 from taskflow.engines.worker_based import endpoint

taskflow/tests/unit/worker_based/test_protocol.py

@@ -15,8 +15,8 @@
 #    under the License.
 
 from concurrent import futures
-from oslo.utils import timeutils
-from oslo.utils import uuidutils
+from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from taskflow.engines.action_engine import executor
 from taskflow.engines.worker_based import protocol as pr

taskflow/tests/unit/worker_based/test_worker.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 from taskflow.engines.worker_based import endpoint

taskflow/types/cache.py

@@ -16,7 +16,7 @@
 
 import threading
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 

taskflow/types/failure.py

@@ -19,7 +19,7 @@ import os
 import sys
 import traceback
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 from taskflow import exceptions as exc

taskflow/types/notifier.py

@@ -19,7 +19,7 @@ import contextlib
 import copy
 import logging
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 LOG = logging.getLogger(__name__)

taskflow/types/timing.py

@@ -14,8 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.utils import reflection
-from oslo.utils import timeutils
+from oslo_utils import reflection
+from oslo_utils import timeutils
 
 from taskflow.utils import threading_utils
 

taskflow/utils/deprecation.py

@@ -17,7 +17,7 @@
 import functools
 import warnings
 
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 
 _CLASS_MOVED_PREFIX_TPL = "Class '%s' has moved to '%s'"

taskflow/utils/kazoo_utils.py

@@ -16,7 +16,7 @@
 
 from kazoo import client
 from kazoo import exceptions as k_exc
-from oslo.utils import reflection
+from oslo_utils import reflection
 import six
 from six.moves import zip as compat_zip
 

taskflow/utils/misc.py

@@ -26,9 +26,9 @@ import threading
 import types
 
 from oslo.serialization import jsonutils
-from oslo.utils import importutils
-from oslo.utils import netutils
-from oslo.utils import reflection
+from oslo_utils import importutils
+from oslo_utils import netutils
+from oslo_utils import reflection
 import six
 from six.moves import map as compat_map
 from six.moves import range as compat_range

taskflow/utils/persistence_utils.py

@@ -17,8 +17,8 @@
 import contextlib
 import os
 
-from oslo.utils import timeutils
-from oslo.utils import uuidutils
+from oslo_utils import timeutils
+from oslo_utils import uuidutils
 
 from taskflow import logging
 from taskflow.persistence import logbook