Migrate to oslo.log

This is just a matter of switching import paths and adding appropriate
dependency.

Related-Bug: #1425013
Change-Id: I310e059a815377579de6bb2aa204de168e72571e
This commit is contained in:
Ihar Hrachyshka 2015-02-27 16:24:38 +01:00
parent 137686816e
commit 4d58d51eed
22 changed files with 24 additions and 21 deletions

View File

@ -16,8 +16,8 @@ from barbicanclient import client as barbican_client
from keystoneclient.auth.identity import v3 as keystone_client from keystoneclient.auth.identity import v3 as keystone_client
from keystoneclient import session from keystoneclient import session
from neutron.i18n import _LI, _LW, _LE from neutron.i18n import _LI, _LW, _LE
from neutron.openstack.common import log as logging
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from neutron_lbaas.common.cert_manager import cert_manager from neutron_lbaas.common.cert_manager import cert_manager

View File

@ -16,8 +16,8 @@ import os
import uuid import uuid
from neutron.i18n import _LI, _LE from neutron.i18n import _LI, _LE
from neutron.openstack.common import log as logging
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from neutron_lbaas.common.cert_manager import cert_manager from neutron_lbaas.common.cert_manager import cert_manager
from neutron_lbaas.common import exceptions from neutron_lbaas.common import exceptions

View File

@ -20,10 +20,10 @@ from neutron.db import model_base
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.db import servicetype_db as st_db from neutron.db import servicetype_db as st_db
from neutron import manager from neutron import manager
from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants from neutron.plugins.common import constants
from oslo_db import exception from oslo_db import exception
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import orm from sqlalchemy import orm

View File

@ -16,9 +16,9 @@
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.db import common_db_mixin as base_db from neutron.db import common_db_mixin as base_db
from neutron import manager from neutron import manager
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants from neutron.plugins.common import constants
from oslo_db import exception from oslo_db import exception
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
from sqlalchemy import orm from sqlalchemy import orm

View File

@ -26,10 +26,10 @@ from neutron.common import log
from neutron import context as ncontext from neutron import context as ncontext
from neutron.extensions import portbindings from neutron.extensions import portbindings
from neutron.i18n import _LE, _LW from neutron.i18n import _LE, _LW
from neutron.openstack.common import log as logging
from neutron.openstack.common import service from neutron.openstack.common import service
from neutron.plugins.common import constants from neutron.plugins.common import constants
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import importutils from oslo_utils import importutils

View File

@ -12,7 +12,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron.openstack.common import log as logging from oslo_log import log as logging
from neutron_lbaas.drivers import driver_base from neutron_lbaas.drivers import driver_base

View File

@ -18,12 +18,12 @@ from neutron.common import exceptions as n_exc
from neutron.common import topics from neutron.common import topics
from neutron import context as ncontext from neutron import context as ncontext
from neutron.i18n import _LE, _LI from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
from neutron.openstack.common import periodic_task from neutron.openstack.common import periodic_task
from neutron.plugins.common import constants from neutron.plugins.common import constants
from neutron.services import provider_configuration as provconfig from neutron.services import provider_configuration as provconfig
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging import oslo_messaging
from oslo_utils import importutils from oslo_utils import importutils

View File

@ -20,7 +20,7 @@ from neutron.db import agents_db
from neutron.db import agentschedulers_db from neutron.db import agentschedulers_db
from neutron.db import model_base from neutron.db import model_base
from neutron.i18n import _LW from neutron.i18n import _LW
from neutron.openstack.common import log as logging from oslo_log import log as logging
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy import orm from sqlalchemy import orm
from sqlalchemy.orm import joinedload from sqlalchemy.orm import joinedload

View File

@ -14,8 +14,8 @@
import a10_neutron_lbaas import a10_neutron_lbaas
from neutron.db import l3_db from neutron.db import l3_db
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants from neutron.plugins.common import constants
from oslo_log import log as logging
from neutron_lbaas.db.loadbalancer import loadbalancer_db as lb_db from neutron_lbaas.db.loadbalancer import loadbalancer_db as lb_db
from neutron_lbaas.services.loadbalancer.drivers import abstract_driver from neutron_lbaas.services.loadbalancer.drivers import abstract_driver

View File

@ -21,10 +21,10 @@ from neutron.common import topics
from neutron.db import agents_db from neutron.db import agents_db
from neutron.extensions import portbindings from neutron.extensions import portbindings
from neutron.i18n import _LW from neutron.i18n import _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants from neutron.plugins.common import constants
from neutron.services import provider_configuration as provconf from neutron.services import provider_configuration as provconf
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
import oslo_messaging import oslo_messaging
from oslo_utils import importutils from oslo_utils import importutils

View File

@ -17,8 +17,8 @@ from eventlet import greenthread
from eventlet import queue from eventlet import queue
from heleosapi import exceptions as h_exc from heleosapi import exceptions as h_exc
from neutron.i18n import _LE from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.embrane.common import contexts as ctx from neutron.plugins.embrane.common import contexts as ctx
from oslo_log import log as logging
from neutron_lbaas.services.loadbalancer.drivers.embrane.agent \ from neutron_lbaas.services.loadbalancer.drivers.embrane.agent \
import lb_operations import lb_operations

View File

@ -17,7 +17,7 @@ import functools
from heleosapi import exceptions as h_exc from heleosapi import exceptions as h_exc
from neutron.i18n import _LW from neutron.i18n import _LW
from neutron.openstack.common import log as logging from oslo_log import log as logging
from neutron_lbaas.services.loadbalancer import constants as lcon from neutron_lbaas.services.loadbalancer import constants as lcon
from neutron_lbaas.services.loadbalancer.drivers.embrane \ from neutron_lbaas.services.loadbalancer.drivers.embrane \

View File

@ -19,12 +19,12 @@ from heleosapi import info as h_info
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.common import exceptions as n_exc from neutron.common import exceptions as n_exc
from neutron.i18n import _LW from neutron.i18n import _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as pcon from neutron.plugins.common import constants as pcon
from neutron.plugins.embrane.common import contexts as embrane_ctx from neutron.plugins.embrane.common import contexts as embrane_ctx
from neutron.plugins.embrane.common import exceptions as h_exc from neutron.plugins.embrane.common import exceptions as h_exc
from neutron.plugins.embrane.common import utils from neutron.plugins.embrane.common import utils
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb
from neutron_lbaas.extensions import loadbalancer as lb_ext from neutron_lbaas.extensions import loadbalancer as lb_ext

View File

@ -17,10 +17,10 @@ from heleosapi import exceptions as h_exc
from neutron import context from neutron import context
from neutron.db import servicetype_db as sdb from neutron.db import servicetype_db as sdb
from neutron.i18n import _LE from neutron.i18n import _LE
from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
from neutron.plugins.common import constants as ccon from neutron.plugins.common import constants as ccon
from neutron.plugins.embrane.common import contexts as embrane_ctx from neutron.plugins.embrane.common import contexts as embrane_ctx
from oslo_log import log as logging
from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb
from neutron_lbaas.services.loadbalancer.drivers.embrane \ from neutron_lbaas.services.loadbalancer.drivers.embrane \

View File

@ -22,9 +22,9 @@ from neutron.agent.linux import utils
from neutron.common import exceptions from neutron.common import exceptions
from neutron.common import utils as n_utils from neutron.common import utils as n_utils
from neutron.i18n import _LE, _LW from neutron.i18n import _LE, _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants from neutron.plugins.common import constants
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from oslo_utils import importutils from oslo_utils import importutils

View File

@ -13,7 +13,8 @@
# under the License. # under the License.
from neutron.i18n import _LW from neutron.i18n import _LW
from neutron.openstack.common import log as logging from oslo_log import log as logging
from neutron_lbaas.drivers.haproxy import synchronous_namespace_driver from neutron_lbaas.drivers.haproxy import synchronous_namespace_driver
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -13,7 +13,8 @@
# under the License. # under the License.
from neutron.i18n import _LW from neutron.i18n import _LW
from neutron.openstack.common import log as logging from oslo_log import log as logging
from neutron_lbaas.drivers import logging_noop from neutron_lbaas.drivers import logging_noop
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

View File

@ -16,7 +16,7 @@ import base64
from neutron.common import exceptions as n_exc from neutron.common import exceptions as n_exc
from neutron.i18n import _LE from neutron.i18n import _LE
from neutron.openstack.common import log as logging from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
import requests import requests

View File

@ -14,9 +14,9 @@
from neutron.api.v2 import attributes from neutron.api.v2 import attributes
from neutron.i18n import _LI from neutron.i18n import _LI
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants from neutron.plugins.common import constants
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from neutron_lbaas.db.loadbalancer import loadbalancer_db from neutron_lbaas.db.loadbalancer import loadbalancer_db
from neutron_lbaas.services.loadbalancer.drivers import abstract_driver from neutron_lbaas.services.loadbalancer.drivers import abstract_driver

View File

@ -27,9 +27,9 @@ from neutron.api.v2 import attributes
from neutron.common import log as call_log from neutron.common import log as call_log
from neutron import context as ncontext from neutron import context as ncontext
from neutron.i18n import _LE, _LI, _LW from neutron.i18n import _LE, _LI, _LW
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants from neutron.plugins.common import constants
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
from six.moves import queue as Queue from six.moves import queue as Queue

View File

@ -18,11 +18,11 @@ from neutron.common import exceptions as n_exc
from neutron import context as ncontext from neutron import context as ncontext
from neutron.db import servicetype_db as st_db from neutron.db import servicetype_db as st_db
from neutron.i18n import _LI, _LE from neutron.i18n import _LI, _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants from neutron.plugins.common import constants
from neutron.services import provider_configuration as pconf from neutron.services import provider_configuration as pconf
from neutron.services import service_base from neutron.services import service_base
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import excutils from oslo_utils import excutils
from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb from neutron_lbaas.db.loadbalancer import loadbalancer_db as ldb

View File

@ -11,6 +11,7 @@ alembic>=0.7.2
six>=1.9.0 six>=1.9.0
oslo.config>=1.6.0 # Apache-2.0 oslo.config>=1.6.0 # Apache-2.0
oslo.db>=1.4.1 # Apache-2.0 oslo.db>=1.4.1 # Apache-2.0
oslo.log>=0.1.0 # Apache-2.0
oslo.messaging>=1.6.0 oslo.messaging>=1.6.0
oslo.serialization>=1.2.0 # Apache-2.0 oslo.serialization>=1.2.0 # Apache-2.0
oslo.utils>=1.2.0 # Apache-2.0 oslo.utils>=1.2.0 # Apache-2.0