Drop use of 'oslo' namespace package

The Oslo libraries have moved all of their code out of the 'oslo'
namespace package into per-library packages. The namespace package was
retained during kilo for backwards compatibility, but will be removed by
the liberty-2 milestone. This change removes the use of the namespace
package, replacing it with the new package names.

The patches in the libraries will be put on hold until application
patches have landed, or L2, whichever comes first. At that point, new
versions of the libraries without namespace packages will be released as
a major version update.

Please merge this patch, or an equivalent, before L2 to avoid problems
with those library releases.

Blueprint: remove-namespace-packages
https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages

Change-Id: I73addc2c144c76c60f046e83c97e3b6ffe09d879

mistral/actions/openstack/action_generator/base.py

@@ -14,7 +14,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
 

mistral/actions/openstack/actions.py

@@ -21,7 +21,7 @@ from keystoneclient import httpclient
 from keystoneclient.v3 import client as keystoneclient
 from neutronclient.v2_0 import client as neutronclient
 from novaclient.v2 import client as novaclient
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from mistral.actions.openstack import base

mistral/api/access_control.py

@@ -17,7 +17,7 @@
 """Access Control API server."""
 
 from keystonemiddleware import auth_token
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 _ENFORCER = None

mistral/api/app.py

@@ -14,7 +14,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 pecan
 
 from mistral.api import access_control

mistral/cmd/launch.py

@@ -34,9 +34,9 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'mistral', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
-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 wsgiref import simple_server
 
 from mistral.api import app

mistral/config.py

@@ -20,7 +20,7 @@ Configuration options registration and useful routines.
 
 import itertools
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log
 
 from mistral import version

mistral/context.py

@@ -16,8 +16,8 @@
 
 import eventlet
 from keystoneclient.v3 import client as keystone_client
-from oslo.config import cfg
-from oslo import messaging
+from oslo_config import cfg
+import oslo_messaging as messaging
 from pecan import hooks
 
 from mistral import exceptions as exc

mistral/db/sqlalchemy/base.py

@@ -14,9 +14,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from oslo.config import cfg
-from oslo.db import options
-from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
+from oslo_db import options
+from oslo_db.sqlalchemy import session as db_session
 from oslo_log import log as logging
 
 from mistral.db.sqlalchemy import sqlite_lock

mistral/db/sqlalchemy/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
 import six
 
 from mistral.openstack.common import importutils

mistral/db/sqlalchemy/model_base.py

@@ -15,7 +15,7 @@
 #    limitations under the License.
 
 
-from oslo.db.sqlalchemy import models as oslo_models
+from oslo_db.sqlalchemy import models as oslo_models
 import sqlalchemy as sa
 from sqlalchemy import event
 from sqlalchemy.ext import declarative

mistral/db/v2/api.py

@@ -15,7 +15,7 @@
 
 import contextlib
 
-from oslo.db import api as db_api
+from oslo_db import api as db_api
 from oslo_log import log as logging
 
 _BACKEND_MAPPING = {

mistral/db/v2/sqlalchemy/api.py

@@ -16,10 +16,10 @@
 import contextlib
 import sys
 
-from oslo.config import cfg
-from oslo.db import exception as db_exc
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_db import exception as db_exc
 from oslo_log import log as logging
+from oslo_utils import timeutils
 import sqlalchemy as sa
 
 from mistral.db.sqlalchemy import base as b

mistral/engine/rpc.py

@@ -13,10 +13,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.messaging.rpc import client
+from oslo_config import cfg
 from oslo_log import log as logging
+import oslo_messaging as messaging
+from oslo_messaging.rpc import client
 
 from mistral import context as auth_ctx
 from mistral.engine import base

mistral/openstack/common/config/generator.py

@@ -27,7 +27,7 @@ import socket
 import sys
 import textwrap
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import stevedore.named
 

mistral/openstack/common/lockutils.py

@@ -27,7 +27,7 @@ import threading
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral.openstack.common import fileutils
 from mistral.openstack.common.gettextutils import _, _LE, _LI

mistral/openstack/common/periodic_task.py

@@ -14,7 +14,7 @@
 import logging
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from mistral.openstack.common.gettextutils import _, _LE, _LI

mistral/services/security.py

@@ -14,7 +14,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 mistral import context as auth_ctx
 from mistral.utils.openstack import keystone

mistral/tests/base.py

@@ -18,7 +18,7 @@ import pkg_resources as pkg
 import sys
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from oslotest import base
 import testtools.matchers as ttm

mistral/tests/unit/api/base.py

@@ -15,7 +15,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 from webtest import app as webtest_app

mistral/tests/unit/api/test_auth.py

@@ -15,7 +15,7 @@
 import datetime
 import uuid
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 

mistral/tests/unit/db/v2/test_locking.py

@@ -15,7 +15,7 @@
 
 
 import eventlet
-from oslo.config import cfg
+from oslo_config import cfg
 import random
 
 from mistral.db.sqlalchemy import sqlite_lock

mistral/tests/unit/db/v2/test_sqlalchemy_db_api.py

@@ -18,7 +18,7 @@
 import copy
 import datetime
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral import context as auth_context
 from mistral.db.v2.sqlalchemy import api as db_api

mistral/tests/unit/db/v2/test_sqlite_transactions.py

@@ -16,7 +16,7 @@
 
 import eventlet
 from eventlet import semaphore
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral.db.v2.sqlalchemy import api as db_api
 from mistral.tests import base as test_base

mistral/tests/unit/engine/base.py

@@ -13,9 +13,9 @@
 #    limitations under the License.
 
 import eventlet
-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 mistral import context as ctx
 from mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_action_context.py

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

mistral/tests/unit/engine/test_action_defaults.py

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

mistral/tests/unit/engine/test_adhoc_actions.py

@@ -12,7 +12,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 mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_commands.py

@@ -12,7 +12,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 mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_dataflow.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 mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_default_engine.py

@@ -17,7 +17,7 @@ import datetime
 import uuid
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 from oslo_messaging.rpc import client as rpc_client
 

mistral/tests/unit/engine/test_direct_workflow.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_environment.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_javascript_action.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import testtools
 

mistral/tests/unit/engine/test_join.py

@@ -12,7 +12,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 testtools
 

mistral/tests/unit/engine/test_noop_task.py

@@ -12,7 +12,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 mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_policies.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import std_actions

mistral/tests/unit/engine/test_race_condition.py

@@ -14,7 +14,7 @@
 
 from eventlet import corolocal
 from eventlet import semaphore
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import base as action_base

mistral/tests/unit/engine/test_reverse_workflow.py

@@ -12,7 +12,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 mistral.db.v2 import api as db_api

mistral/tests/unit/engine/test_subworkflows.py

@@ -14,7 +14,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import std_actions

mistral/tests/unit/engine/test_task_defaults.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import datetime as dt
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 import testtools
 

mistral/tests/unit/engine/test_with_items.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import copy
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral.actions import base as action_base

mistral/tests/unit/engine/test_workflow_resume.py

@@ -13,7 +13,7 @@
 #    limitations under the License.
 
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral.db.v2 import api as db_api
 from mistral.engine import default_engine as de

mistral/tests/unit/services/test_action_service.py

@@ -12,7 +12,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 mistral.db.v2 import api as db_api

mistral/tests/unit/services/test_trigger_service.py

@@ -14,7 +14,7 @@
 
 import datetime
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral import exceptions as exc
 from mistral.services import security

mistral/tests/unit/services/test_workbook_service.py

@@ -12,7 +12,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 mistral.db.v2 import api as db_api

mistral/tests/unit/services/test_workflow_service.py

@@ -12,7 +12,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 mistral import exceptions as exc

mistral/utils/openstack/keystone.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from keystoneclient.v3 import client as ks_client
-from oslo.config import cfg
+from oslo_config import cfg
 
 from mistral import context
 

mistral/utils/wf_trace.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 mistral.db.v2.sqlalchemy import models

mistral/workflow/data_flow.py

@@ -15,7 +15,7 @@
 
 import copy
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_log import log as logging
 
 from mistral import context as auth_ctx