Merge "Drop use of 'oslo' namespace package"

murano/api/middleware/context.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 murano.common.i18n import _
 from murano.common import wsgi

murano/api/middleware/fault.py

@@ -17,7 +17,7 @@ Cinder's faultwrapper
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 import webob
 
 from murano.common import wsgi

murano/api/middleware/version_negotiation.py

@@ -18,7 +18,7 @@ and/or Accept headers and attempts to negotiate an API controller to
 return
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from murano.api import versions
 from murano.common import wsgi

murano/api/v1/catalog.py

@@ -18,8 +18,8 @@ import os
 import tempfile
 
 import jsonschema
-from oslo.config import cfg
-from oslo.db import exception as db_exc
+from oslo_config import cfg
+from oslo_db import exception as db_exc
 from webob import exc
 
 import murano.api.v1

murano/api/v1/environments.py

@@ -14,7 +14,7 @@
 
 import re
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 from sqlalchemy import desc
 from webob import exc
 

murano/api/v1/templates.py

@@ -12,7 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 from webob import exc
 
 from murano.api.v1 import environments as envs_api

murano/api/versions.py

@@ -14,8 +14,8 @@
 
 import httplib
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 import webob.dec
 
 from murano.common import wsgi

murano/cmd/db_manage.py

@@ -10,8 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
-from oslo.db import options
+from oslo_config import cfg
+from oslo_db import options
 
 from murano.db.migration import migration
 from murano.openstack.common import log

murano/cmd/manage.py

@@ -21,8 +21,8 @@
 import sys
 import traceback
 
-from oslo.config import cfg
-from oslo.db import exception as db_exception
+from oslo_config import cfg
+from oslo_db import exception as db_exception
 
 from murano.common import consts
 from murano.db.catalog import api as db_catalog_api

murano/common/auth_utils.py

@@ -14,8 +14,8 @@
 
 
 from keystoneclient.v3 import client as ks_client
-from oslo.config import cfg
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_utils import importutils
 
 
 def get_client(token, tenant_id):

murano/common/config.py

@@ -22,7 +22,7 @@ import logging.handlers
 import os
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 from paste import deploy
 
 from murano.common.i18n import _

murano/common/engine.py

@@ -17,9 +17,9 @@ import traceback
 import uuid
 
 import eventlet.debug
-from oslo import messaging
-from oslo.messaging import target
-from oslo.serialization import jsonutils
+import oslo_messaging as messaging
+from oslo_messaging import target
+from oslo_serialization import jsonutils
 
 from murano.common import auth_utils
 from murano.common import config

murano/common/messaging/message.py

@@ -15,7 +15,7 @@
 
 import logging
 
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 
 log = logging.getLogger("murano-common.messaging")
 

murano/common/messaging/mqclient.py

@@ -18,7 +18,7 @@ import ssl as ssl_module
 
 from eventlet import patcher
 kombu = patcher.import_patched('kombu')
-from oslo.serialization import jsonutils
+from oslo_serialization import jsonutils
 from subscription import Subscription
 
 

murano/common/policy.py

@@ -14,7 +14,7 @@
 
 # Based on designate/policy.py
 
-from oslo.config import cfg
+from oslo_config import cfg
 from webob import exc as exceptions
 
 from murano.common.i18n import _

murano/common/rpc.py

@@ -12,9 +12,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo import messaging
-from oslo.messaging import rpc
-from oslo.messaging import target
+import oslo_messaging as messaging
+from oslo_messaging import rpc
+from oslo_messaging import target
 
 from murano.common import config
 

murano/common/server.py

@@ -14,10 +14,10 @@
 
 import uuid
 
-from oslo import messaging
-from oslo.messaging.notify import dispatcher as oslo_dispatcher
-from oslo.messaging import target
-from oslo.utils import timeutils
+import oslo_messaging as messaging
+from oslo_messaging.notify import dispatcher as oslo_dispatcher
+from oslo_messaging import target
+from oslo_utils import timeutils
 from sqlalchemy import desc
 
 from murano.common import config

murano/common/wsgi.py

@@ -28,8 +28,8 @@ import eventlet
 eventlet.patcher.monkey_patch(all=False, socket=True)
 import eventlet.wsgi
 import jsonschema
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 import routes
 import routes.middleware
 import webob.dec

murano/db/catalog/api.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
-from oslo.db.sqlalchemy import utils
+from oslo_config import cfg
+from oslo_db.sqlalchemy import utils
 import sqlalchemy as sa
 from sqlalchemy import or_
 from sqlalchemy.orm import attributes

murano/db/migration/alembic_migrations/versions/001_inital_version.py

@@ -26,7 +26,7 @@ down_revision = None
 import uuid
 
 from alembic import op
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import sqlalchemy as sa
 from sqlalchemy.sql.expression import table as sa_table
 

murano/db/models.py

@@ -15,8 +15,8 @@
 """
 SQLAlchemy models for murano data
 """
-from oslo.db.sqlalchemy import models
-from oslo.utils import timeutils
+from oslo_db.sqlalchemy import models
+from oslo_utils import timeutils
 import sqlalchemy as sa
 from sqlalchemy.ext import declarative
 from sqlalchemy import orm as sa_orm

murano/db/services/core_services.py

@@ -14,7 +14,7 @@
 
 import types
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 from webob import exc
 
 from murano.common.i18n import _

murano/db/services/environment_templates.py

@@ -17,7 +17,7 @@ from murano.db import models
 from murano.db import session as db_session
 from murano.openstack.common import log as logging
 
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 
 LOG = logging.getLogger(__name__)
 

murano/db/services/instances.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.db import exception
-from oslo.utils import timeutils
+from oslo_db import exception
+from oslo_utils import timeutils
 import sqlalchemy
 from sqlalchemy.sql import func
 

murano/db/session.py

@@ -15,10 +15,10 @@
 """Session management functions."""
 import threading
 
-from oslo.db import exception
-from oslo.db import options
-from oslo.db.sqlalchemy import session as db_session
-from oslo.utils import timeutils
+from oslo_db import exception
+from oslo_db import options
+from oslo_db.sqlalchemy import session as db_session
+from oslo_utils import timeutils
 
 from murano.common import config
 from murano.db.models import Lock

murano/db/sqla/types.py

@@ -10,7 +10,7 @@
 #    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
 

murano/engine/client_manager.py

@@ -17,7 +17,7 @@ import heatclient.client as hclient
 import keystoneclient
 import muranoclient.v1.client as muranoclient
 import neutronclient.v2_0.client as nclient
-from oslo.config import cfg
+from oslo_config import cfg
 
 from murano.common import auth_utils
 from murano.common import config

murano/engine/package_class_loader.py

@@ -17,7 +17,7 @@ import json
 import os.path
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 import yaml
 
 from murano.dsl import class_loader

murano/engine/system/instance_reporter.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo import messaging
+import oslo_messaging as messaging
 
 from murano.common import config
 from murano.common import uuidutils

murano/engine/system/net_explorer.py

@@ -16,7 +16,7 @@ import math
 
 import netaddr
 from netaddr.strategy import ipv4
-from oslo.utils import uuidutils
+from oslo_utils import uuidutils
 
 import murano.common.config as config
 import murano.dsl.helpers as helpers

murano/engine/system/status_reporter.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo import messaging
+import oslo_messaging as messaging
 
 from murano.common import config
 from murano.common import uuidutils

murano/openstack/common/_i18n.py

@@ -17,14 +17,14 @@ See http://docs.openstack.org/developer/oslo.i18n/usage.html
 """
 
 try:
-    import oslo.i18n
+    import oslo_i18n
 
     # NOTE(dhellmann): This reference to o-s-l-o will be replaced by the
     # application name when this module is synced into the separate
     # repository. It is OK to have more than one translation function
     # using the same domain, since there will still only be one message
     # catalog.
-    _translators = oslo.i18n.TranslatorFactory(domain='murano')
+    _translators = oslo_i18n.TranslatorFactory(domain='murano')
 
     # The primary translation function using the well-known name "_"
     _ = _translators.primary

murano/openstack/common/eventlet_backdoor.py

@@ -28,7 +28,7 @@ import traceback
 import eventlet
 import eventlet.backdoor
 import greenlet
-from oslo.config import cfg
+from oslo_config import cfg
 
 from murano.openstack.common._i18n import _LI
 from murano.openstack.common import log as logging

murano/openstack/common/fileutils.py

@@ -19,7 +19,7 @@ import logging
 import os
 import tempfile
 
-from oslo.utils import excutils
+from oslo_utils import excutils
 
 LOG = logging.getLogger(__name__)
 

murano/openstack/common/lockutils.py

@@ -26,7 +26,7 @@ import threading
 import time
 import weakref
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from murano.openstack.common import fileutils
 from murano.openstack.common._i18n import _, _LE, _LI

murano/openstack/common/log.py

@@ -38,9 +38,9 @@ import socket
 import sys
 import traceback
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
+from oslo_utils import importutils
 import six
 from six import moves
 

murano/openstack/common/policy.py

@@ -81,8 +81,8 @@ import copy
 import os
 import re
 
-from oslo.config import cfg
-from oslo.serialization import jsonutils
+from oslo_config import cfg
+from oslo_serialization import jsonutils
 import six
 import six.moves.urllib.parse as urlparse
 import six.moves.urllib.request as urlrequest

murano/openstack/common/processutils.py

@@ -27,7 +27,7 @@ import signal
 
 from eventlet.green import subprocess
 from eventlet import greenthread
-from oslo.utils import strutils
+from oslo_utils import strutils
 import six
 
 from murano.openstack.common._i18n import _

murano/openstack/common/service.py

@@ -35,7 +35,7 @@ except ImportError:
 
 import eventlet
 from eventlet import event
-from oslo.config import cfg
+from oslo_config import cfg
 
 from murano.openstack.common import eventlet_backdoor
 from murano.openstack.common._i18n import _LE, _LI, _LW

murano/openstack/common/sslutils.py

@@ -16,7 +16,7 @@ import copy
 import os
 import ssl
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from murano.openstack.common._i18n import _
 

murano/tests/functional/engine/config.py

@@ -14,7 +14,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 murano_group = cfg.OptGroup(name='murano', title="murano")

murano/tests/unit/api/base.py

@@ -18,7 +18,7 @@ import urllib
 
 import fixtures
 import mock
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 import routes
 import webob
 

murano/tests/unit/api/v1/test_actions.py

@@ -15,7 +15,7 @@
 
 
 import mock
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from murano.api.v1 import actions
 from murano.common import policy

murano/tests/unit/api/v1/test_catalog.py

@@ -21,7 +21,7 @@ import os
 import uuid
 
 import mock
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from murano.api.v1 import catalog
 from murano.common import policy

murano/tests/unit/api/v1/test_env_templates.py

@@ -15,8 +15,8 @@
 
 import json
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 
 from murano.api.v1 import templates
 from murano.common import config

murano/tests/unit/api/v1/test_environments.py

@@ -15,8 +15,8 @@
 
 import json
 
-from oslo.config import cfg
-from oslo.utils import timeutils
+from oslo_config import cfg
+from oslo_utils import timeutils
 
 from murano.api.v1 import environments
 from murano.common import config

murano/tests/unit/api/v1/test_sessions.py

@@ -15,7 +15,7 @@
 
 import json
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from murano.api.v1 import environments
 from murano.api.v1 import sessions

murano/tests/unit/base.py

@@ -12,7 +12,7 @@
 # limitations under the License.
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 
 from murano.db import api as db_api

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

@@ -26,9 +26,9 @@ postgres=# create database openstack_citest with owner openstack_citest;
 import datetime
 import uuid
 
-from oslo.db import exception as db_exc
-from oslo.db.sqlalchemy import test_base
-from oslo.db.sqlalchemy import utils as db_utils
+from oslo_db import exception as db_exc
+from oslo_db.sqlalchemy import test_base
+from oslo_db.sqlalchemy import utils as db_utils
 
 from murano.db.migration import migration
 from murano.tests.unit.db.migration import test_migrations_base as base

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

@@ -29,7 +29,7 @@ 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_config import cfg
 
 from murano.common.i18n import _LE
 import murano.db.migration

murano/tests/unit/db/services/test_environments.py

@@ -13,7 +13,7 @@
 #    under the License.
 import datetime as dt
 
-from oslo.utils import timeutils
+from oslo_utils import timeutils
 
 from murano.db import models
 from murano.db.services import environments

murano/tests/unit/db/test_catalog.py

@@ -13,7 +13,7 @@
 
 import uuid
 
-from oslo.db import exception as db_exception
+from oslo_db import exception as db_exception
 from webob import exc
 
 from murano.db.catalog import api