From a0c4d13e90d9736d393121394edf9ab0df9b94bb Mon Sep 17 00:00:00 2001 From: Vitaly Gridnev Date: Wed, 21 Jan 2015 12:50:45 +0300 Subject: [PATCH] Migrate to oslo.log oslo.log was added to global requirements, so we can migrate to this module. Also we need this migration to be ensure that it works correctly with log-improvements. Since openstack.common.log is not dropped in oslo-incubator, we shouldn't remove it. Change-Id: I90468e4db812ae0b5d8a43a37206b236f8904661 Closes-bug: #1412673 --- etc/sahara/sahara.conf.sample | 16 ++-------------- requirements.txt | 1 + sahara/api/middleware/auth_valid.py | 2 +- sahara/api/v10.py | 3 ++- sahara/api/v11.py | 3 ++- sahara/cli/sahara_all.py | 2 +- sahara/cli/sahara_api.py | 3 +-- sahara/conductor/api.py | 2 +- sahara/config.py | 19 ++++++++++--------- sahara/context.py | 2 +- sahara/db/api.py | 4 +--- sahara/db/sqlalchemy/api.py | 2 +- sahara/main.py | 7 ++++--- sahara/plugins/base.py | 2 +- sahara/plugins/cdh/deploy.py | 2 +- sahara/plugins/cdh/validation.py | 3 ++- sahara/plugins/hdp/ambariplugin.py | 2 +- sahara/plugins/hdp/clusterspec.py | 2 +- sahara/plugins/hdp/hadoopserver.py | 3 ++- .../versions/version_1_3_2/versionhandler.py | 2 +- .../hdp/versions/version_2_0_6/services.py | 2 +- .../versions/version_2_0_6/versionhandler.py | 2 +- sahara/plugins/mapr/util/config.py | 2 +- sahara/plugins/mapr/util/plugin_spec.py | 2 +- sahara/plugins/mapr/util/run_scripts.py | 3 ++- sahara/plugins/mapr/util/scaling.py | 3 ++- sahara/plugins/mapr/util/start_helper.py | 3 ++- .../mapr/versions/base_cluster_configurer.py | 2 +- .../v4_0_1_mrv1/cluster_configurer.py | 3 ++- sahara/plugins/spark/config_helper.py | 2 +- sahara/plugins/spark/plugin.py | 2 +- sahara/plugins/spark/run_scripts.py | 3 +-- sahara/plugins/storm/config_helper.py | 2 +- sahara/plugins/storm/plugin.py | 2 +- sahara/plugins/storm/run_scripts.py | 2 +- sahara/plugins/vanilla/hadoop2/config.py | 2 +- sahara/plugins/vanilla/hadoop2/run_scripts.py | 3 ++- .../plugins/vanilla/v1_2_1/config_helper.py | 2 +- sahara/plugins/vanilla/v1_2_1/run_scripts.py | 3 ++- .../plugins/vanilla/v1_2_1/versionhandler.py | 2 +- .../plugins/vanilla/v2_4_1/config_helper.py | 2 +- .../plugins/vanilla/v2_4_1/versionhandler.py | 2 +- .../plugins/vanilla/v2_6_0/config_helper.py | 2 +- .../plugins/vanilla/v2_6_0/versionhandler.py | 2 +- sahara/service/api.py | 2 +- sahara/service/direct_engine.py | 2 +- sahara/service/edp/api.py | 2 +- sahara/service/edp/job_manager.py | 2 +- sahara/service/engine.py | 2 +- sahara/service/heat_engine.py | 2 +- sahara/service/networks.py | 2 +- sahara/service/ops.py | 2 +- sahara/service/periodic.py | 2 +- sahara/service/trusts.py | 2 +- sahara/service/volumes.py | 2 +- sahara/swift/swift_helper.py | 2 +- .../unit/db/migration/test_migrations_base.py | 2 +- sahara/topology/topology_helper.py | 2 +- sahara/utils/api.py | 2 +- sahara/utils/general.py | 2 +- sahara/utils/notification/sender.py | 2 +- sahara/utils/openstack/cinder.py | 2 +- sahara/utils/openstack/heat.py | 2 +- sahara/utils/openstack/neutron.py | 2 +- sahara/utils/procutils.py | 2 +- sahara/utils/proxy.py | 2 +- sahara/utils/rpc.py | 2 +- sahara/utils/ssh_remote.py | 2 +- sahara/utils/timing.py | 2 +- sahara/utils/wsgi.py | 3 +-- tools/config/config-generator.sahara.conf | 2 +- 71 files changed, 94 insertions(+), 98 deletions(-) diff --git a/etc/sahara/sahara.conf.sample b/etc/sahara/sahara.conf.sample index 29ce6aa1..3d68c496 100644 --- a/etc/sahara/sahara.conf.sample +++ b/etc/sahara/sahara.conf.sample @@ -1,7 +1,7 @@ [DEFAULT] # -# From log.config +# From oslo.log # # Print debugging output (set logging level to DEBUG instead of @@ -12,10 +12,6 @@ # default WARNING level). (boolean value) #verbose = false -# -# From log.config -# - # The name of a logging configuration file. This file is appended to # any existing logging configuration files. For details about logging # configuration files, see the Python logging module documentation. @@ -56,17 +52,9 @@ # Syslog facility to receive log lines. (string value) #syslog_log_facility = LOG_USER -# -# From log.config -# - # Log output to standard error. (boolean value) #use_stderr = true -# -# From log.config -# - # Format string to use for log messages with context. (string value) #logging_context_format_string = %(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s @@ -82,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 = amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN +#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 diff --git a/requirements.txt b/requirements.txt index 0a92ada5..b8cf7231 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,6 +16,7 @@ oslo.concurrency>=1.4.1 # Apache-2.0 oslo.context>=0.1.0 # Apache-2.0 oslo.db>=1.4.1 # Apache-2.0 oslo.i18n>=1.3.0 # Apache-2.0 +oslo.log>=0.1.0 # Apache-2.0 oslo.messaging>=1.4.0,!=1.5.0 oslo.middleware>=0.3.0 # Apache-2.0 oslo.rootwrap>=1.3.0 diff --git a/sahara/api/middleware/auth_valid.py b/sahara/api/middleware/auth_valid.py index d54a7245..c5b42908 100644 --- a/sahara/api/middleware/auth_valid.py +++ b/sahara/api/middleware/auth_valid.py @@ -13,12 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +from oslo_log import log as logging import webob.exc as ex from sahara.i18n import _ from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging import sahara.openstack.commons as commons diff --git a/sahara/api/v10.py b/sahara/api/v10.py index 44da47d5..86dbd975 100644 --- a/sahara/api/v10.py +++ b/sahara/api/v10.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +from oslo_log import log as logging + from sahara.api import acl import sahara.api.base as b -from sahara.openstack.common import log as logging from sahara.service import api from sahara.service import validation as v from sahara.service.validations import cluster_templates as v_ct diff --git a/sahara/api/v11.py b/sahara/api/v11.py index 1e32a653..2cdfe66d 100644 --- a/sahara/api/v11.py +++ b/sahara/api/v11.py @@ -13,8 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from oslo_log import log as logging + from sahara.api import acl -from sahara.openstack.common import log as logging from sahara.service.edp import api from sahara.service import validation as v from sahara.service.validations.edp import data_source as v_d_s diff --git a/sahara/cli/sahara_all.py b/sahara/cli/sahara_all.py index 55b5498d..1894cc45 100644 --- a/sahara/cli/sahara_all.py +++ b/sahara/cli/sahara_all.py @@ -22,6 +22,7 @@ import os import sys from oslo import i18n +from oslo_log import log as logging # If ../sahara/__init__.py exists, add ../ to Python search path, so that @@ -42,7 +43,6 @@ i18n.enable_lazy() import sahara.main as server -from sahara.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/cli/sahara_api.py b/sahara/cli/sahara_api.py index 158b8009..f69621a8 100644 --- a/sahara/cli/sahara_api.py +++ b/sahara/cli/sahara_api.py @@ -22,7 +22,7 @@ import os import sys from oslo import i18n - +from oslo_log import log as logging # If ../sahara/__init__.py exists, add ../ to Python search path, so that # it will override what happens to be installed in /usr/(local/)lib/python... @@ -42,7 +42,6 @@ i18n.enable_lazy() import sahara.main as server -from sahara.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/conductor/api.py b/sahara/conductor/api.py index 9e63c00d..4765d5d1 100644 --- a/sahara/conductor/api.py +++ b/sahara/conductor/api.py @@ -16,10 +16,10 @@ """Handles all requests to the conductor service.""" from oslo.config import cfg +from oslo_log import log as logging from sahara.conductor import manager from sahara.conductor import resource as r -from sahara.openstack.common import log as logging conductor_opts = [ diff --git a/sahara/config.py b/sahara/config.py index 26facd80..58444a25 100644 --- a/sahara/config.py +++ b/sahara/config.py @@ -16,10 +16,10 @@ import itertools from oslo.config import cfg +from oslo_log import log from sahara import exceptions as ex from sahara.i18n import _ -from sahara.openstack.common import log from sahara.plugins import base as plugins_base from sahara.topology import topology_helper from sahara.utils.notification import sender @@ -92,7 +92,15 @@ networking_opts = [ ] -cfg.set_defaults(log.log_opts, default_log_levels=[ +CONF = cfg.CONF +CONF.register_cli_opts(cli_opts) +CONF.register_opts(networking_opts) +CONF.register_opts(edp_opts) +CONF.register_opts(db_opts) + +log.register_options(CONF) + +log.set_defaults(default_log_levels=[ 'amqplib=WARN', 'qpid.messaging=INFO', 'stevedore=INFO', @@ -108,13 +116,6 @@ cfg.set_defaults(log.log_opts, default_log_levels=[ ]) -CONF = cfg.CONF -CONF.register_cli_opts(cli_opts) -CONF.register_opts(networking_opts) -CONF.register_opts(edp_opts) -CONF.register_opts(db_opts) - - def list_opts(): # NOTE (vgridnev): we make these import here to avoid problems # with importing unregistered options in sahara code. diff --git a/sahara/context.py b/sahara/context.py index b76748de..eeb1b5f3 100644 --- a/sahara/context.py +++ b/sahara/context.py @@ -20,13 +20,13 @@ from eventlet import greenpool from eventlet import semaphore from oslo.config import cfg from oslo_context import context +from oslo_log import log as logging from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LE from sahara.i18n import _LW from sahara.openstack.common import local -from sahara.openstack.common import log as logging CONF = cfg.CONF diff --git a/sahara/db/api.py b/sahara/db/api.py index 6ad9a9de..dfaa0d5e 100644 --- a/sahara/db/api.py +++ b/sahara/db/api.py @@ -34,9 +34,7 @@ interface. from oslo.config import cfg from oslo.db import api as db_api from oslo.db import options - -from sahara.openstack.common import log as logging - +from oslo_log import log as logging CONF = cfg.CONF diff --git a/sahara/db/sqlalchemy/api.py b/sahara/db/sqlalchemy/api.py index e3968bba..be247f73 100644 --- a/sahara/db/sqlalchemy/api.py +++ b/sahara/db/sqlalchemy/api.py @@ -21,6 +21,7 @@ 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_log import log as logging import six import sqlalchemy as sa @@ -28,7 +29,6 @@ from sahara.db.sqlalchemy import models as m from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LE -from sahara.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/main.py b/sahara/main.py index 4234bbed..a6da2357 100644 --- a/sahara/main.py +++ b/sahara/main.py @@ -19,6 +19,8 @@ import eventlet from eventlet import wsgi import flask from oslo.config import cfg +from oslo_log import log +from oslo_log import loggers import six import stevedore from werkzeug import exceptions as werkzeug_exceptions @@ -32,7 +34,6 @@ from sahara import config from sahara import context from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log from sahara.openstack.common import sslutils from sahara.plugins import base as plugins_base from sahara.service import api as service_api @@ -75,7 +76,7 @@ def setup_common(possible_topdir, service_name): config_files = [dev_conf] config.parse_configs(config_files) - log.setup("sahara") + log.setup(CONF, "sahara") LOG.info(_LI('Starting Sahara %s'), service_name) @@ -202,4 +203,4 @@ def start_server(app): LOG.info(_LI("Using HTTPS for port %s"), cfg.CONF.port) sock = sslutils.wrap(sock) - wsgi.server(sock, app, log=log.WritableLogger(LOG), debug=False) + wsgi.server(sock, app, log=loggers.WritableLogger(LOG), debug=False) diff --git a/sahara/plugins/base.py b/sahara/plugins/base.py index 520434be..e44d188d 100644 --- a/sahara/plugins/base.py +++ b/sahara/plugins/base.py @@ -16,13 +16,13 @@ import abc from oslo.config import cfg +from oslo_log import log as logging import six from stevedore import enabled from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.utils import resources diff --git a/sahara/plugins/cdh/deploy.py b/sahara/plugins/cdh/deploy.py index b4ada54c..5b39485c 100644 --- a/sahara/plugins/cdh/deploy.py +++ b/sahara/plugins/cdh/deploy.py @@ -17,12 +17,12 @@ import os import telnetlib from oslo.utils import timeutils +from oslo_log import log as logging import six from sahara import context from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins.cdh import cloudera_utils as cu from sahara.plugins.cdh import commands as cmd from sahara.plugins.cdh import config_helper as c_helper diff --git a/sahara/plugins/cdh/validation.py b/sahara/plugins/cdh/validation.py index bdae36e3..b69c73f2 100644 --- a/sahara/plugins/cdh/validation.py +++ b/sahara/plugins/cdh/validation.py @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +from oslo_log import log as logging + from sahara.i18n import _ from sahara.i18n import _LE -from sahara.openstack.common import log as logging from sahara.plugins.cdh import cloudera_utils as cmu from sahara.plugins.cdh import utils as cu from sahara.plugins import exceptions as ex diff --git a/sahara/plugins/hdp/ambariplugin.py b/sahara/plugins/hdp/ambariplugin.py index 37e16049..86b56219 100644 --- a/sahara/plugins/hdp/ambariplugin.py +++ b/sahara/plugins/hdp/ambariplugin.py @@ -14,12 +14,12 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor from sahara import context from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins.hdp import hadoopserver as h from sahara.plugins.hdp import saharautils as utils diff --git a/sahara/plugins/hdp/clusterspec.py b/sahara/plugins/hdp/clusterspec.py index e4ad69a3..0ab78b4c 100644 --- a/sahara/plugins/hdp/clusterspec.py +++ b/sahara/plugins/hdp/clusterspec.py @@ -14,9 +14,9 @@ # limitations under the License. from oslo.serialization import jsonutils as json +from oslo_log import log as logging from sahara.i18n import _ -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins.hdp.versions import versionhandlerfactory as vhf diff --git a/sahara/plugins/hdp/hadoopserver.py b/sahara/plugins/hdp/hadoopserver.py index b4846026..a14c3d44 100644 --- a/sahara/plugins/hdp/hadoopserver.py +++ b/sahara/plugins/hdp/hadoopserver.py @@ -13,11 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. +from oslo_log import log as logging + import re from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins.hdp import saharautils from sahara.utils import files as f diff --git a/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py b/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py index d10f225f..482c965d 100644 --- a/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py +++ b/sahara/plugins/hdp/versions/version_1_3_2/versionhandler.py @@ -16,6 +16,7 @@ import json from oslo.config import cfg +from oslo_log import log as logging import pkg_resources as pkg from sahara import context @@ -25,7 +26,6 @@ from sahara.i18n import _LC from sahara.i18n import _LE from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins.hdp import clusterspec as cs from sahara.plugins.hdp import configprovider as cfgprov diff --git a/sahara/plugins/hdp/versions/version_2_0_6/services.py b/sahara/plugins/hdp/versions/version_2_0_6/services.py index 5c803fb2..2d9b027d 100644 --- a/sahara/plugins/hdp/versions/version_2_0_6/services.py +++ b/sahara/plugins/hdp/versions/version_2_0_6/services.py @@ -16,13 +16,13 @@ import re from oslo.config import cfg +from oslo_log import log as logging import six from sahara import exceptions as e from sahara.i18n import _ from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins import utils from sahara.swift import swift_helper as h diff --git a/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py b/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py index 3027669e..77f54cc4 100644 --- a/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py +++ b/sahara/plugins/hdp/versions/version_2_0_6/versionhandler.py @@ -16,6 +16,7 @@ import json from oslo.config import cfg +from oslo_log import log as logging import pkg_resources as pkg import six @@ -26,7 +27,6 @@ from sahara.i18n import _LC from sahara.i18n import _LE from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins.hdp import clusterspec as cs from sahara.plugins.hdp import configprovider as cfgprov diff --git a/sahara/plugins/mapr/util/config.py b/sahara/plugins/mapr/util/config.py index eebb19a2..04b0d420 100644 --- a/sahara/plugins/mapr/util/config.py +++ b/sahara/plugins/mapr/util/config.py @@ -13,11 +13,11 @@ # under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging import sahara.plugins.mapr.util.config_file_utils as cfu import sahara.plugins.mapr.versions.version_handler_factory as vhf from sahara.plugins import provisioning as p diff --git a/sahara/plugins/mapr/util/plugin_spec.py b/sahara/plugins/mapr/util/plugin_spec.py index 4bdfce73..c381eb41 100644 --- a/sahara/plugins/mapr/util/plugin_spec.py +++ b/sahara/plugins/mapr/util/plugin_spec.py @@ -15,9 +15,9 @@ import json import os.path +from oslo_log import log as logging import six -import sahara.openstack.common.log as logging import sahara.plugins.mapr.util.config_file_utils as cfu import sahara.plugins.mapr.util.dict_utils as du import sahara.plugins.mapr.util.func_utils as fu diff --git a/sahara/plugins/mapr/util/run_scripts.py b/sahara/plugins/mapr/util/run_scripts.py index 13ed8ed8..82db86fe 100644 --- a/sahara/plugins/mapr/util/run_scripts.py +++ b/sahara/plugins/mapr/util/run_scripts.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log as logging + from sahara.i18n import _LI -from sahara.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/plugins/mapr/util/scaling.py b/sahara/plugins/mapr/util/scaling.py index b9eddb54..ad46ece3 100644 --- a/sahara/plugins/mapr/util/scaling.py +++ b/sahara/plugins/mapr/util/scaling.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log as logging + from sahara import context from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins.mapr.util import config from sahara.plugins.mapr.util import names from sahara.plugins.mapr.util import run_scripts diff --git a/sahara/plugins/mapr/util/start_helper.py b/sahara/plugins/mapr/util/start_helper.py index fdbe25d7..e85c0438 100644 --- a/sahara/plugins/mapr/util/start_helper.py +++ b/sahara/plugins/mapr/util/start_helper.py @@ -12,9 +12,10 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log as logging + from sahara import context from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins.mapr.util import names from sahara.plugins.mapr.util import run_scripts import sahara.plugins.mapr.versions.version_handler_factory as vhf diff --git a/sahara/plugins/mapr/versions/base_cluster_configurer.py b/sahara/plugins/mapr/versions/base_cluster_configurer.py index 87e35ab0..d0588d03 100644 --- a/sahara/plugins/mapr/versions/base_cluster_configurer.py +++ b/sahara/plugins/mapr/versions/base_cluster_configurer.py @@ -16,10 +16,10 @@ import abc import collections as c import os +from oslo_log import log as logging import six from sahara.i18n import _LI -from sahara.openstack.common import log as logging import sahara.plugins.mapr.util.cluster_helper as ch import sahara.plugins.mapr.util.cluster_info as ci from sahara.plugins.mapr.util import config diff --git a/sahara/plugins/mapr/versions/v4_0_1_mrv1/cluster_configurer.py b/sahara/plugins/mapr/versions/v4_0_1_mrv1/cluster_configurer.py index 7b019073..b93bdf42 100644 --- a/sahara/plugins/mapr/versions/v4_0_1_mrv1/cluster_configurer.py +++ b/sahara/plugins/mapr/versions/v4_0_1_mrv1/cluster_configurer.py @@ -12,8 +12,9 @@ # License for the specific language governing permissions and limitations # under the License. +from oslo_log import log as logging + from sahara.i18n import _LI -from sahara.openstack.common import log as logging import sahara.plugins.mapr.versions.base_cluster_configurer as bcc import sahara.plugins.utils as u from sahara.utils import files as f diff --git a/sahara/plugins/spark/config_helper.py b/sahara/plugins/spark/config_helper.py index c9924e1c..8952e0b1 100644 --- a/sahara/plugins/spark/config_helper.py +++ b/sahara/plugins/spark/config_helper.py @@ -14,11 +14,11 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor as c from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import provisioning as p from sahara.plugins import utils from sahara.topology import topology_helper as topology diff --git a/sahara/plugins/spark/plugin.py b/sahara/plugins/spark/plugin.py index 22228cc6..e63f9c80 100644 --- a/sahara/plugins/spark/plugin.py +++ b/sahara/plugins/spark/plugin.py @@ -16,12 +16,12 @@ import os from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor from sahara import context from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins import provisioning as p from sahara.plugins.spark import config_helper as c_helper diff --git a/sahara/plugins/spark/run_scripts.py b/sahara/plugins/spark/run_scripts.py index 07ff300b..2f9a632f 100644 --- a/sahara/plugins/spark/run_scripts.py +++ b/sahara/plugins/spark/run_scripts.py @@ -15,8 +15,7 @@ import os -from sahara.openstack.common import log as logging - +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/plugins/storm/config_helper.py b/sahara/plugins/storm/config_helper.py index 12099a7c..4066acce 100644 --- a/sahara/plugins/storm/config_helper.py +++ b/sahara/plugins/storm/config_helper.py @@ -14,11 +14,11 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor as c from sahara import exceptions as ex from sahara.i18n import _ -from sahara.openstack.common import log as logging conductor = c.API diff --git a/sahara/plugins/storm/plugin.py b/sahara/plugins/storm/plugin.py index baf86dc2..66b128cb 100644 --- a/sahara/plugins/storm/plugin.py +++ b/sahara/plugins/storm/plugin.py @@ -14,6 +14,7 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging import six import yaml @@ -21,7 +22,6 @@ from sahara import conductor from sahara import context from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins import provisioning as p from sahara.plugins.storm import config_helper as c_helper diff --git a/sahara/plugins/storm/run_scripts.py b/sahara/plugins/storm/run_scripts.py index 436fa948..968f6043 100644 --- a/sahara/plugins/storm/run_scripts.py +++ b/sahara/plugins/storm/run_scripts.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from sahara.openstack.common import log as logging +from oslo_log import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/plugins/vanilla/hadoop2/config.py b/sahara/plugins/vanilla/hadoop2/config.py index daac380b..c1b45d38 100644 --- a/sahara/plugins/vanilla/hadoop2/config.py +++ b/sahara/plugins/vanilla/hadoop2/config.py @@ -14,10 +14,10 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging import six from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper from sahara.plugins.vanilla.hadoop2 import oozie_helper as o_helper from sahara.plugins.vanilla import utils as vu diff --git a/sahara/plugins/vanilla/hadoop2/run_scripts.py b/sahara/plugins/vanilla/hadoop2/run_scripts.py index 3929d67a..f56ffcda 100644 --- a/sahara/plugins/vanilla/hadoop2/run_scripts.py +++ b/sahara/plugins/vanilla/hadoop2/run_scripts.py @@ -15,10 +15,11 @@ import os +from oslo_log import log as logging + from sahara import context from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper from sahara.plugins.vanilla import utils as vu diff --git a/sahara/plugins/vanilla/v1_2_1/config_helper.py b/sahara/plugins/vanilla/v1_2_1/config_helper.py index 3671eea5..5ad157b2 100644 --- a/sahara/plugins/vanilla/v1_2_1/config_helper.py +++ b/sahara/plugins/vanilla/v1_2_1/config_helper.py @@ -14,6 +14,7 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor as c from sahara import context @@ -21,7 +22,6 @@ from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.plugins import provisioning as p from sahara.plugins import utils from sahara.plugins.vanilla import utils as vu diff --git a/sahara/plugins/vanilla/v1_2_1/run_scripts.py b/sahara/plugins/vanilla/v1_2_1/run_scripts.py index 034e4ad7..3d9839aa 100644 --- a/sahara/plugins/vanilla/v1_2_1/run_scripts.py +++ b/sahara/plugins/vanilla/v1_2_1/run_scripts.py @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -from sahara.openstack.common import log as logging +from oslo_log import log as logging + from sahara.utils import files diff --git a/sahara/plugins/vanilla/v1_2_1/versionhandler.py b/sahara/plugins/vanilla/v1_2_1/versionhandler.py index 4fbaa5d5..3ffd356c 100644 --- a/sahara/plugins/vanilla/v1_2_1/versionhandler.py +++ b/sahara/plugins/vanilla/v1_2_1/versionhandler.py @@ -16,13 +16,13 @@ import uuid from oslo.config import cfg +from oslo_log import log as logging import six from sahara import conductor from sahara import context from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import exceptions as ex from sahara.plugins import utils from sahara.plugins.vanilla import abstractversionhandler as avm diff --git a/sahara/plugins/vanilla/v2_4_1/config_helper.py b/sahara/plugins/vanilla/v2_4_1/config_helper.py index ff367550..4daf2f6c 100644 --- a/sahara/plugins/vanilla/v2_4_1/config_helper.py +++ b/sahara/plugins/vanilla/v2_4_1/config_helper.py @@ -14,8 +14,8 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging -from sahara.openstack.common import log as logging from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper from sahara.utils import xmlutils as x diff --git a/sahara/plugins/vanilla/v2_4_1/versionhandler.py b/sahara/plugins/vanilla/v2_4_1/versionhandler.py index 8a17f622..9d34ff44 100644 --- a/sahara/plugins/vanilla/v2_4_1/versionhandler.py +++ b/sahara/plugins/vanilla/v2_4_1/versionhandler.py @@ -14,10 +14,10 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor from sahara import context -from sahara.openstack.common import log as logging from sahara.plugins import utils from sahara.plugins.vanilla import abstractversionhandler as avm from sahara.plugins.vanilla.hadoop2 import config as c diff --git a/sahara/plugins/vanilla/v2_6_0/config_helper.py b/sahara/plugins/vanilla/v2_6_0/config_helper.py index 2f50b913..bd3bb3c0 100644 --- a/sahara/plugins/vanilla/v2_6_0/config_helper.py +++ b/sahara/plugins/vanilla/v2_6_0/config_helper.py @@ -14,8 +14,8 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging -from sahara.openstack.common import log as logging from sahara.plugins.vanilla.hadoop2 import config_helper as c_helper from sahara.utils import xmlutils as x diff --git a/sahara/plugins/vanilla/v2_6_0/versionhandler.py b/sahara/plugins/vanilla/v2_6_0/versionhandler.py index 3cc75d94..6c2147f7 100644 --- a/sahara/plugins/vanilla/v2_6_0/versionhandler.py +++ b/sahara/plugins/vanilla/v2_6_0/versionhandler.py @@ -14,10 +14,10 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor from sahara import context -from sahara.openstack.common import log as logging from sahara.plugins import utils from sahara.plugins.vanilla import abstractversionhandler as avm from sahara.plugins.vanilla.hadoop2 import config as c diff --git a/sahara/service/api.py b/sahara/service/api.py index b4259af5..30b5e6fa 100644 --- a/sahara/service/api.py +++ b/sahara/service/api.py @@ -15,12 +15,12 @@ from oslo.config import cfg from oslo.utils import excutils +from oslo_log import log as logging import six from six.moves.urllib import parse as urlparse from sahara import conductor as c from sahara import context -from sahara.openstack.common import log as logging from sahara.plugins import base as plugin_base from sahara.plugins import provisioning from sahara.utils import general as g diff --git a/sahara/service/direct_engine.py b/sahara/service/direct_engine.py index 7ead92e0..e16cb040 100644 --- a/sahara/service/direct_engine.py +++ b/sahara/service/direct_engine.py @@ -15,6 +15,7 @@ from novaclient import exceptions as nova_exceptions from oslo.config import cfg +from oslo_log import log as logging import six from sahara import conductor as c @@ -24,7 +25,6 @@ from sahara.i18n import _ from sahara.i18n import _LE from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.service import engine as e from sahara.service import networks from sahara.service import volumes diff --git a/sahara/service/edp/api.py b/sahara/service/edp/api.py index 6c95ea79..a6cadc7a 100644 --- a/sahara/service/edp/api.py +++ b/sahara/service/edp/api.py @@ -14,12 +14,12 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor as c from sahara import context from sahara import exceptions as ex from sahara.i18n import _LE -from sahara.openstack.common import log as logging from sahara.service.edp.binary_retrievers import dispatch from sahara.service.edp import job_manager as manager from sahara.utils import edp diff --git a/sahara/service/edp/job_manager.py b/sahara/service/edp/job_manager.py index 9d52ef8f..1b226bd3 100644 --- a/sahara/service/edp/job_manager.py +++ b/sahara/service/edp/job_manager.py @@ -17,6 +17,7 @@ import datetime from oslo.config import cfg from oslo.utils import timeutils +from oslo_log import log from sahara import conductor as c from sahara import context @@ -24,7 +25,6 @@ from sahara import exceptions as e from sahara.i18n import _ from sahara.i18n import _LE from sahara.i18n import _LI -from sahara.openstack.common import log from sahara.service.edp import job_utils from sahara.service.edp.oozie import engine as oozie_engine from sahara.service.edp.spark import engine as spark_engine diff --git a/sahara/service/engine.py b/sahara/service/engine.py index f39c1304..d8966a83 100644 --- a/sahara/service/engine.py +++ b/sahara/service/engine.py @@ -18,6 +18,7 @@ import abc import datetime import string +from oslo_log import log as logging import six from sahara import conductor as c @@ -25,7 +26,6 @@ from sahara import context from sahara.i18n import _ from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.service import networks from sahara.utils import cluster_progress_ops as cpo from sahara.utils import edp diff --git a/sahara/service/heat_engine.py b/sahara/service/heat_engine.py index 0181bc33..e6778223 100644 --- a/sahara/service/heat_engine.py +++ b/sahara/service/heat_engine.py @@ -15,12 +15,12 @@ from heatclient import exc as heat_exc from oslo.config import cfg +from oslo_log import log as logging from sahara import conductor as c from sahara import context from sahara.i18n import _LI from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.service import engine as e from sahara.service import volumes from sahara.utils import general as g diff --git a/sahara/service/networks.py b/sahara/service/networks.py index 59d0aa2f..a154aaa1 100644 --- a/sahara/service/networks.py +++ b/sahara/service/networks.py @@ -14,11 +14,11 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging import six from sahara import conductor as c from sahara import context -from sahara.openstack.common import log as logging from sahara.utils.openstack import neutron from sahara.utils.openstack import nova diff --git a/sahara/service/ops.py b/sahara/service/ops.py index 2e0953d4..44db7f3d 100644 --- a/sahara/service/ops.py +++ b/sahara/service/ops.py @@ -18,13 +18,13 @@ import uuid from oslo.config import cfg from oslo import messaging +from oslo_log import log as logging from sahara import conductor as c from sahara import context from sahara import exceptions from sahara.i18n import _LE from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.plugins import base as plugin_base from sahara.service.edp import job_manager from sahara.service import trusts diff --git a/sahara/service/periodic.py b/sahara/service/periodic.py index 1288aac0..5f121a72 100644 --- a/sahara/service/periodic.py +++ b/sahara/service/periodic.py @@ -17,12 +17,12 @@ import random from oslo.config import cfg from oslo.utils import timeutils +from oslo_log import log import six from sahara import conductor as c from sahara import context from sahara.i18n import _LI -from sahara.openstack.common import log from sahara.openstack.common import periodic_task from sahara.openstack.common import threadgroup from sahara.service.edp import job_manager diff --git a/sahara/service/trusts.py b/sahara/service/trusts.py index ba317cda..8c8a864a 100644 --- a/sahara/service/trusts.py +++ b/sahara/service/trusts.py @@ -16,6 +16,7 @@ import json from oslo.config import cfg +from oslo_log import log as logging import six from sahara import conductor as c @@ -23,7 +24,6 @@ from sahara import context from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LE -from sahara.openstack.common import log as logging from sahara.utils.openstack import keystone diff --git a/sahara/service/volumes.py b/sahara/service/volumes.py index 3c2bc6f8..84fb25f6 100644 --- a/sahara/service/volumes.py +++ b/sahara/service/volumes.py @@ -15,6 +15,7 @@ from oslo.config import cfg from oslo.utils import timeutils as tu +from oslo_log import log as logging from sahara import conductor as c from sahara import context @@ -22,7 +23,6 @@ from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LE from sahara.i18n import _LW -from sahara.openstack.common import log as logging from sahara.utils import cluster_progress_ops as cpo from sahara.utils.openstack import cinder from sahara.utils.openstack import nova diff --git a/sahara/swift/swift_helper.py b/sahara/swift/swift_helper.py index ddef8d87..e64beb86 100644 --- a/sahara/swift/swift_helper.py +++ b/sahara/swift/swift_helper.py @@ -14,10 +14,10 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging from sahara import context from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.swift import utils as su from sahara.utils import xmlutils as x diff --git a/sahara/tests/unit/db/migration/test_migrations_base.py b/sahara/tests/unit/db/migration/test_migrations_base.py index 7d611ac9..48ce0bcf 100644 --- a/sahara/tests/unit/db/migration/test_migrations_base.py +++ b/sahara/tests/unit/db/migration/test_migrations_base.py @@ -32,11 +32,11 @@ 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_log import log as logging import sahara.db.migration from sahara.db.sqlalchemy import api as sa from sahara.db.sqlalchemy import model_base -from sahara.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/topology/topology_helper.py b/sahara/topology/topology_helper.py index aec5b62d..f3cad993 100644 --- a/sahara/topology/topology_helper.py +++ b/sahara/topology/topology_helper.py @@ -16,12 +16,12 @@ import hashlib from oslo.config import cfg +from oslo_log import log from sahara import context from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LI -from sahara.openstack.common import log from sahara.utils.openstack import nova from sahara.utils import xmlutils as x diff --git a/sahara/utils/api.py b/sahara/utils/api.py index 2b2aad43..de183cb6 100644 --- a/sahara/utils/api.py +++ b/sahara/utils/api.py @@ -16,13 +16,13 @@ import traceback import flask +from oslo_log import log as logging from werkzeug import datastructures from sahara import context from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LE -from sahara.openstack.common import log as logging from sahara.utils import wsgi diff --git a/sahara/utils/general.py b/sahara/utils/general.py index 8ec0cee0..d4e9c361 100644 --- a/sahara/utils/general.py +++ b/sahara/utils/general.py @@ -15,12 +15,12 @@ import re +from oslo_log import log as logging import six from sahara import conductor as c from sahara import context from sahara.i18n import _LI -from sahara.openstack.common import log as logging from sahara.utils.notification import sender conductor = c.API diff --git a/sahara/utils/notification/sender.py b/sahara/utils/notification/sender.py index e901c20f..2b3fea41 100644 --- a/sahara/utils/notification/sender.py +++ b/sahara/utils/notification/sender.py @@ -14,8 +14,8 @@ # limitations under the License. from oslo.config import cfg +from oslo_log import log as logging -from sahara.openstack.common import log as logging from sahara.utils import rpc as messaging LOG = logging.getLogger(__name__) diff --git a/sahara/utils/openstack/cinder.py b/sahara/utils/openstack/cinder.py index 6515c10a..a86b8262 100644 --- a/sahara/utils/openstack/cinder.py +++ b/sahara/utils/openstack/cinder.py @@ -18,10 +18,10 @@ 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_log import log as logging from sahara import context from sahara.i18n import _ -from sahara.openstack.common import log as logging from sahara.utils.openstack import base diff --git a/sahara/utils/openstack/heat.py b/sahara/utils/openstack/heat.py index b6495a5e..eafa5c20 100644 --- a/sahara/utils/openstack/heat.py +++ b/sahara/utils/openstack/heat.py @@ -17,12 +17,12 @@ import json from heatclient import client as heat_client from oslo.config import cfg +from oslo_log import log as logging import six from sahara import context from sahara import exceptions as ex from sahara.i18n import _ -from sahara.openstack.common import log as logging from sahara.utils import files as f from sahara.utils import general as g from sahara.utils.openstack import base diff --git a/sahara/utils/openstack/neutron.py b/sahara/utils/openstack/neutron.py index a189f075..24ed6e8e 100644 --- a/sahara/utils/openstack/neutron.py +++ b/sahara/utils/openstack/neutron.py @@ -16,11 +16,11 @@ from neutronclient.neutron import client as neutron_cli from oslo.config import cfg +from oslo_log import log as logging from sahara import context from sahara import exceptions as ex from sahara.i18n import _ -from sahara.openstack.common import log as logging from sahara.utils.openstack import base diff --git a/sahara/utils/procutils.py b/sahara/utils/procutils.py index 46b73ca6..769d1547 100644 --- a/sahara/utils/procutils.py +++ b/sahara/utils/procutils.py @@ -19,9 +19,9 @@ import sys from eventlet.green import subprocess from eventlet import timeout as e_timeout +from oslo_log import log as logging from sahara import context -from sahara.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/sahara/utils/proxy.py b/sahara/utils/proxy.py index 7cd6c078..9e3fcb59 100644 --- a/sahara/utils/proxy.py +++ b/sahara/utils/proxy.py @@ -16,13 +16,13 @@ import uuid from oslo.config import cfg +from oslo_log import log as logging import six from sahara import conductor as c from sahara import context from sahara import exceptions as ex from sahara.i18n import _ -from sahara.openstack.common import log as logging from sahara.service.edp import job_utils from sahara.service import trusts as t from sahara.swift import utils as su diff --git a/sahara/utils/rpc.py b/sahara/utils/rpc.py index 48bec8c7..3e26f6cc 100644 --- a/sahara/utils/rpc.py +++ b/sahara/utils/rpc.py @@ -17,10 +17,10 @@ from oslo.config import cfg from oslo import messaging from oslo.serialization import jsonutils +from oslo_log import log as logging from sahara import context from sahara.i18n import _LI -from sahara.openstack.common import log as logging TRANSPORT = None diff --git a/sahara/utils/ssh_remote.py b/sahara/utils/ssh_remote.py index 0850f4c3..c0d1ec69 100644 --- a/sahara/utils/ssh_remote.py +++ b/sahara/utils/ssh_remote.py @@ -41,6 +41,7 @@ from eventlet import semaphore from eventlet import timeout as e_timeout from oslo.config import cfg from oslo.utils import excutils +from oslo_log import log as logging import paramiko import requests from requests import adapters @@ -50,7 +51,6 @@ from sahara import context from sahara import exceptions as ex from sahara.i18n import _ from sahara.i18n import _LE -from sahara.openstack.common import log as logging from sahara.utils import crypto from sahara.utils import hashabledict as h from sahara.utils.openstack import base diff --git a/sahara/utils/timing.py b/sahara/utils/timing.py index 80661c02..d7c1a16c 100644 --- a/sahara/utils/timing.py +++ b/sahara/utils/timing.py @@ -22,9 +22,9 @@ import sys import time from oslo.config import cfg +from oslo_log import log from sahara.i18n import _LI -from sahara.openstack.common import log CONF = cfg.CONF diff --git a/sahara/utils/wsgi.py b/sahara/utils/wsgi.py index 25220c1e..d16af9ab 100644 --- a/sahara/utils/wsgi.py +++ b/sahara/utils/wsgi.py @@ -25,12 +25,11 @@ from xml import sax from xml.sax import expatreader from oslo.serialization import jsonutils +from oslo_log import log as logging import six from sahara.i18n import _ from sahara.openstack.common import exception -from sahara.openstack.common import log as logging - LOG = logging.getLogger(__name__) diff --git a/tools/config/config-generator.sahara.conf b/tools/config/config-generator.sahara.conf index f227a59c..30aedd2a 100644 --- a/tools/config/config-generator.sahara.conf +++ b/tools/config/config-generator.sahara.conf @@ -4,7 +4,7 @@ namespace = oslo.db namespace = oslo.messaging namespace = oslo.concurrency namespace = keystonemiddleware.auth_token -namespace = log.config namespace = periodic.config namespace = policy.config namespace = ssl.config +namespace = oslo.log