Using oslo_* instead of oslo.*

Changes:
* using oslo_config instead of oslo.config
* using oslo_concurrency instead of oslo.concurrency
* using oslo_db instead of oslo.db
* using oslo_i18n instead of oslo.i18n
* using oslo_messaging instead of oslo.messaging
* using oslo_middleware instead of oslo.middleware
* using oslo_serialization instead of oslo.serialization
* using oslo_utils instead of oslo.utils

Change-Id: Ib0f18603ca5b0885256a39a96a3620d05260a272
Closes-bug: #1414587

etc/sahara/sahara.conf.sample

@@ -70,7 +70,7 @@
 #logging_exception_prefix = %(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s
 
 # List of logger=LEVEL pairs. (list value)
-#default_log_levels = amqplib=WARN,qpid.messaging=INFO,stevedore=INFO,eventlet.wsgi.server=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,paramiko=WARN,requests=WARN,iso8601=WARN,oslo.messaging=INFO
+#default_log_levels = amqplib=WARN,qpid.messaging=INFO,stevedore=INFO,eventlet.wsgi.server=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,paramiko=WARN,requests=WARN,iso8601=WARN,oslo_messaging=INFO
 
 # Enables or disables publication of error events. (boolean value)
 #publish_errors = false

sahara/api/middleware/log_exchange.py

@@ -20,7 +20,7 @@
 from __future__ import print_function
 import sys
 
-from oslo.middleware import base
+from oslo_middleware import base
 import webob.dec
 
 

sahara/cli/sahara_all.py

@@ -21,7 +21,7 @@ patches.patch_all()
 import os
 import sys
 
-from oslo import i18n
+import oslo_i18n
 from oslo_log import log as logging
 
 
@@ -39,7 +39,7 @@ if os.path.exists(os.path.join(possible_topdir,
 # NOTE(slukjanov): i18n.enable_lazy() must be called before
 #                  sahara.utils.i18n._() is called to ensure it has the desired
 #                  lazy lookup behavior.
-i18n.enable_lazy()
+oslo_i18n.enable_lazy()
 
 
 import sahara.main as server

sahara/cli/sahara_api.py

@@ -21,7 +21,7 @@ patches.patch_all()
 import os
 import sys
 
-from oslo import i18n
+import oslo_i18n
 from oslo_log import log as logging
 
 # If ../sahara/__init__.py exists, add ../ to Python search path, so that
@@ -38,7 +38,7 @@ if os.path.exists(os.path.join(possible_topdir,
 # NOTE(slukjanov): i18n.enable_lazy() must be called before
 #                  sahara.utils.i18n._() is called to ensure it has the desired
 #                  lazy lookup behavior.
-i18n.enable_lazy()
+oslo_i18n.enable_lazy()
 
 
 import sahara.main as server

sahara/cli/sahara_engine.py

@@ -21,7 +21,7 @@ patches.patch_all()
 import os
 import sys
 
-from oslo import i18n
+import oslo_i18n
 
 
 # If ../sahara/__init__.py exists, add ../ to Python search path, so that
@@ -38,7 +38,7 @@ if os.path.exists(os.path.join(possible_topdir,
 # NOTE(slukjanov): i18n.enable_lazy() must be called before
 #                  sahara.utils.i18n._() is called to ensure it has the desired
 #                  lazy lookup behavior.
-i18n.enable_lazy()
+oslo_i18n.enable_lazy()
 
 
 from sahara.api import acl

sahara/conductor/__init__.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from sahara.conductor import api as conductor_api
 from sahara.i18n import _

sahara/conductor/api.py

@@ -15,7 +15,7 @@
 
 """Handles all requests to the conductor service."""
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara.conductor import manager

sahara/conductor/objects.py

@@ -23,7 +23,7 @@ fields via docstrings and contains implementation of helper methods.
 
 import random
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from sahara.utils import configs
 from sahara.utils import remote

sahara/config.py

@@ -15,7 +15,7 @@
 
 import itertools
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from sahara import exceptions as ex
@@ -112,7 +112,7 @@ log.set_defaults(default_log_levels=[
     'paramiko=WARN',
     'requests=WARN',
     'iso8601=WARN',
-    'oslo.messaging=INFO',
+    'oslo_messaging=INFO',
 ])
 
 

sahara/context.py

@@ -18,7 +18,7 @@ from eventlet.green import threading
 from eventlet.green import time
 from eventlet import greenpool
 from eventlet import semaphore
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_context import context
 from oslo_log import log as logging
 

sahara/db/api.py

@@ -31,9 +31,9 @@ interface.
 
 """
 
-from oslo.config import cfg
-from oslo.db import api as db_api
-from oslo.db import options
+from oslo_config import cfg
+from oslo_db import api as db_api
+from oslo_db import options
 from oslo_log import log as logging
 
 CONF = cfg.CONF

sahara/db/base.py

@@ -15,8 +15,8 @@
 
 """Base class for classes that need modular database access."""
 
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 
 
 CONF = cfg.CONF

sahara/db/migration/alembic_migrations/env.py

@@ -19,7 +19,7 @@ from __future__ import with_statement
 from logging import config as c
 
 from alembic import context
-from oslo.utils import importutils
+from oslo_utils import importutils
 from sqlalchemy import create_engine
 from sqlalchemy import pool
 

sahara/db/migration/cli.py

@@ -18,7 +18,7 @@ import os
 from alembic import command as alembic_cmd
 from alembic import config as alembic_cfg
 from alembic import util as alembic_u
-from oslo.config import cfg
+from oslo_config import cfg
 
 from sahara.i18n import _
 

sahara/db/sqlalchemy/api.py

@@ -18,9 +18,9 @@
 import sys
 import threading
 
-from oslo.config import cfg
-from oslo.db import exception as db_exc
-from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
+from oslo_db import exception as db_exc
+from oslo_db.sqlalchemy import session as db_session
 from oslo_log import log as logging
 import six
 import sqlalchemy as sa

sahara/db/sqlalchemy/model_base.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.db.sqlalchemy import models as oslo_models
+from oslo_db.sqlalchemy import models as oslo_models
 from sqlalchemy.ext import declarative
 from sqlalchemy.orm import attributes
 

sahara/db/sqlalchemy/types.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 import sqlalchemy as sa
 from sqlalchemy.dialects import mysql
 from sqlalchemy.ext import mutable

sahara/i18n.py

@@ -16,10 +16,10 @@
 # It's based on oslo.i18n usage in OpenStack Keystone project and
 # recommendations from http://docs.openstack.org/developer/oslo.i18n/usage.html
 
-from oslo import i18n
+import oslo_i18n
 
 
-_translators = i18n.TranslatorFactory(domain='sahara')
+_translators = oslo_i18n.TranslatorFactory(domain='sahara')
 
 # The primary translation function using the well-known name "_"
 _ = _translators.primary

sahara/main.py

@@ -18,7 +18,7 @@ import os
 import eventlet
 from eventlet import wsgi
 import flask
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 from oslo_log import loggers
 import six

sahara/plugins/base.py

@@ -15,7 +15,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 from stevedore import enabled

sahara/plugins/cdh/deploy.py

@@ -16,8 +16,8 @@
 import os
 import telnetlib
 
-from oslo.utils import timeutils
 from oslo_log import log as logging
+from oslo_utils import timeutils
 import six
 
 from sahara import context

sahara/plugins/hdp/ambariplugin.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor as c

sahara/plugins/hdp/clusterspec.py

@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.serialization import jsonutils as json
 from oslo_log import log as logging
+from oslo_serialization import jsonutils as json
 
 from sahara.i18n import _
 from sahara.plugins import exceptions as ex

sahara/plugins/hdp/versions/version_1_3_2/services.py

@@ -15,7 +15,7 @@
 
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 

sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import pkg_resources as pkg
 

sahara/plugins/hdp/versions/version_2_0_6/services.py

@@ -15,7 +15,7 @@
 
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import pkg_resources as pkg
 import six

sahara/plugins/mapr/util/config.py

@@ -12,7 +12,7 @@
 #  License for the specific language governing permissions and limitations
 #  under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import exceptions as ex

sahara/plugins/spark/config_helper.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/plugins/spark/plugin.py

@@ -15,7 +15,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor

sahara/plugins/spark/scaling.py

@@ -15,7 +15,7 @@
 
 import os
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 
 from sahara import context

sahara/plugins/storm/config_helper.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor as c

sahara/plugins/storm/plugin.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 import yaml

sahara/plugins/utils.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import netutils
+from oslo_utils import netutils
 from six.moves.urllib import parse as urlparse
 
 from sahara.i18n import _

sahara/plugins/vanilla/hadoop2/config.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/plugins/vanilla/hadoop2/config_helper.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from sahara import exceptions as ex
 from sahara.i18n import _

sahara/plugins/vanilla/hadoop2/scaling.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from sahara import context
 from sahara.i18n import _

sahara/plugins/vanilla/v1_2_1/config_helper.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor as c

sahara/plugins/vanilla/v1_2_1/scaling.py

@@ -15,7 +15,7 @@
 
 import os
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import six
 
 from sahara import context

sahara/plugins/vanilla/v1_2_1/versionhandler.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/plugins/vanilla/v2_4_1/config_helper.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper

sahara/plugins/vanilla/v2_4_1/versionhandler.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor

sahara/plugins/vanilla/v2_6_0/config_helper.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper

sahara/plugins/vanilla/v2_6_0/versionhandler.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor

sahara/service/api.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
-from oslo.utils import excutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import excutils
 import six
 from six.moves.urllib import parse as urlparse
 

sahara/service/direct_engine.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from novaclient import exceptions as nova_exceptions
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/service/edp/api.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor as c

sahara/service/edp/binary_retrievers/internal_swift.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 import functools
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import swiftclient
 

sahara/service/edp/job_manager.py

@@ -15,9 +15,9 @@
 
 import datetime
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
 from oslo_log import log
+from oslo_utils import timeutils
 
 from sahara import conductor as c
 from sahara import context

sahara/service/edp/job_utils.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import uuidutils
 import six
 

sahara/service/edp/oozie/engine.py

@@ -16,7 +16,7 @@
 import abc
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from sahara import conductor as c

sahara/service/edp/oozie/workflow_creator/workflow_factory.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from sahara import conductor as c

sahara/service/edp/spark/engine.py

@@ -16,7 +16,7 @@
 import os
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from sahara import conductor as c

sahara/service/heat_engine.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from heatclient import exc as heat_exc
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import conductor as c

sahara/service/networks.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/service/ops.py

@@ -16,9 +16,9 @@
 import functools
 import uuid
 
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
 
 from sahara import conductor as c
 from sahara import context

sahara/service/periodic.py

@@ -15,9 +15,9 @@
 
 import random
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
 from oslo_log import log
+from oslo_utils import timeutils
 import six
 
 from sahara import conductor as c

sahara/service/trusts.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/service/validations/base.py

@@ -16,7 +16,7 @@
 import operator
 
 import novaclient.exceptions as nova_ex
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from sahara import conductor as cond

sahara/service/validations/clusters.py

@@ -15,7 +15,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import sahara.exceptions as ex
 from sahara.i18n import _

sahara/service/validations/edp/data_source.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six.moves.urllib.parse as urlparse
 
 import sahara.exceptions as ex

sahara/service/validations/edp/job_binary.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 import sahara.exceptions as e
 import sahara.service.validations.edp.base as b

sahara/service/volumes.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
-from oslo.utils import timeutils as tu
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import timeutils as tu
 
 from sahara import conductor as c
 from sahara import context

sahara/swift/swift_helper.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import context

sahara/swift/utils.py

@@ -13,7 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+
+from oslo_config import cfg
 import six
 from six.moves.urllib import parse as urlparse
 

sahara/tests/__init__.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo import i18n
+import oslo_i18n
 
 # NOTE(slukjanov): i18n.enable_lazy() must be called before
 #                  sahara.utils.i18n._() is called to ensure it has the desired
 #                  lazy lookup behavior.
-i18n.enable_lazy()
+oslo_i18n.enable_lazy()

sahara/tests/integration/configs/config.py

@@ -18,7 +18,7 @@ from __future__ import print_function
 import os
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 def singleton(cls):

sahara/tests/integration/tests/base.py

@@ -21,7 +21,7 @@ import fixtures
 from keystoneclient.v2_0 import client as keystone_client
 from neutronclient.v2_0 import client as neutron_client
 from novaclient.v1_1 import client as nova_client
-from oslo.utils import excutils
+from oslo_utils import excutils
 from oslo_utils import uuidutils
 from oslotest import base
 from saharaclient.api import base as client_base
@@ -237,7 +237,7 @@ class ITestCase(testcase.WithAttributes, base.BaseTestCase):
         #               '172.18.168.242': ['namenode', 'jobtracker'],
         #               '172.18.168.167': ['datanode']
         #       },
-        #       'plugin_config': <oslo.config.cfg.GroupAttr object at 0x215d9d>
+        #       'plugin_config': <oslo_config.cfg.GroupAttr object at 0x215d9d>
         # }
         return {
             'cluster_id': self.cluster_id,

sahara/tests/integration/tests/check_services.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from sahara.tests.integration.tests import base
 

sahara/tests/integration/tests/cluster_configs.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from sahara.tests.integration.tests import base
 

sahara/tests/integration/tests/gating/test_hdp_gating.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 from testtools import testcase
 
 from sahara.tests.integration.configs import config as cfg

sahara/tests/integration/tests/gating/test_mapr_gating.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 from testtools import testcase
 
 from sahara.tests.integration.configs import config as cfg

sahara/tests/integration/tests/gating/test_transient_gating.py

@@ -15,7 +15,7 @@
 
 import time
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import saharaclient.api.base as sab
 from testtools import testcase
 

sahara/tests/integration/tests/map_reduce.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from sahara.tests.integration.tests import base
 

sahara/tests/integration/tests/scaling.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from sahara.tests.integration.tests import base
 

sahara/tests/integration/tests/swift.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 from sahara.tests.integration.tests import base
 

sahara/tests/tempest/scenario/data_processing/client_tests/base.py

@@ -14,7 +14,7 @@
 
 import time
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 from saharaclient.api import base as sab
 from saharaclient import client as sahara_client
 from tempest import config

sahara/tests/tempest/scenario/data_processing/client_tests/test_job_executions.py

@@ -14,7 +14,7 @@
 
 import time
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 from saharaclient.api import base as sab
 from tempest.common.utils import data_utils
 from tempest import config

sahara/tests/tempest/scenario/data_processing/config.py

@@ -16,7 +16,7 @@ from __future__ import print_function
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 def class_wrapper(cls):

sahara/tests/unit/db/migration/test_migrations.py

@@ -31,8 +31,8 @@ postgres=# create database openstack_citest with owner openstack_citest;
 
 import os
 
-from oslo.db.sqlalchemy import test_base
-from oslo.db.sqlalchemy import utils as db_utils
+from oslo_db.sqlalchemy import test_base
+from oslo_db.sqlalchemy import utils as db_utils
 
 from sahara.tests.unit.db.migration import test_migrations_base as base
 

sahara/tests/unit/db/migration/test_migrations_base.py

@@ -30,8 +30,8 @@ from alembic import command
 from alembic import config as alembic_config
 from alembic import migration
 from alembic import script as alembic_script
-from oslo.config import cfg
-from oslo.db.sqlalchemy import test_migrations as t_m
+from oslo_config import cfg
+from oslo_db.sqlalchemy import test_migrations as t_m
 from oslo_log import log as logging
 
 import sahara.db.migration
@@ -57,7 +57,7 @@ class BaseWalkMigrationTestCase(object):
 
         For migrate_repo we should set under version control our database.
         For alembic we should configure database settings. For this goal we
-        should use oslo.config and openstack.commom.db.sqlalchemy.session with
+        should use oslo_config and openstack.commom.db.sqlalchemy.session with
         database functionality (reset default settings and session cleanup).
         """
         CONF.set_override('connection', str(engine.url), group='database')

sahara/tests/unit/service/test_periodic.py

@@ -16,7 +16,7 @@
 import datetime
 
 import mock
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from sahara.conductor import manager
 from sahara import context
@@ -51,11 +51,12 @@ class TestPeriodicBack(base.SaharaWithDbTestCase):
         get_job_status.assert_has_calls([mock.call(u'2'),
                                          mock.call(u'3')])
 
-    @mock.patch('oslo.utils.timeutils.utcnow')
+    @mock.patch('oslo_utils.timeutils.utcnow')
     @mock.patch('sahara.service.ops.terminate_cluster')
     def test_cluster_terminate(self, terminate_cluster, utcnow):
 
         utcnow.return_value = datetime.datetime(2005, 2, 1, 0, 0)
+        utcnow.override_time = False
 
         ctx = context.ctx()
         job = self.api.job_create(ctx, te.SAMPLE_JOB)
@@ -83,11 +84,12 @@ class TestPeriodicBack(base.SaharaWithDbTestCase):
         self.assertEqual(terminate_cluster.call_count, 1)
         terminate_cluster.assert_has_calls([mock.call(u'1')])
 
-    @mock.patch('oslo.utils.timeutils.utcnow')
+    @mock.patch('oslo_utils.timeutils.utcnow')
     @mock.patch('sahara.service.ops.terminate_cluster')
     def test_cluster_not_killed_too_early(self, terminate_cluster, utcnow):
 
         utcnow.return_value = datetime.datetime(2005, 2, 1, second=0)
+        utcnow.override_time = False
 
         self._make_cluster('1')
 
@@ -96,11 +98,12 @@ class TestPeriodicBack(base.SaharaWithDbTestCase):
         p._make_periodic_tasks().terminate_unneeded_clusters(None)
         self.assertEqual(terminate_cluster.call_count, 0)
 
-    @mock.patch('oslo.utils.timeutils.utcnow')
+    @mock.patch('oslo_utils.timeutils.utcnow')
     @mock.patch('sahara.service.ops.terminate_cluster')
     def test_cluster_killed_in_time(self, terminate_cluster, utcnow):
 
         utcnow.return_value = datetime.datetime(2005, 2, 1, second=0)
+        utcnow.override_time = False
 
         self._make_cluster('1')
 

sahara/tests/unit/utils/notification/test_sender.py

@@ -49,7 +49,7 @@ class NotificationTest(base.SaharaTestCase):
                                    'project_id': self.ctx.tenant_id,
                                    'user_id': self.ctx.user_id})
 
-    @mock.patch('oslo.messaging.notify.notifier.Notifier.info')
+    @mock.patch('oslo_messaging.notify.notifier.Notifier.info')
     def test_update_cluster(self, mock_notify):
         self.override_config("enable_notifications", True)
         messaging.setup("fake://", optional=True)

sahara/tests/unit/utils/test_cinder.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from sahara import main
 from sahara.tests.unit import base as test_base

sahara/tests/unit/utils/test_rpc.py

@@ -42,7 +42,7 @@ class TestMessagingSetup(base.SaharaTestCase):
             messaging.TRANSPORT.cleanup()
             messaging.TRANSPORT = messaging.NOTIFIER = None
 
-    @mock.patch('oslo.messaging.set_transport_defaults')
+    @mock.patch('oslo_messaging.set_transport_defaults')
     def test_set_defaults(self, mock_transport):
         self._install()
 
@@ -53,7 +53,7 @@ class TestMessagingSetup(base.SaharaTestCase):
 
         self._remove_install()
 
-    @mock.patch('oslo.messaging.get_transport')
+    @mock.patch('oslo_messaging.get_transport')
     def test_get_transport(self, mock_transport):
         self._install()
 
@@ -64,7 +64,7 @@ class TestMessagingSetup(base.SaharaTestCase):
 
         self._remove_install()
 
-    @mock.patch('oslo.messaging.Notifier')
+    @mock.patch('oslo_messaging.Notifier')
     def test_notifier(self, mock_init):
         self._install()
 

sahara/topology/topology_helper.py

@@ -15,7 +15,7 @@
 
 import hashlib
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from sahara import context

sahara/utils/cluster_progress_ops.py

@@ -15,8 +15,8 @@
 
 import functools
 
-from oslo.utils import excutils
-from oslo.utils import timeutils
+from oslo_utils import excutils
+from oslo_utils import timeutils
 import six
 
 from sahara import conductor as c

sahara/utils/notification/sender.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara.utils import rpc as messaging

sahara/utils/openstack/base.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 from six.moves.urllib import parse as urlparse
 
 from sahara import context

sahara/utils/openstack/cinder.py

@@ -17,7 +17,7 @@
 
 from cinderclient.v1 import client as cinder_client_v1
 from cinderclient.v2 import client as cinder_client_v2
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import context

sahara/utils/openstack/heat.py

@@ -16,7 +16,7 @@
 import json
 
 from heatclient import client as heat_client
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/utils/openstack/keystone.py

@@ -15,7 +15,7 @@
 
 from keystoneclient.v2_0 import client as keystone_client
 from keystoneclient.v3 import client as keystone_client_v3
-from oslo.config import cfg
+from oslo_config import cfg
 
 from sahara import context
 from sahara.utils.openstack import base

sahara/utils/openstack/neutron.py

@@ -15,7 +15,7 @@
 
 
 from neutronclient.neutron import client as neutron_cli
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from sahara import context

sahara/utils/openstack/nova.py

@@ -15,7 +15,7 @@
 
 from novaclient import exceptions as nova_ex
 from novaclient.v1_1 import client as nova_client
-from oslo.config import cfg
+from oslo_config import cfg
 
 from sahara import context
 import sahara.utils.openstack.base as base

sahara/utils/openstack/swift.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import swiftclient
 
 from sahara.swift import swift_helper as sh

sahara/utils/proxy.py

@@ -15,7 +15,7 @@
 
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import six
 

sahara/utils/remote.py

@@ -16,7 +16,7 @@
 
 import abc
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from sahara import exceptions as ex

sahara/utils/rpc.py

@@ -14,10 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
-from oslo import messaging
-from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
+from oslo_serialization import jsonutils
 
 from sahara import context
 from sahara.i18n import _LI
@@ -92,7 +92,7 @@ class RPCServer(object):
 
 
 def setup(url=None, optional=False):
-    """Initialise the oslo.messaging layer."""
+    """Initialise the oslo_messaging layer."""
     global TRANSPORT, NOTIFIER, SERIALIZER
 
     if not cfg.CONF.enable_notifications:
@@ -117,5 +117,5 @@ def setup(url=None, optional=False):
 
 
 def get_notifier(publisher_id):
-    """Return a configured oslo.messaging notifier."""
+    """Return a configured oslo_messaging notifier."""
     return NOTIFIER.prepare(publisher_id=publisher_id)

sahara/utils/sqlatypes.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from sqlalchemy.ext import mutable
 from sqlalchemy import types as st
 

sahara/utils/ssh_remote.py

@@ -41,9 +41,9 @@ import uuid
 from eventlet.green import subprocess as e_subprocess
 from eventlet import semaphore
 from eventlet import timeout as e_timeout
-from oslo.config import cfg
-from oslo.utils import excutils
+from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_utils import excutils
 import paramiko
 import requests
 from requests import adapters