Switch to the oslo_log library

Remove the log module of oslo-incubator.
Move the WritableLogger wrapper to the base_wsgi module.
Add oslo.log to the requirements.

Change-Id: I724fa6090cebf40e7d7c78cc6b8458dfba9508a8

openstack-common.conf

@@ -2,7 +2,6 @@
 
 # The list of modules to copy from oslo-incubator
 module=local
-module=log
 module=notifier
 module=pastedeploy
 module=rpc

requirements.txt

@@ -41,3 +41,4 @@ six>=1.9.0
 stevedore>=1.5.0 # Apache-2.0
 oslo.messaging>=1.16.0 # Apache-2.0
 osprofiler>=0.3.0 # Apache-2.0
+oslo.log>=1.6.0 # Apache-2.0

run_tests.py

@@ -24,6 +24,7 @@ import traceback
 import urllib
 
 import eventlet
+from oslo_log import log as logging
 import proboscis
 import wsgi_intercept
 from wsgi_intercept.httplib2_intercept import install as wsgi_install
@@ -32,7 +33,6 @@ from trove.common import cfg
 from trove.common.rpc import service as rpc_service
 from trove.common.rpc import version as rpc_version
 from trove.common import utils
-from trove.openstack.common import log as logging
 from trove import rpc
 from trove.tests.config import CONFIG
 
@@ -64,7 +64,7 @@ def initialize_trove(config_file):
     cfg.CONF(args=[],
              project='trove',
              default_config_files=[config_file])
-    logging.setup(None)
+    logging.setup(CONF, None)
     topic = CONF.taskmanager_queue
     rpc.init(CONF)
 

trove/backup/models.py

@@ -14,6 +14,7 @@
 
 """Model classes that form the core of snapshots functionality."""
 
+from oslo_log import log as logging
 from sqlalchemy import desc
 from swiftclient.client import ClientException
 
@@ -25,7 +26,6 @@ from trove.common.remote import create_swift_client
 from trove.common import utils
 from trove.datastore import models as datastore_models
 from trove.db.models import DatabaseModelBase
-from trove.openstack.common import log as logging
 from trove.quota.quota import run_with_quotas
 from trove.taskmanager import api
 

trove/backup/service.py

@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.backup.models import Backup
 from trove.backup import views
 from trove.common import apischema
@@ -20,7 +22,6 @@ from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import pagination
 from trove.common import wsgi
-from trove.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/cluster/models.py

@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.cluster.tasks import ClusterTask
 from trove.cluster.tasks import ClusterTasks
 from trove.common import cfg
@@ -22,7 +24,6 @@ from trove.common.strategies.cluster import strategy
 from trove.datastore import models as datastore_models
 from trove.db import models as dbmodels
 from trove.instance import models as inst_models
-from trove.openstack.common import log as logging
 from trove.taskmanager import api as task_api
 
 

trove/cluster/service.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from oslo_config.cfg import NoSuchOptError
+from oslo_log import log as logging
 
 from trove.cluster import models
 from trove.cluster import views
@@ -26,7 +27,6 @@ from trove.common.strategies.cluster import strategy
 from trove.common import utils
 from trove.common import wsgi
 from trove.datastore import models as datastore_models
-from trove.openstack.common import log as logging
 
 
 CONF = cfg.CONF

trove/cluster/views.py

@@ -13,11 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.strategies.cluster import strategy
 from trove.common.views import create_links
 from trove.instance.views import InstanceDetailView
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/cmd/common.py

@@ -28,9 +28,11 @@ def initialize(extra_opts=None, pre_logging=None):
     # Import only the modules necessary to initialize logging and determine if
     # debug_utils are enabled.
     import sys
+
+    from oslo_log import log as logging
+
     from trove.common import cfg
     from trove.common import debug_utils
-    from trove.openstack.common import log as logging
 
     conf = cfg.CONF
     if extra_opts:
@@ -40,7 +42,7 @@ def initialize(extra_opts=None, pre_logging=None):
     if pre_logging:
         pre_logging(conf)
 
-    logging.setup(None)
+    logging.setup(conf, None)
     debug_utils.setup()
 
     # Patch 'thread' module if debug is disabled.

trove/cmd/guest.py

@@ -25,11 +25,11 @@ gettext.install('trove', unicode=1)
 import sys
 
 from oslo_config import cfg as openstack_cfg
+from oslo_log import log as logging
 from oslo_service import service as openstack_service
 
 from trove.common import cfg
 from trove.common import debug_utils
-from trove.openstack.common import log as logging
 
 CONF = cfg.CONF
 # The guest_id opt definition must match the one in common/cfg.py
@@ -39,7 +39,7 @@ CONF.register_opts([openstack_cfg.StrOpt('guest_id', default=None,
 
 def main():
     cfg.parse_args(sys.argv)
-    logging.setup(None)
+    logging.setup(CONF, None)
 
     debug_utils.setup()
 

trove/cmd/manage.py

@@ -21,6 +21,8 @@ import sys
 gettext.install('trove', unicode=1)
 
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
@@ -28,7 +30,6 @@ from trove.common import utils
 from trove.configuration import models as config_models
 from trove.datastore import models as datastore_models
 from trove.db import get_db_api
-from trove.openstack.common import log as logging
 
 
 CONF = cfg.CONF
@@ -173,7 +174,7 @@ def main():
     cfg.parse_args(sys.argv)
 
     try:
-        logging.setup(None)
+        logging.setup(CONF, None)
 
         Commands().execute()
         sys.exit(0)

trove/common/auth.py

@@ -15,13 +15,13 @@
 
 import re
 
+from oslo_log import log as logging
 from oslo_utils import strutils
 import webob.exc
 import wsgi
 
 from trove.common import exception
 from trove.common.i18n import _
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/common/base_wsgi.py

@@ -22,12 +22,14 @@ eventlet.patcher.monkey_patch(all=False, socket=True)
 
 import datetime
 import errno
+import logging as system_logging
 import socket
 import sys
 import time
 
 import eventlet.wsgi
 from oslo_config import cfg
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_service import service
 from oslo_service import sslutils
@@ -41,7 +43,6 @@ from xml.parsers import expat
 from trove.common import xmlutils
 from trove.openstack.common import exception
 from trove.openstack.common.gettextutils import _
-from trove.openstack.common import log as logging
 
 socket_opts = [
     cfg.IntOpt('backlog',
@@ -65,6 +66,17 @@ def run_server(application, port, **kwargs):
     eventlet.wsgi.server(sock, application, **kwargs)
 
 
+class WritableLogger(object):
+    """A thin wrapper that responds to `write` and logs."""
+
+    def __init__(self, logger, level=system_logging.INFO):
+        self.logger = logger
+        self.level = level
+
+    def write(self, msg):
+        self.logger.log(self.level, msg.rstrip())
+
+
 class Service(service.Service):
     """
     Provides a Service API for wsgi servers.
@@ -158,7 +170,7 @@ class Service(service.Service):
         eventlet.wsgi.server(socket,
                              application,
                              custom_pool=self.tg.pool,
-                             log=logging.WritableLogger(logger))
+                             log=WritableLogger(logger))
 
 
 class Middleware(object):

trove/common/cfg.py

@@ -18,6 +18,8 @@
 import os.path
 
 from oslo_config import cfg
+from oslo_log import log as logging
+
 import trove
 
 
@@ -977,6 +979,8 @@ CONF.register_opts(db2_opts, db2_group)
 
 CONF.register_opts(rpcapi_cap_opts, upgrade_levels)
 
+logging.register_options(CONF)
+
 
 def custom_parser(parsername, parser):
     CONF.register_cli_opt(cfg.SubCommandOpt(parsername, handler=parser))

trove/common/debug_utils.py

@@ -19,11 +19,10 @@
 import sys
 
 from oslo_config import cfg
-
-from trove.openstack.common import log
+from oslo_log import log as logging
 
 
-LOG = log.getLogger(__name__)
+LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 
 __debug_state = None

trove/common/exception.py

@@ -18,10 +18,10 @@
 import re
 
 from oslo_concurrency import processutils
+from oslo_log import log as logging
 
 from trove.common import base_exception as openstack_exception
 from trove.common.i18n import _
-from trove.openstack.common import log as logging
 
 
 ClientConnectionError = openstack_exception.ClientConnectionError

trove/common/extensions.py

@@ -16,6 +16,7 @@
 import abc
 
 from lxml import etree
+from oslo_log import log as logging
 import routes
 import six
 import stevedore
@@ -27,7 +28,6 @@ from trove.common import base_wsgi
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import wsgi
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/common/profile.py

@@ -14,13 +14,13 @@
 #    under the License.
 
 from oslo_context import context
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from osprofiler import notifier
 from osprofiler import web
 
 from trove.common import cfg
 from trove.common import i18n
-from trove.openstack.common import log as logging
 from trove import rpc
 
 

trove/common/rpc/service.py

@@ -19,6 +19,7 @@
 import inspect
 import os
 
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_service import loopingcall
 from oslo_service import service
@@ -28,7 +29,6 @@ from osprofiler import profiler
 from trove.common import cfg
 from trove.common import profile
 from trove.openstack.common.gettextutils import _
-from trove.openstack.common import log as logging
 from trove import rpc
 
 

trove/common/strategies/cluster/experimental/mongodb/api.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from novaclient import exceptions as nova_exceptions
+from oslo_log import log as logging
 
 from trove.cluster import models
 from trove.cluster.tasks import ClusterTasks
@@ -28,7 +29,6 @@ from trove.common import wsgi
 from trove.datastore import models as datastore_models
 from trove.extensions.mgmt.clusters.views import MgmtClusterView
 from trove.instance import models as inst_models
-from trove.openstack.common import log as logging
 from trove.quota.quota import check_quotas
 from trove.taskmanager import api as task_api
 

trove/common/strategies/cluster/experimental/mongodb/guestagent.py

@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.strategies.cluster import base
 from trove.guestagent import api as guest_api
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/common/strategies/cluster/experimental/mongodb/taskmanager.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 from eventlet.timeout import Timeout
+from oslo_log import log as logging
 
 from trove.common import cfg
 from trove.common.i18n import _
@@ -21,7 +22,6 @@ from trove.common.strategies.cluster import base
 from trove.common import utils
 from trove.instance.models import DBInstance
 from trove.instance.models import Instance
-from trove.openstack.common import log as logging
 from trove.taskmanager import api as task_api
 import trove.taskmanager.models as task_models
 

trove/common/strategies/cluster/experimental/vertica/api.py

@@ -12,6 +12,7 @@
 # limitations under the License.
 
 from novaclient import exceptions as nova_exceptions
+from oslo_log import log as logging
 
 from trove.cluster import models
 from trove.cluster.tasks import ClusterTasks
@@ -22,7 +23,6 @@ from trove.common import remote
 from trove.common.strategies.cluster import base
 from trove.extensions.mgmt.clusters.views import MgmtClusterView
 from trove.instance import models as inst_models
-from trove.openstack.common import log as logging
 from trove.quota.quota import check_quotas
 from trove.taskmanager import api as task_api
 

trove/common/strategies/cluster/experimental/vertica/guestagent.py

@@ -11,10 +11,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.strategies.cluster import base
 from trove.guestagent import api as guest_api
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/common/strategies/cluster/experimental/vertica/taskmanager.py

@@ -12,13 +12,13 @@
 # limitations under the License.
 
 from eventlet.timeout import Timeout
+from oslo_log import log as logging
 
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.common.strategies.cluster import base
 from trove.instance.models import DBInstance
 from trove.instance.models import Instance
-from trove.openstack.common import log as logging
 from trove.taskmanager import api as task_api
 import trove.taskmanager.models as task_models
 

trove/common/strategies/cluster/strategy.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 from oslo_config.cfg import NoSuchOptError
+from oslo_log import log as logging
 
 from trove.common import cfg
 from trove.common.utils import import_class
-from trove.openstack.common import log as logging
 
 
 CONF = cfg.CONF

trove/common/template.py

@@ -16,13 +16,13 @@
 
 import jinja2
 from oslo_config import cfg as oslo_config
+from oslo_log import log as logging
 
 from trove.common import cfg
 from trove.common import configurations
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common import utils
-from trove.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/common/utils.py

@@ -26,6 +26,7 @@ import uuid
 from eventlet.timeout import Timeout
 import jinja2
 from oslo_concurrency import processutils
+from oslo_log import log as logging
 from oslo_service import loopingcall
 from oslo_utils import importutils
 from oslo_utils import strutils
@@ -36,7 +37,6 @@ import six.moves.urllib.parse as urlparse
 from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
-from trove.openstack.common import log as logging
 
 
 CONF = cfg.CONF
@@ -48,7 +48,6 @@ bool_from_string = strutils.bool_from_string
 execute = processutils.execute
 isotime = timeutils.isotime
 
-CONF = cfg.CONF
 ENV = jinja2.Environment(loader=jinja2.ChoiceLoader([
                          jinja2.FileSystemLoader(CONF.template_path),
                          jinja2.PackageLoader("trove", "templates")

trove/common/wsgi.py

@@ -22,6 +22,7 @@ import uuid
 
 import eventlet.wsgi
 import jsonschema
+from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_service import service
 import paste.urlmap
@@ -35,7 +36,6 @@ from trove.common import context as rd_context
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common import utils
-from trove.openstack.common import log as logging
 from trove.openstack.common import pastedeploy
 
 CONTEXT_KEY = 'trove.context'

trove/conductor/api.py

@@ -12,11 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import oslo_messaging as messaging
 
 from trove.common import cfg
 from trove.common.rpc import version as rpc_version
-from trove.openstack.common import log as logging
 from trove import rpc
 
 

trove/conductor/manager.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_service import periodic_task
 
@@ -24,7 +25,6 @@ from trove.common.rpc import version as rpc_version
 from trove.conductor.models import LastSeen
 from trove.extensions.mysql import models as mysql_models
 from trove.instance import models as t_models
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/conductor/models.py

@@ -12,8 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo_log import log as logging
+
 from trove.db import get_db_api
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/configuration/models.py

@@ -16,6 +16,8 @@
 from datetime import datetime
 import json
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common.exception import ModelNotFoundError
@@ -24,7 +26,6 @@ from trove.common import utils
 from trove.datastore import models as dstore_models
 from trove.db import get_db_api
 from trove.db import models as dbmodels
-from trove.openstack.common import log as logging
 from trove.taskmanager import api as task_api
 
 

trove/configuration/service.py

@@ -15,6 +15,8 @@
 
 from datetime import datetime
 
+from oslo_log import log as logging
+
 import trove.common.apischema as apischema
 from trove.common import cfg
 from trove.common import exception
@@ -26,7 +28,6 @@ from trove.configuration.models import DBConfigurationParameter
 from trove.configuration import views
 from trove.datastore import models as ds_models
 from trove.instance import models as instances_models
-from trove.openstack.common import log as logging
 
 
 CONF = cfg.CONF

trove/configuration/views.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove.openstack.common import log as logging
+from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/datastore/models.py

@@ -16,12 +16,13 @@
 #    under the License.
 #
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common import utils
 from trove.db import get_db_api
 from trove.db import models as dbmodels
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/db/models.py

@@ -12,6 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common import models
@@ -19,7 +21,6 @@ from trove.common import pagination
 from trove.common import utils
 from trove.db import db_query
 from trove.db import get_db_api
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/db/sqlalchemy/migrate_repo/schema.py

@@ -15,10 +15,9 @@
 
 """Various conveniences used for migration scripts."""
 
+from oslo_log import log as logging
 import sqlalchemy.types
 
-from trove.openstack.common import log as logging
-
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 

trove/db/sqlalchemy/migrate_repo/versions/020_configurations.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import ForeignKey
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import MetaData
@@ -24,7 +25,6 @@ from trove.db.sqlalchemy.migrate_repo.schema import drop_tables
 from trove.db.sqlalchemy.migrate_repo.schema import String
 from trove.db.sqlalchemy.migrate_repo.schema import Table
 from trove.db.sqlalchemy import utils as db_utils
-from trove.openstack.common import log as logging
 
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')

trove/db/sqlalchemy/migrate_repo/versions/023_add_instance_indexes.py

@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 

trove/db/sqlalchemy/migrate_repo/versions/024_add_backup_indexes.py

@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 

trove/db/sqlalchemy/migrate_repo/versions/025_add_service_statuses_indexes.py

@@ -12,12 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Index
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 

trove/db/sqlalchemy/migrate_repo/versions/026_datastore_versions_unique_fix.py

@@ -13,11 +13,11 @@
 #    under the License.
 
 from migrate.changeset import UniqueConstraint
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import MetaData
 
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')
 

trove/db/sqlalchemy/migrate_repo/versions/028_recreate_agent_heartbeat.py

@@ -12,16 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from oslo_log import log as logging
 from sqlalchemy.exc import OperationalError
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import MetaData
+
 from trove.db.sqlalchemy.migrate_repo.schema import Boolean
 from trove.db.sqlalchemy.migrate_repo.schema import create_tables
 from trove.db.sqlalchemy.migrate_repo.schema import DateTime
 from trove.db.sqlalchemy.migrate_repo.schema import drop_tables
 from trove.db.sqlalchemy.migrate_repo.schema import String
 from trove.db.sqlalchemy.migrate_repo.schema import Table
-from trove.openstack.common import log as logging
 
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')

trove/db/sqlalchemy/migrate_repo/versions/032_clusters.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from sqlalchemy import ForeignKey
 from sqlalchemy.schema import Column
 from sqlalchemy.schema import Index
@@ -26,7 +27,6 @@ from trove.db.sqlalchemy.migrate_repo.schema import Integer
 from trove.db.sqlalchemy.migrate_repo.schema import String
 from trove.db.sqlalchemy.migrate_repo.schema import Table
 from trove.db.sqlalchemy import utils as db_utils
-from trove.openstack.common import log as logging
 
 
 logger = logging.getLogger('trove.db.sqlalchemy.migrate_repo.schema')

trove/db/sqlalchemy/migration.py

@@ -22,9 +22,9 @@ try:
     from migrate.versioning import exceptions as versioning_exceptions
 except ImportError:
     from migrate import exceptions as versioning_exceptions
+from oslo_log import log as logging
 
 from trove.common import exception
-from trove.openstack.common import log as logging
 
 
 logger = logging.getLogger('trove.db.sqlalchemy.migration')

trove/db/sqlalchemy/session.py

@@ -15,6 +15,7 @@
 
 import contextlib
 
+from oslo_log import log as logging
 import osprofiler.sqlalchemy
 import sqlalchemy
 from sqlalchemy import create_engine
@@ -24,7 +25,6 @@ from sqlalchemy.orm import sessionmaker
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.db.sqlalchemy import mappers
-from trove.openstack.common import log as logging
 
 _ENGINE = None
 _MAKER = None

trove/dns/designate/driver.py

@@ -22,11 +22,11 @@ import hashlib
 
 from designateclient.v1 import Client
 from designateclient.v1.records import Record
+from oslo_log import log as logging
 
 from trove.common import cfg
 from trove.common import exception
 from trove.dns import driver
-from trove.openstack.common import log as logging
 
 
 CONF = cfg.CONF

trove/dns/manager.py

@@ -17,9 +17,10 @@
 Dns manager.
 """
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import utils
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/dns/models.py

@@ -18,11 +18,12 @@ Model classes that map instance Ip to dns record.
 """
 
 
+from oslo_log import log as logging
+
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common.models import ModelBase
 from trove.db import get_db_api
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/account/models.py

@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.instance.models import DBInstance
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/extensions/account/service.py

@@ -13,13 +13,14 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 import trove.common.apischema as apischema
 from trove.common.auth import admin_context
 from trove.common.i18n import _
 from trove.common import wsgi
 from trove.extensions.account import models
 from trove.extensions.account import views
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mgmt/clusters/service.py

@@ -14,6 +14,8 @@
 #    under the License.
 
 
+from oslo_log import log as logging
+
 from trove.cluster.service import ClusterController
 import trove.common.apischema as apischema
 from trove.common.auth import admin_context
@@ -22,7 +24,6 @@ from trove.common.i18n import _
 from trove.common import wsgi
 from trove.extensions.mgmt.clusters import models
 from trove.extensions.mgmt.clusters import views
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mgmt/configuration/service.py

@@ -14,6 +14,8 @@
 #    under the License.
 
 
+from oslo_log import log as logging
+
 import trove.common.apischema as apischema
 from trove.common.auth import admin_context
 from trove.common import exception
@@ -22,7 +24,6 @@ from trove.common import wsgi
 from trove.configuration import models as config_models
 from trove.datastore import models as ds_models
 from trove.extensions.mgmt.configuration import views
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/extensions/mgmt/configuration/views.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
-from trove.openstack.common import log as logging
+from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mgmt/host/instance/service.py

@@ -14,11 +14,12 @@
 #    under the License.
 
 
+from oslo_log import log as logging
+
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common import wsgi
 from trove.extensions.mgmt.host import models
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mgmt/host/models.py

@@ -18,6 +18,7 @@ Model classes that extend the instances functionality for MySQL instances.
 """
 
 from novaclient import exceptions as nova_exceptions
+from oslo_log import log as logging
 
 from trove.common import exception
 from trove.common.i18n import _
@@ -26,7 +27,6 @@ from trove.common.remote import create_nova_client
 from trove.instance.models import DBInstance
 from trove.instance.models import InstanceServiceStatus
 from trove.instance.models import SimpleInstance
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/extensions/mgmt/host/service.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 
 from trove.common.auth import admin_context
 from trove.common.i18n import _
@@ -20,7 +21,6 @@ from trove.common import wsgi
 from trove.extensions.mgmt.host import models
 from trove.extensions.mgmt.host import views
 from trove.instance.service import InstanceController
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mgmt/instances/models.py

@@ -13,6 +13,8 @@
 #    under the License.
 import datetime
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common import remote
@@ -21,7 +23,6 @@ from trove.extensions.mysql import models as mysql_models
 from trove.instance import models as imodels
 from trove.instance import models as instance_models
 from trove.instance.models import load_instance, InstanceServiceStatus
-from trove.openstack.common import log as logging
 from trove import rpc
 
 LOG = logging.getLogger(__name__)

trove/extensions/mgmt/instances/service.py

@@ -15,6 +15,7 @@
 
 
 from novaclient import exceptions as nova_exceptions
+from oslo_log import log as logging
 
 from trove.backup.models import Backup
 import trove.common.apischema as apischema
@@ -29,7 +30,6 @@ from trove.extensions.mgmt.instances.views import HwInfoView
 from trove.extensions.mysql import models as mysql_models
 from trove.instance import models as instance_models
 from trove.instance.service import InstanceController
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/extensions/mgmt/quota/service.py

@@ -13,11 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common.auth import admin_context
 from trove.common import exception
 from trove.common import wsgi
 from trove.extensions.mgmt.quota import views
-from trove.openstack.common import log as logging
 from trove.quota.models import Quota
 from trove.quota.quota import QUOTAS as quota_engine
 

trove/extensions/mgmt/upgrade/service.py

@@ -13,12 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 import trove.common.apischema as apischema
 from trove.common.auth import admin_context
 from trove.common.i18n import _
 from trove.common import wsgi
 from trove.extensions.mgmt.upgrade.models import UpgradeMessageSender
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/extensions/mgmt/volume/models.py

@@ -17,7 +17,7 @@
 Model classes that extend the instances functionality for volumes.
 """
 
-from trove.openstack.common import log as logging
+from oslo_log import log as logging
 
 from trove.common.remote import create_cinder_client
 

trove/extensions/mgmt/volume/service.py

@@ -14,12 +14,13 @@
 #    under the License.
 
 
+from oslo_log import log as logging
+
 from trove.common.auth import admin_context
 from trove.common.i18n import _
 from trove.common import wsgi
 from trove.extensions.mgmt.volume import models
 from trove.extensions.mgmt.volume import views
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/mysql/models.py

@@ -17,6 +17,8 @@
 Model classes that extend the instances functionality for MySQL instances.
 """
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common.remote import create_guest_client
@@ -24,7 +26,6 @@ from trove.common import utils
 from trove.db import get_db_api
 from trove.guestagent.db import models as guest_models
 from trove.instance import models as base_models
-from trove.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/extensions/mysql/service.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from oslo_utils import strutils
 import webob.exc
 
@@ -28,7 +29,6 @@ from trove.extensions.mysql.common import unquote_user_host
 from trove.extensions.mysql import models
 from trove.extensions.mysql import views
 from trove.guestagent.db import models as guest_models
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/extensions/routes/account.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove.openstack.common import log as logging
+from oslo_log import log as logging
 
 from trove.common import extensions
 from trove.extensions.account import service

trove/extensions/routes/mgmt.py

@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import extensions
 from trove.extensions.mgmt.clusters.service import MgmtClusterController
 from trove.extensions.mgmt.configuration import service as conf_service
@@ -22,7 +24,6 @@ from trove.extensions.mgmt.instances.service import MgmtInstanceController
 from trove.extensions.mgmt.quota.service import QuotaController
 from trove.extensions.mgmt.upgrade.service import UpgradeController
 from trove.extensions.mgmt.volume.service import StorageController
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/extensions/routes/mysql.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from trove.openstack.common import log as logging
+from oslo_log import log as logging
 
 from trove.common import extensions
 from trove.extensions.mysql import service

trove/extensions/routes/security_group.py

@@ -15,10 +15,11 @@
 #
 
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import extensions
 from trove.extensions.security_group import service
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/extensions/security_group/models.py

@@ -17,12 +17,13 @@
 """
 Model classes for Security Groups and Security Group Rules on instances.
 """
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 from trove.common.models import NetworkRemoteModelBase
 from trove.db.models import DatabaseModelBase
-from trove.openstack.common import log as logging
 
 
 CONF = cfg.CONF

trove/extensions/security_group/service.py

@@ -13,6 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 #
+
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
@@ -22,7 +25,6 @@ from trove.datastore.models import DatastoreVersion
 from trove.extensions.security_group import models
 from trove.extensions.security_group import views
 from trove.instance import models as instance_models
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/extensions/security_group/views.py

@@ -16,7 +16,7 @@
 
 import os
 
-from trove.openstack.common import log as logging
+from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/guestagent/api.py

@@ -18,6 +18,7 @@ Handles all request to the Platform or Guest VM
 """
 
 from eventlet import Timeout
+from oslo_log import log as logging
 import oslo_messaging as messaging
 from oslo_messaging.rpc.client import RemoteError
 
@@ -25,7 +26,6 @@ from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
 import trove.common.rpc.version as rpc_version
-from trove.openstack.common import log as logging
 from trove import rpc
 
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/cassandra/manager.py

@@ -16,6 +16,7 @@
 
 import os
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from trove.common import cfg
@@ -24,7 +25,6 @@ from trove.common.i18n import _
 from trove.guestagent.datastore.experimental.cassandra import service
 from trove.guestagent import dbaas
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/cassandra/service.py

@@ -16,6 +16,7 @@
 import os
 import tempfile
 
+from oslo_log import log as logging
 from oslo_utils import netutils
 import yaml
 
@@ -29,7 +30,6 @@ from trove.guestagent.common.operating_system import FileMode
 from trove.guestagent.datastore.experimental.cassandra import system
 from trove.guestagent.datastore import service
 from trove.guestagent import pkg
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/couchbase/manager.py

@@ -15,6 +15,7 @@
 
 import os
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from trove.common import cfg
@@ -26,7 +27,6 @@ from trove.guestagent.datastore.experimental.couchbase import service
 from trove.guestagent.datastore.experimental.couchbase import system
 from trove.guestagent import dbaas
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/couchbase/service.py

@@ -19,6 +19,7 @@ import stat
 import subprocess
 import tempfile
 
+from oslo_log import log as logging
 from oslo_utils import netutils
 import pexpect
 
@@ -32,7 +33,6 @@ from trove.guestagent.datastore.experimental.couchbase import system
 from trove.guestagent.datastore import service
 from trove.guestagent.db import models
 from trove.guestagent import pkg
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/couchdb/manager.py

@@ -15,6 +15,7 @@
 
 import os
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from trove.common import cfg
@@ -23,7 +24,6 @@ from trove.common.i18n import _
 from trove.guestagent.datastore.experimental.couchdb import service
 from trove.guestagent import dbaas
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/couchdb/service.py

@@ -15,6 +15,8 @@
 
 import json
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
@@ -25,7 +27,6 @@ from trove.guestagent.common.operating_system import FileMode
 from trove.guestagent.datastore.experimental.couchdb import system
 from trove.guestagent.datastore import service
 from trove.guestagent import pkg
-from trove.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/db2/manager.py

@@ -13,6 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from trove.common import cfg
@@ -21,7 +22,6 @@ from trove.guestagent.datastore.experimental.db2 import service
 from trove.guestagent import dbaas
 from trove.guestagent import volume
 from trove.openstack.common.gettextutils import _
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/db2/service.py

@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common import instance as rd_instance
@@ -22,7 +24,6 @@ from trove.guestagent.datastore.experimental.db2 import system
 from trove.guestagent.datastore import service
 from trove.guestagent.db import models
 from trove.openstack.common.gettextutils import _
-from trove.openstack.common import log as logging
 
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/mongodb/manager.py

@@ -15,6 +15,7 @@
 
 import os
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 from oslo_utils import netutils
 
@@ -28,7 +29,6 @@ from trove.guestagent.datastore.experimental.mongodb import service
 from trove.guestagent.datastore.experimental.mongodb import system
 from trove.guestagent import dbaas
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/mongodb/service.py

@@ -18,6 +18,7 @@ import os
 import re
 import tempfile
 
+from oslo_log import log as logging
 from oslo_utils import netutils
 import pymongo
 
@@ -32,7 +33,6 @@ from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.experimental.mongodb import system
 from trove.guestagent.datastore import service
 from trove.guestagent.db import models
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/postgresql/manager.py

@@ -17,6 +17,7 @@
 import os
 
 from oslo_config import cfg as os_cfg
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from .service.config import PgSqlConfig
@@ -29,7 +30,6 @@ from trove.common import cfg
 from trove.guestagent import backup
 from trove.guestagent import dbaas
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/postgresql/pgutil.py

@@ -17,10 +17,11 @@ import os
 import tempfile
 import uuid
 
+from oslo_log import log as logging
+
 from trove.common import utils
 from trove.guestagent.common import operating_system
 from trove.guestagent.common.operating_system import FileMode
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/guestagent/datastore/experimental/postgresql/service/access.py

@@ -13,10 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.guestagent.datastore.experimental.postgresql import pgutil
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/postgresql/service/config.py

@@ -15,6 +15,8 @@
 
 import re
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import utils
@@ -24,7 +26,6 @@ from trove.guestagent.datastore.experimental.postgresql.service.process import(
     PgSqlProcess)
 from trove.guestagent.datastore.experimental.postgresql.service.status import(
     PgSqlAppStatus)
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/postgresql/service/database.py

@@ -15,10 +15,11 @@
 
 import itertools
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.guestagent.datastore.experimental.postgresql import pgutil
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/postgresql/service/install.py

@@ -13,6 +13,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.common import instance
@@ -21,7 +23,6 @@ from trove.guestagent.datastore.experimental.postgresql.service.process import(
 from trove.guestagent.datastore.experimental.postgresql.service.status import(
     PgSqlAppStatus)
 from trove.guestagent import pkg
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/postgresql/service/process.py

@@ -13,12 +13,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import utils
 from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.experimental.postgresql.service.status import (
     PgSqlAppStatus)
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/postgresql/service/root.py

@@ -15,9 +15,10 @@
 
 import uuid
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.guestagent.datastore.experimental.postgresql import pgutil
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/postgresql/service/status.py

@@ -15,12 +15,13 @@
 
 import os
 
+from oslo_log import log as logging
+
 from trove.common import exception
 from trove.common import instance
 from trove.common import utils
 from trove.guestagent.datastore.experimental.postgresql import pgutil
 from trove.guestagent.datastore import service
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 

trove/guestagent/datastore/experimental/postgresql/service/users.py

@@ -15,12 +15,13 @@
 
 import itertools
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common.i18n import _
 from trove.guestagent.datastore.experimental.postgresql import pgutil
 from trove.guestagent.datastore.experimental.postgresql.service.access import (
     PgSqlAccess)
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/redis/manager.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from trove.common import cfg
@@ -24,7 +25,6 @@ from trove.guestagent.datastore.experimental.redis.service import (
     RedisApp)
 from trove.guestagent import dbaas
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/experimental/redis/service.py

@@ -17,6 +17,8 @@ import os
 import redis
 from redis.exceptions import BusyLoadingError, ConnectionError
 
+from oslo_log import log as logging
+
 from trove.common import cfg
 from trove.common import exception
 from trove.common.i18n import _
@@ -29,7 +31,6 @@ from trove.guestagent.common import operating_system
 from trove.guestagent.datastore.experimental.redis import system
 from trove.guestagent.datastore import service
 from trove.guestagent import pkg
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 TIME_OUT = 1200  # FIXME(pmalik): should probably use config timeout

trove/guestagent/datastore/experimental/vertica/manager.py

@@ -13,6 +13,7 @@
 
 import os
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from trove.common import cfg
@@ -24,7 +25,6 @@ from trove.guestagent.datastore.experimental.vertica.service import (
 from trove.guestagent.datastore.experimental.vertica.service import VerticaApp
 from trove.guestagent import dbaas
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/experimental/vertica/service.py

@@ -16,6 +16,7 @@ import os
 import subprocess
 import tempfile
 
+from oslo_log import log as logging
 from oslo_utils import netutils
 
 from trove.common import cfg
@@ -27,7 +28,6 @@ from trove.guestagent.datastore.experimental.vertica import system
 from trove.guestagent.datastore import service
 from trove.guestagent import pkg
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

trove/guestagent/datastore/mysql/manager.py

@@ -18,6 +18,7 @@
 
 import os
 
+from oslo_log import log as logging
 from oslo_service import periodic_task
 
 from trove.common import cfg
@@ -32,7 +33,6 @@ from trove.guestagent.datastore.mysql.service import MySqlAppStatus
 from trove.guestagent import dbaas
 from trove.guestagent.strategies.replication import get_replication_strategy
 from trove.guestagent import volume
-from trove.openstack.common import log as logging
 
 
 LOG = logging.getLogger(__name__)

trove/guestagent/datastore/mysql/service.py

@@ -21,6 +21,7 @@ import os
 import re
 import uuid
 
+from oslo_log import log as logging
 import sqlalchemy
 from sqlalchemy import exc
 from sqlalchemy import interfaces
@@ -39,7 +40,6 @@ from trove.guestagent.common import sql_query
 from trove.guestagent.datastore import service
 from trove.guestagent.db import models
 from trove.guestagent import pkg
-from trove.openstack.common import log as logging
 
 ADMIN_USER_NAME = "os_admin"
 LOG = logging.getLogger(__name__)