import os
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.common import config
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import eventlet
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import importutils
from neutron import context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
LOG = logging.getLogger(__name__)
import abc
from oslo_config import cfg
+from oslo_log import log as logging
import six
from neutron.common import constants as n_const
from neutron.common import log
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
LOG = logging.getLogger(__name__)
import eventlet
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import excutils
from oslo_utils import importutils
from neutron import context as n_context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.openstack.common import periodic_task
from neutron.services import advanced_service as adv_svc
# under the License.
import binascii
-import netaddr
import weakref
+import netaddr
+from oslo_log import log as logging
+
from neutron.agent.l3 import dvr_fip_ns
from neutron.agent.l3 import dvr_snat_ns
from neutron.agent.linux import ip_lib
from neutron.agent.linux import iptables_manager
from neutron.common import constants as l3_constants
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
-import netaddr
import os
+import netaddr
+from oslo_log import log as logging
+
from neutron.agent.l3 import link_local_allocator as lla
from neutron.agent.l3 import namespaces
from neutron.agent.linux import ip_lib
from neutron.agent.linux import iptables_manager
from neutron.common import utils as common_utils
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.agent.l3 import dvr_fip_ns
from neutron.common import constants as l3_constants
from neutron.common import utils as common_utils
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.agent.l3 import namespaces
from neutron.agent.linux import ip_lib
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
SNAT_NS_PREFIX = 'snat-'
import os
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.linux import keepalived
from neutron.common import constants as l3_constants
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
-import netaddr
import shutil
import signal
+import netaddr
+from oslo_log import log as logging
+
from neutron.agent.l3 import router_info as router
from neutron.agent.linux import ip_lib
from neutron.agent.linux import keepalived
from neutron.agent.metadata import driver as metadata_driver
from neutron.common import constants as n_consts
from neutron.common import utils as common_utils
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
HA_DEV_PREFIX = 'ha-'
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.agent.l3 import dvr_snat_ns
from neutron.agent.l3 import namespaces
from neutron.agent.linux import ip_lib
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# under the License.
#
+from oslo_log import log as logging
+
from neutron.agent.linux import ip_lib
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.agent.l3 import namespaces
from neutron.agent.linux import ip_lib
from neutron.agent.linux import iptables_manager
from neutron.common import exceptions as n_exc
from neutron.common import utils as common_utils
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
INTERNAL_DEV_PREFIX = 'qr-'
import eventlet
import eventlet.event
import eventlet.queue
+from oslo_log import log as logging
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import signal
import sys
+from oslo_log import log as logging
+
from neutron.common import exceptions
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import shutil
import netaddr
+from oslo_log import log as logging
from oslo_utils import importutils
import six
from neutron.common import ipv6_utils
from neutron.common import utils as commonutils
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
LOG = logging.getLogger(__name__)
import eventlet
from oslo_concurrency import lockutils
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.common import config as agent_cfg
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.i18n import _LE
from neutron.openstack.common import fileutils
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
import six
from neutron.common import exceptions
from neutron.extensions import flavor
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# under the License.
import eventlet
-
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.linux import utils
from neutron.common import exceptions
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import re
+from oslo_log import log as logging
+
from neutron.agent.linux import utils
from neutron.common import exceptions as n_exc
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.agent.linux import async_process
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent import firewall
from neutron.agent.linux import ipset_manager
from neutron.common import constants
from neutron.common import ipv6_utils
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
from oslo_concurrency import lockutils
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.agent.common import config
from neutron.common import exceptions as n_exc
from neutron.common import utils
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.linux import external_process
from neutron.agent.linux import utils
from neutron.common import exceptions
-from neutron.openstack.common import log as logging
VALID_STATES = ['MASTER', 'BACKUP']
VALID_NOTIFY_STATES = ['master', 'backup', 'fault']
import operator
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
import retrying
import six
from neutron.agent.ovsdb import api as ovsdb
from neutron.common import exceptions
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
# Default timeout for ovs-vsctl command
# under the License.
import eventlet
+from oslo_log import log as logging
from neutron.agent.linux import async_process
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import jinja2
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
import six
from neutron.agent.linux import external_process
from neutron.agent.linux import utils
from neutron.common import constants
-from neutron.openstack.common import log as logging
RADVD_SERVICE_NAME = 'radvd'
from eventlet.green import subprocess
from eventlet import greenthread
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.agent.common import config
from neutron.common import constants
from neutron.common import utils
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import httplib2
from neutronclient.v2_0 import client
from oslo_config import cfg
+from oslo_log import log as logging
+from oslo_log import loggers
import oslo_messaging
from oslo_utils import excutils
import six.moves.urllib.parse as urlparse
from neutron import context
from neutron.i18n import _LE, _LW
from neutron.openstack.common.cache import cache
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron import wsgi
application,
max_size=self.num_threads,
protocol=UnixDomainHttpProtocol,
- log=logging.WritableLogger(logger))
+ log=loggers.WritableLogger(logger))
class UnixDomainMetadataProxy(object):
import os
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.common import config
from neutron.agent.linux import external_process
from neutron.common import exceptions
-from neutron.openstack.common import log as logging
from neutron.services import advanced_service
LOG = logging.getLogger(__name__)
import httplib2
from oslo_config import cfg
+from oslo_log import log as logging
import six.moves.urllib.parse as urlparse
import webob
from neutron.common import exceptions
from neutron.common import utils
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron import wsgi
LOG = logging.getLogger(__name__)
import sys
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.common import config as agent_conf
from neutron.agent.metadata import agent
from neutron.common import config
from neutron.common import utils
from neutron.openstack.common.cache import cache
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import itertools
import uuid
+from oslo_log import log as logging
from oslo_serialization import jsonutils
from oslo_utils import excutils
from neutron.agent.linux import utils
from neutron.agent.ovsdb import api as ovsdb
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# under the License.
import itertools
+
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import timeutils
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import functools
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import importutils
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron.i18n import _LI, _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# history
import urllib
from oslo_config import cfg
+from oslo_log import log as logging
from webob import exc
from neutron.common import constants
from neutron.common import exceptions
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import os
from oslo_config import cfg
+from oslo_log import log as logging
import routes
import six
import webob.dec
import neutron.extensions
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron import wsgi
# See the License for the specific language governing permissions and
# limitations under the License.
+from oslo_log import log as logging
import oslo_messaging
from neutron.common import constants
from neutron.common import utils
from neutron.i18n import _LE, _LW
from neutron import manager
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import random
+from oslo_log import log as logging
import oslo_messaging
from neutron.common import constants
from neutron.common import utils
from neutron.i18n import _LE
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as service_constants
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
import oslo_messaging
from neutron.common import constants
from neutron.common import topics
from neutron.common import utils
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as service_constants
LOG = logging.getLogger(__name__)
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import excutils
from neutron.extensions import portbindings
from neutron.i18n import _LW
from neutron import manager
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
import oslo_messaging
from neutron.common import constants
from neutron.common import rpc as n_rpc
from neutron.common import topics
from neutron import manager
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# limitations under the License.
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_serialization import jsonutils
from neutron.extensions import portbindings
from neutron.i18n import _LE
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as plugin_constants
# License for the specific language governing permissions and limitations
# under the License.
-import netaddr
import re
+import netaddr
+from oslo_log import log as logging
+
from neutron.common import constants
from neutron.common import exceptions as n_exc
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
# under the License.
import copy
-import netaddr
-import webob.exc
+import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
+import webob.exc
from neutron.api import api_common
from neutron.api.rpc.agentnotifiers import dhcp_rpc_agent_api
from neutron.common import exceptions
from neutron.common import rpc as n_rpc
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.openstack.common import policy as common_policy
from neutron import policy
from neutron import quota
import netaddr
import oslo_i18n
+from oslo_log import log as logging
import six
import webob.dec
import webob.exc
from neutron.common import exceptions
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.openstack.common import policy as common_policy
from neutron import wsgi
# limitations under the License.
from oslo_config import cfg
+from oslo_log import log as logging
import routes as routes_mapper
import six.moves.urllib.parse as urlparse
import webob
from neutron.api.v2 import attributes
from neutron.api.v2 import base
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron import policy
from neutron import wsgi
# under the License.
import oslo_i18n
+from oslo_log import log as logging
import webob.dec
from neutron.api.views import versions as versions_view
-from neutron.openstack.common import log as logging
from neutron import wsgi
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_middleware import request_id
import webob.dec
import webob.exc
from neutron import context
-from neutron.openstack.common import log as logging
from neutron import wsgi
LOG = logging.getLogger(__name__)
import collections
import weakref
+from oslo_log import log as logging
from oslo_utils import reflection
from neutron.callbacks import events
from neutron.callbacks import exceptions
from neutron.callbacks import resources
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import time
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
from neutron.agent.common import config as agent_config
from neutron.api.v2 import attributes
from neutron.common import config
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.common import config as agent_config
from neutron.agent.l3 import config as l3_config
from neutron.agent.linux import ovs_lib
from neutron.common import config
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import re
import netaddr
+from oslo_log import log as logging
from neutron.agent.linux import ip_lib
from neutron.agent.linux import ip_link_support
from neutron.agent.linux import utils as agent_utils
from neutron.common import utils
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants as const
from neutron.plugins.openvswitch.common import constants as ovs_const
import sys
+from oslo_config import cfg
+from oslo_log import log as logging
+
from neutron.agent import dhcp_agent
from neutron.cmd.sanity import checks
from neutron.common import config
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log as logging
-from oslo_config import cfg
LOG = logging.getLogger(__name__)
from keystoneclient import session as ks_session
from oslo_config import cfg
from oslo_db import options as db_options
+from oslo_log import log as logging
import oslo_messaging
from paste import deploy
from neutron.api.v2 import attributes
from neutron.common import utils
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
from neutron import version
]
cfg.CONF.register_opts(nova_opts, group=NOVA_CONF_SECTION)
+logging.register_options(cfg.CONF)
+
def init(args, **kwargs):
cfg.CONF(args=args, project='neutron',
def setup_logging():
"""Sets up the logging options for a log with supplied name."""
product_name = "neutron"
- logging.setup(product_name)
+ logging.setup(cfg.CONF, product_name)
LOG.info(_LI("Logging enabled!"))
LOG.info(_LI("%(prog)s version %(version)s"),
{'prog': sys.argv[0],
import os
import netaddr
+from oslo_log import log
from neutron.common import constants
from neutron.i18n import _LI
-from neutron.openstack.common import log
LOG = log.getLogger(__name__)
"""Log helper functions."""
import functools
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
def log(method):
import os
from oslo_config import cfg
-
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
LOG = logging.getLogger(__name__)
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_messaging import serializer as om_serializer
from neutron.common import exceptions
from neutron import context
-from neutron.openstack.common import log as logging
from neutron.openstack.common import service
from eventlet.green import subprocess
from oslo_concurrency import lockutils
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.common import constants as q_const
-from neutron.openstack.common import log as logging
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
import datetime
from oslo_context import context as oslo_context
+from oslo_log import log as logging
from neutron.db import api as db_api
-from neutron.openstack.common import local
-from neutron.openstack.common import log as logging
from neutron import policy
super(ContextBase, self).__init__(auth_token=auth_token,
user=user_id, tenant=tenant_id,
is_admin=is_admin,
- request_id=request_id)
+ request_id=request_id,
+ overwrite=overwrite)
self.user_name = user_name
self.tenant_name = tenant_name
admin_roles = policy.get_admin_roles()
if admin_roles:
self.roles = list(set(self.roles) | set(admin_roles))
- # Allow openstack.common.log to access the context
- if overwrite or not hasattr(local.store, 'context'):
- local.store.context = self
-
# Log only once the context has been configured to prevent
# format errors.
if kwargs:
# under the License.
from eventlet import greenthread
-
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log as logging
import oslo_messaging
from oslo_serialization import jsonutils
from oslo_utils import timeutils
from neutron.extensions import agent as ext_agent
from neutron.i18n import _LW
from neutron import manager
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
cfg.CONF.register_opt(
import time
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import timeutils
import sqlalchemy as sa
from sqlalchemy import orm
from neutron.extensions import agent as ext_agent
from neutron.extensions import dhcpagentscheduler
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
import netaddr
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log as logging
from oslo_utils import excutils
from sqlalchemy import and_
from sqlalchemy import event
from neutron.i18n import _LE, _LI
from neutron import manager
from neutron import neutron_plugin_base_v2
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants as service_constants
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_config import cfg
from oslo_db import exception as db_exc
-
+from oslo_log import log as logging
import sqlalchemy as sa
+from sqlalchemy.orm import exc
from neutron.common import exceptions as q_exc
from neutron.common import log
from neutron.extensions import portbindings
from neutron.i18n import _LE
from neutron import manager
-from neutron.openstack.common import log as logging
-from oslo_config import cfg
-from sqlalchemy.orm import exc
+
LOG = logging.getLogger(__name__)
+
dvr_mac_address_opts = [
cfg.StrOpt('dvr_base_mac',
default="fa:16:3f:00:00:00",
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import extra_dhcp_opt as edo_ext
-from neutron.openstack.common import log as logging
+
LOG = logging.getLogger(__name__)
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from neutron.db import models_v2
from neutron.extensions import extraroute
from neutron.extensions import l3
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log as logging
import oslo_messaging
import sqlalchemy as sa
from sqlalchemy import func
from neutron.extensions import l3agentscheduler
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# under the License.
import netaddr
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
from neutron.extensions import l3
from neutron.i18n import _LI
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.api.v2 import attributes
from neutron.common import constants as l3_const
from neutron.extensions import portbindings
from neutron.i18n import _LI
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
import random
from oslo_db import exception as db_exc
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
from neutron.db import model_base
from neutron.db import models_v2
from neutron.i18n import _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2 import db as ml2_db
LOG = logging.getLogger(__name__)
# under the License.
#
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import sql
from neutron.db import db_base_plugin_v2
from neutron.db import l3_db
from neutron.extensions import l3
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import netaddr
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log as logging
from oslo_utils import excutils
import sqlalchemy as sa
from sqlalchemy import orm
from neutron.db import models_v2
from neutron.extensions import l3_ext_ha_mode as l3_ha
from neutron.i18n import _LI, _LW
-from neutron.openstack.common import log as logging
VR_ID_RANGE = set(range(1, 255))
MAX_ALLOCATION_TRIES = 10
# under the License.
import netaddr
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy import sql
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import metering
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
import oslo_messaging
from neutron.common import constants as consts
from neutron.common import utils
from neutron.i18n import _LE
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as service_constants
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import portsecurity as psec
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import netaddr
from oslo_db import exception
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import orm
from sqlalchemy.orm import exc
from neutron.db import model_base
from neutron.db import models_v2
from neutron.extensions import securitygroup as ext_sg
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
LOG = logging.getLogger(__name__)
# under the License.
import netaddr
+from oslo_log import log as logging
from sqlalchemy.orm import exc
from neutron.common import constants as q_const
from neutron.db import securitygroups_db as sg_db
from neutron.extensions import securitygroup as ext_sg
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
import sqlalchemy as sa
from neutron.db import model_base
-from neutron.openstack.common import log as logging
from neutron.services import provider_configuration as pconf
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
from six import moves
import sqlalchemy
from sqlalchemy.orm import properties
from neutron.common import exceptions as n_exc
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
from neutronclient.common import utils
from neutronclient.neutron import v2_0 as client
from neutronclient.neutron.v2_0 import port
+from oslo_log import log as logging
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
class ProbeCommand(client.NeutronCommand):
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.linux import dhcp
from neutron.agent.linux import ip_lib
from neutron.agent.linux import utils
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.api import extensions
from neutron.api.v2 import attributes
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import abc
+from oslo_log import log as logging
import webob.exc
from neutron.api import extensions
from neutron.extensions import agent
from neutron.i18n import _LE
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as service_constants
from neutron import policy
from neutron import wsgi
import abc
+from oslo_log import log as logging
import six
from neutron.api import extensions
from neutron.api.v2 import attributes as attr
from neutron.api.v2 import resource_helper
from neutron.common import exceptions as nexception
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.services import service_base
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.api import extensions
from neutron.api.v2 import attributes
from neutron.api.v2 import base
from neutron.db import servicetype_db
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# neutron/tests/unit/hacking/test_checks.py
_all_log_levels = {
- # NOTE(yamamoto): Following nova which uses _() for audit.
- 'audit': '_',
'error': '_LE',
'info': '_LI',
'warn': '_LW',
import weakref
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import importutils
from neutron.common import utils
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.openstack.common import periodic_task
from neutron.plugins.common import constants
from novaclient import client as nova_client
from novaclient import exceptions as nova_exceptions
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
from sqlalchemy.orm import attributes as sql_attr
from neutron import context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
+++ /dev/null
-# Copyright 2011 OpenStack Foundation.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-"""Local storage of variables using weak references"""
-
-import threading
-import weakref
-
-
-class WeakLocal(threading.local):
- def __getattribute__(self, attr):
- rval = super(WeakLocal, self).__getattribute__(attr)
- if rval:
- # NOTE(mikal): this bit is confusing. What is stored is a weak
- # reference, not the value itself. We therefore need to lookup
- # the weak reference and return the inner value here.
- rval = rval()
- return rval
-
- def __setattr__(self, attr, value):
- value = weakref.ref(value)
- return super(WeakLocal, self).__setattr__(attr, value)
-
-
-# NOTE(mikal): the name "store" should be deprecated in the future
-store = WeakLocal()
-
-# A "weak" store uses weak references and allows an object to fall out of scope
-# when it falls out of scope in the code that uses the thread local storage. A
-# "strong" store will hold a reference to the object so that it never falls out
-# of scope.
-weak_store = WeakLocal()
-strong_store = threading.local()
+++ /dev/null
-# Copyright 2011 OpenStack Foundation.
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-"""OpenStack logging handler.
-
-This module adds to logging functionality by adding the option to specify
-a context object when calling the various log methods. If the context object
-is not specified, default formatting is used. Additionally, an instance uuid
-may be passed as part of the log message, which is intended to make it easier
-for admins to find messages related to a specific instance.
-
-It also allows setting of formatting information through conf.
-
-"""
-
-import copy
-import inspect
-import itertools
-import logging
-import logging.config
-import logging.handlers
-import os
-import socket
-import sys
-import traceback
-
-from oslo.config import cfg
-from oslo.serialization import jsonutils
-from oslo.utils import importutils
-import six
-from six import moves
-
-_PY26 = sys.version_info[0:2] == (2, 6)
-
-from neutron.openstack.common._i18n import _
-from neutron.openstack.common import local
-
-
-_DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
-
-
-common_cli_opts = [
- cfg.BoolOpt('debug',
- short='d',
- default=False,
- help='Print debugging output (set logging level to '
- 'DEBUG instead of default WARNING level).'),
- cfg.BoolOpt('verbose',
- short='v',
- default=False,
- help='Print more verbose output (set logging level to '
- 'INFO instead of default WARNING level).'),
-]
-
-logging_cli_opts = [
- cfg.StrOpt('log-config-append',
- metavar='PATH',
- deprecated_name='log-config',
- help='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.'),
- cfg.StrOpt('log-format',
- metavar='FORMAT',
- help='DEPRECATED. '
- 'A logging.Formatter log message format string which may '
- 'use any of the available logging.LogRecord attributes. '
- 'This option is deprecated. Please use '
- 'logging_context_format_string and '
- 'logging_default_format_string instead.'),
- cfg.StrOpt('log-date-format',
- default=_DEFAULT_LOG_DATE_FORMAT,
- metavar='DATE_FORMAT',
- help='Format string for %%(asctime)s in log records. '
- 'Default: %(default)s .'),
- cfg.StrOpt('log-file',
- metavar='PATH',
- deprecated_name='logfile',
- help='(Optional) Name of log file to output to. '
- 'If no default is set, logging will go to stdout.'),
- cfg.StrOpt('log-dir',
- deprecated_name='logdir',
- help='(Optional) The base directory used for relative '
- '--log-file paths.'),
- cfg.BoolOpt('use-syslog',
- default=False,
- help='Use syslog for logging. '
- 'Existing syslog format is DEPRECATED during I, '
- 'and will change in J to honor RFC5424.'),
- cfg.BoolOpt('use-syslog-rfc-format',
- # TODO(bogdando) remove or use True after existing
- # syslog format deprecation in J
- default=False,
- help='(Optional) Enables or disables syslog rfc5424 format '
- 'for logging. If enabled, prefixes the MSG part of the '
- 'syslog message with APP-NAME (RFC5424). The '
- 'format without the APP-NAME is deprecated in I, '
- 'and will be removed in J.'),
- cfg.StrOpt('syslog-log-facility',
- default='LOG_USER',
- help='Syslog facility to receive log lines.')
-]
-
-generic_log_opts = [
- cfg.BoolOpt('use_stderr',
- default=True,
- help='Log output to standard error.')
-]
-
-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"]
-
-log_opts = [
- cfg.StrOpt('logging_context_format_string',
- default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s '
- '%(name)s [%(request_id)s %(user_identity)s] '
- '%(instance)s%(message)s',
- help='Format string to use for log messages with context.'),
- cfg.StrOpt('logging_default_format_string',
- default='%(asctime)s.%(msecs)03d %(process)d %(levelname)s '
- '%(name)s [-] %(instance)s%(message)s',
- help='Format string to use for log messages without context.'),
- cfg.StrOpt('logging_debug_format_suffix',
- default='%(funcName)s %(pathname)s:%(lineno)d',
- help='Data to append to log format when level is DEBUG.'),
- cfg.StrOpt('logging_exception_prefix',
- default='%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s '
- '%(instance)s',
- help='Prefix each line of exception output with this format.'),
- cfg.ListOpt('default_log_levels',
- default=DEFAULT_LOG_LEVELS,
- help='List of logger=LEVEL pairs.'),
- cfg.BoolOpt('publish_errors',
- default=False,
- help='Enables or disables publication of error events.'),
- cfg.BoolOpt('fatal_deprecations',
- default=False,
- help='Enables or disables fatal status of deprecations.'),
-
- # NOTE(mikal): there are two options here because sometimes we are handed
- # a full instance (and could include more information), and other times we
- # are just handed a UUID for the instance.
- cfg.StrOpt('instance_format',
- default='[instance: %(uuid)s] ',
- help='The format for an instance that is passed with the log '
- 'message.'),
- cfg.StrOpt('instance_uuid_format',
- default='[instance: %(uuid)s] ',
- help='The format for an instance UUID that is passed with the '
- 'log message.'),
-]
-
-CONF = cfg.CONF
-CONF.register_cli_opts(common_cli_opts)
-CONF.register_cli_opts(logging_cli_opts)
-CONF.register_opts(generic_log_opts)
-CONF.register_opts(log_opts)
-
-
-def list_opts():
- """Entry point for oslo.config-generator."""
- return [(None, copy.deepcopy(common_cli_opts)),
- (None, copy.deepcopy(logging_cli_opts)),
- (None, copy.deepcopy(generic_log_opts)),
- (None, copy.deepcopy(log_opts)),
- ]
-
-
-# our new audit level
-# NOTE(jkoelker) Since we synthesized an audit level, make the logging
-# module aware of it so it acts like other levels.
-logging.AUDIT = logging.INFO + 1
-logging.addLevelName(logging.AUDIT, 'AUDIT')
-
-
-try:
- NullHandler = logging.NullHandler
-except AttributeError: # NOTE(jkoelker) NullHandler added in Python 2.7
- class NullHandler(logging.Handler):
- def handle(self, record):
- pass
-
- def emit(self, record):
- pass
-
- def createLock(self):
- self.lock = None
-
-
-def _dictify_context(context):
- if context is None:
- return None
- if not isinstance(context, dict) and getattr(context, 'to_dict', None):
- context = context.to_dict()
- return context
-
-
-def _get_binary_name():
- return os.path.basename(inspect.stack()[-1][1])
-
-
-def _get_log_file_path(binary=None):
- logfile = CONF.log_file
- logdir = CONF.log_dir
-
- if logfile and not logdir:
- return logfile
-
- if logfile and logdir:
- return os.path.join(logdir, logfile)
-
- if logdir:
- binary = binary or _get_binary_name()
- return '%s.log' % (os.path.join(logdir, binary),)
-
- return None
-
-
-class BaseLoggerAdapter(logging.LoggerAdapter):
-
- def audit(self, msg, *args, **kwargs):
- self.log(logging.AUDIT, msg, *args, **kwargs)
-
- def isEnabledFor(self, level):
- if _PY26:
- # This method was added in python 2.7 (and it does the exact
- # same logic, so we need to do the exact same logic so that
- # python 2.6 has this capability as well).
- return self.logger.isEnabledFor(level)
- else:
- return super(BaseLoggerAdapter, self).isEnabledFor(level)
-
-
-class LazyAdapter(BaseLoggerAdapter):
- def __init__(self, name='unknown', version='unknown'):
- self._logger = None
- self.extra = {}
- self.name = name
- self.version = version
-
- @property
- def logger(self):
- if not self._logger:
- self._logger = getLogger(self.name, self.version)
- if six.PY3:
- # In Python 3, the code fails because the 'manager' attribute
- # cannot be found when using a LoggerAdapter as the
- # underlying logger. Work around this issue.
- self._logger.manager = self._logger.logger.manager
- return self._logger
-
-
-class ContextAdapter(BaseLoggerAdapter):
- warn = logging.LoggerAdapter.warning
-
- def __init__(self, logger, project_name, version_string):
- self.logger = logger
- self.project = project_name
- self.version = version_string
- self._deprecated_messages_sent = dict()
-
- @property
- def handlers(self):
- return self.logger.handlers
-
- def deprecated(self, msg, *args, **kwargs):
- """Call this method when a deprecated feature is used.
-
- If the system is configured for fatal deprecations then the message
- is logged at the 'critical' level and :class:`DeprecatedConfig` will
- be raised.
-
- Otherwise, the message will be logged (once) at the 'warn' level.
-
- :raises: :class:`DeprecatedConfig` if the system is configured for
- fatal deprecations.
-
- """
- stdmsg = _("Deprecated: %s") % msg
- if CONF.fatal_deprecations:
- self.critical(stdmsg, *args, **kwargs)
- raise DeprecatedConfig(msg=stdmsg)
-
- # Using a list because a tuple with dict can't be stored in a set.
- sent_args = self._deprecated_messages_sent.setdefault(msg, list())
-
- if args in sent_args:
- # Already logged this message, so don't log it again.
- return
-
- sent_args.append(args)
- self.warn(stdmsg, *args, **kwargs)
-
- def process(self, msg, kwargs):
- # NOTE(jecarey): If msg is not unicode, coerce it into unicode
- # before it can get to the python logging and
- # possibly cause string encoding trouble
- if not isinstance(msg, six.text_type):
- msg = six.text_type(msg)
-
- if 'extra' not in kwargs:
- kwargs['extra'] = {}
- extra = kwargs['extra']
-
- context = kwargs.pop('context', None)
- if not context:
- context = getattr(local.store, 'context', None)
- if context:
- extra.update(_dictify_context(context))
-
- instance = kwargs.pop('instance', None)
- instance_uuid = (extra.get('instance_uuid') or
- kwargs.pop('instance_uuid', None))
- instance_extra = ''
- if instance:
- instance_extra = CONF.instance_format % instance
- elif instance_uuid:
- instance_extra = (CONF.instance_uuid_format
- % {'uuid': instance_uuid})
- extra['instance'] = instance_extra
-
- extra.setdefault('user_identity', kwargs.pop('user_identity', None))
-
- extra['project'] = self.project
- extra['version'] = self.version
- extra['extra'] = extra.copy()
- return msg, kwargs
-
-
-class JSONFormatter(logging.Formatter):
- def __init__(self, fmt=None, datefmt=None):
- # NOTE(jkoelker) we ignore the fmt argument, but its still there
- # since logging.config.fileConfig passes it.
- self.datefmt = datefmt
-
- def formatException(self, ei, strip_newlines=True):
- lines = traceback.format_exception(*ei)
- if strip_newlines:
- lines = [moves.filter(
- lambda x: x,
- line.rstrip().splitlines()) for line in lines]
- lines = list(itertools.chain(*lines))
- return lines
-
- def format(self, record):
- message = {'message': record.getMessage(),
- 'asctime': self.formatTime(record, self.datefmt),
- 'name': record.name,
- 'msg': record.msg,
- 'args': record.args,
- 'levelname': record.levelname,
- 'levelno': record.levelno,
- 'pathname': record.pathname,
- 'filename': record.filename,
- 'module': record.module,
- 'lineno': record.lineno,
- 'funcname': record.funcName,
- 'created': record.created,
- 'msecs': record.msecs,
- 'relative_created': record.relativeCreated,
- 'thread': record.thread,
- 'thread_name': record.threadName,
- 'process_name': record.processName,
- 'process': record.process,
- 'traceback': None}
-
- if hasattr(record, 'extra'):
- message['extra'] = record.extra
-
- if record.exc_info:
- message['traceback'] = self.formatException(record.exc_info)
-
- return jsonutils.dumps(message)
-
-
-def _create_logging_excepthook(product_name):
- def logging_excepthook(exc_type, value, tb):
- extra = {'exc_info': (exc_type, value, tb)}
- getLogger(product_name).critical(
- "".join(traceback.format_exception_only(exc_type, value)),
- **extra)
- return logging_excepthook
-
-
-class LogConfigError(Exception):
-
- message = _('Error loading logging config %(log_config)s: %(err_msg)s')
-
- def __init__(self, log_config, err_msg):
- self.log_config = log_config
- self.err_msg = err_msg
-
- def __str__(self):
- return self.message % dict(log_config=self.log_config,
- err_msg=self.err_msg)
-
-
-def _load_log_config(log_config_append):
- try:
- logging.config.fileConfig(log_config_append,
- disable_existing_loggers=False)
- except (moves.configparser.Error, KeyError) as exc:
- raise LogConfigError(log_config_append, six.text_type(exc))
-
-
-def setup(product_name, version='unknown'):
- """Setup logging."""
- if CONF.log_config_append:
- _load_log_config(CONF.log_config_append)
- else:
- _setup_logging_from_conf(product_name, version)
- sys.excepthook = _create_logging_excepthook(product_name)
-
-
-def set_defaults(logging_context_format_string=None,
- default_log_levels=None):
- # Just in case the caller is not setting the
- # default_log_level. This is insurance because
- # we introduced the default_log_level parameter
- # later in a backwards in-compatible change
- if default_log_levels is not None:
- cfg.set_defaults(
- log_opts,
- default_log_levels=default_log_levels)
- if logging_context_format_string is not None:
- cfg.set_defaults(
- log_opts,
- logging_context_format_string=logging_context_format_string)
-
-
-def _find_facility_from_conf():
- facility_names = logging.handlers.SysLogHandler.facility_names
- facility = getattr(logging.handlers.SysLogHandler,
- CONF.syslog_log_facility,
- None)
-
- if facility is None and CONF.syslog_log_facility in facility_names:
- facility = facility_names.get(CONF.syslog_log_facility)
-
- if facility is None:
- valid_facilities = facility_names.keys()
- consts = ['LOG_AUTH', 'LOG_AUTHPRIV', 'LOG_CRON', 'LOG_DAEMON',
- 'LOG_FTP', 'LOG_KERN', 'LOG_LPR', 'LOG_MAIL', 'LOG_NEWS',
- 'LOG_AUTH', 'LOG_SYSLOG', 'LOG_USER', 'LOG_UUCP',
- 'LOG_LOCAL0', 'LOG_LOCAL1', 'LOG_LOCAL2', 'LOG_LOCAL3',
- 'LOG_LOCAL4', 'LOG_LOCAL5', 'LOG_LOCAL6', 'LOG_LOCAL7']
- valid_facilities.extend(consts)
- raise TypeError(_('syslog facility must be one of: %s') %
- ', '.join("'%s'" % fac
- for fac in valid_facilities))
-
- return facility
-
-
-class RFCSysLogHandler(logging.handlers.SysLogHandler):
- def __init__(self, *args, **kwargs):
- self.binary_name = _get_binary_name()
- # Do not use super() unless type(logging.handlers.SysLogHandler)
- # is 'type' (Python 2.7).
- # Use old style calls, if the type is 'classobj' (Python 2.6)
- logging.handlers.SysLogHandler.__init__(self, *args, **kwargs)
-
- def format(self, record):
- # Do not use super() unless type(logging.handlers.SysLogHandler)
- # is 'type' (Python 2.7).
- # Use old style calls, if the type is 'classobj' (Python 2.6)
- msg = logging.handlers.SysLogHandler.format(self, record)
- msg = self.binary_name + ' ' + msg
- return msg
-
-
-def _setup_logging_from_conf(project, version):
- log_root = getLogger(None).logger
- for handler in log_root.handlers:
- log_root.removeHandler(handler)
-
- logpath = _get_log_file_path()
- if logpath:
- filelog = logging.handlers.WatchedFileHandler(logpath)
- log_root.addHandler(filelog)
-
- if CONF.use_stderr:
- streamlog = ColorHandler()
- log_root.addHandler(streamlog)
-
- elif not logpath:
- # pass sys.stdout as a positional argument
- # python2.6 calls the argument strm, in 2.7 it's stream
- streamlog = logging.StreamHandler(sys.stdout)
- log_root.addHandler(streamlog)
-
- if CONF.publish_errors:
- handler = importutils.import_object(
- "oslo.messaging.notify.log_handler.PublishErrorsHandler",
- logging.ERROR)
- log_root.addHandler(handler)
-
- datefmt = CONF.log_date_format
- for handler in log_root.handlers:
- # NOTE(alaski): CONF.log_format overrides everything currently. This
- # should be deprecated in favor of context aware formatting.
- if CONF.log_format:
- handler.setFormatter(logging.Formatter(fmt=CONF.log_format,
- datefmt=datefmt))
- log_root.info('Deprecated: log_format is now deprecated and will '
- 'be removed in the next release')
- else:
- handler.setFormatter(ContextFormatter(project=project,
- version=version,
- datefmt=datefmt))
-
- if CONF.debug:
- log_root.setLevel(logging.DEBUG)
- elif CONF.verbose:
- log_root.setLevel(logging.INFO)
- else:
- log_root.setLevel(logging.WARNING)
-
- for pair in CONF.default_log_levels:
- mod, _sep, level_name = pair.partition('=')
- logger = logging.getLogger(mod)
- # NOTE(AAzza) in python2.6 Logger.setLevel doesn't convert string name
- # to integer code.
- if sys.version_info < (2, 7):
- level = logging.getLevelName(level_name)
- logger.setLevel(level)
- else:
- logger.setLevel(level_name)
-
- if CONF.use_syslog:
- try:
- facility = _find_facility_from_conf()
- # TODO(bogdando) use the format provided by RFCSysLogHandler
- # after existing syslog format deprecation in J
- if CONF.use_syslog_rfc_format:
- syslog = RFCSysLogHandler(address='/dev/log',
- facility=facility)
- else:
- syslog = logging.handlers.SysLogHandler(address='/dev/log',
- facility=facility)
- log_root.addHandler(syslog)
- except socket.error:
- log_root.error('Unable to add syslog handler. Verify that syslog '
- 'is running.')
-
-
-_loggers = {}
-
-
-def getLogger(name='unknown', version='unknown'):
- if name not in _loggers:
- _loggers[name] = ContextAdapter(logging.getLogger(name),
- name,
- version)
- return _loggers[name]
-
-
-def getLazyLogger(name='unknown', version='unknown'):
- """Returns lazy logger.
-
- Creates a pass-through logger that does not create the real logger
- until it is really needed and delegates all calls to the real logger
- once it is created.
- """
- return LazyAdapter(name, version)
-
-
-class WritableLogger(object):
- """A thin wrapper that responds to `write` and logs."""
-
- def __init__(self, logger, level=logging.INFO):
- self.logger = logger
- self.level = level
-
- def write(self, msg):
- self.logger.log(self.level, msg.rstrip())
-
-
-class ContextFormatter(logging.Formatter):
- """A context.RequestContext aware formatter configured through flags.
-
- The flags used to set format strings are: logging_context_format_string
- and logging_default_format_string. You can also specify
- logging_debug_format_suffix to append extra formatting if the log level is
- debug.
-
- For information about what variables are available for the formatter see:
- http://docs.python.org/library/logging.html#formatter
-
- If available, uses the context value stored in TLS - local.store.context
-
- """
-
- def __init__(self, *args, **kwargs):
- """Initialize ContextFormatter instance
-
- Takes additional keyword arguments which can be used in the message
- format string.
-
- :keyword project: project name
- :type project: string
- :keyword version: project version
- :type version: string
-
- """
-
- self.project = kwargs.pop('project', 'unknown')
- self.version = kwargs.pop('version', 'unknown')
-
- logging.Formatter.__init__(self, *args, **kwargs)
-
- def format(self, record):
- """Uses contextstring if request_id is set, otherwise default."""
-
- # NOTE(jecarey): If msg is not unicode, coerce it into unicode
- # before it can get to the python logging and
- # possibly cause string encoding trouble
- if not isinstance(record.msg, six.text_type):
- record.msg = six.text_type(record.msg)
-
- # store project info
- record.project = self.project
- record.version = self.version
-
- # store request info
- context = getattr(local.store, 'context', None)
- if context:
- d = _dictify_context(context)
- for k, v in d.items():
- setattr(record, k, v)
-
- # NOTE(sdague): default the fancier formatting params
- # to an empty string so we don't throw an exception if
- # they get used
- for key in ('instance', 'color', 'user_identity'):
- if key not in record.__dict__:
- record.__dict__[key] = ''
-
- if record.__dict__.get('request_id'):
- fmt = CONF.logging_context_format_string
- else:
- fmt = CONF.logging_default_format_string
-
- if (record.levelno == logging.DEBUG and
- CONF.logging_debug_format_suffix):
- fmt += " " + CONF.logging_debug_format_suffix
-
- if sys.version_info < (3, 2):
- self._fmt = fmt
- else:
- self._style = logging.PercentStyle(fmt)
- self._fmt = self._style._fmt
- # Cache this on the record, Logger will respect our formatted copy
- if record.exc_info:
- record.exc_text = self.formatException(record.exc_info, record)
- return logging.Formatter.format(self, record)
-
- def formatException(self, exc_info, record=None):
- """Format exception output with CONF.logging_exception_prefix."""
- if not record:
- return logging.Formatter.formatException(self, exc_info)
-
- stringbuffer = moves.StringIO()
- traceback.print_exception(exc_info[0], exc_info[1], exc_info[2],
- None, stringbuffer)
- lines = stringbuffer.getvalue().split('\n')
- stringbuffer.close()
-
- if CONF.logging_exception_prefix.find('%(asctime)') != -1:
- record.asctime = self.formatTime(record, self.datefmt)
-
- formatted_lines = []
- for line in lines:
- pl = CONF.logging_exception_prefix % record.__dict__
- fl = '%s%s' % (pl, line)
- formatted_lines.append(fl)
- return '\n'.join(formatted_lines)
-
-
-class ColorHandler(logging.StreamHandler):
- LEVEL_COLORS = {
- logging.DEBUG: '\033[00;32m', # GREEN
- logging.INFO: '\033[00;36m', # CYAN
- logging.AUDIT: '\033[01;36m', # BOLD CYAN
- logging.WARN: '\033[01;33m', # BOLD YELLOW
- logging.ERROR: '\033[01;31m', # BOLD RED
- logging.CRITICAL: '\033[01;31m', # BOLD RED
- }
-
- def format(self, record):
- record.color = self.LEVEL_COLORS[record.levelno]
- return logging.StreamHandler.format(self, record)
-
-
-class DeprecatedConfig(Exception):
- message = _("Fatal call to deprecated config: %(msg)s")
-
- def __init__(self, msg):
- super(Exception, self).__init__(self.message % dict(msg=msg))
from oslo_config import cfg
from oslo_context import context as oslo_context
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import importutils
from neutron.extensions import portbindings
from neutron.extensions import securitygroup as ext_sg
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.brocade.db import models as brocade_db
from neutron.plugins.brocade import vlanbm as vbm
from neutron.plugins.common import constants as svc_constants
"""
from ncclient import manager
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron.plugins.brocade.nos import nctemplates as template
import argparse
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
+
from neutron.plugins.brocade.nos import nosdriver as nos
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
-import netaddr
import re
+
+import netaddr
+from oslo_log import log as logging
from sqlalchemy.orm import exc
from sqlalchemy import sql
import neutron.db.api as db
from neutron.db import models_v2
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as c_const
from neutron.plugins.cisco.common import cisco_exceptions as c_exc
from neutron.plugins.cisco.common import config as c_conf
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
import sqlalchemy as sa
from sqlalchemy import sql
from neutron.db import model_base
from neutron.db import models_v2
-from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
from sqlalchemy.orm import exc
from neutron.db import api as db
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_exceptions as c_exc
import inspect
+from oslo_log import log as logging
from oslo_utils import excutils
from oslo_utils import importutils
from neutron.extensions import providernet as provider
from neutron.i18n import _LE, _LI
from neutron import neutron_plugin_base_v2
-from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as const
from neutron.plugins.cisco.common import cisco_credentials_v2 as cred
from neutron.plugins.cisco.common import config as conf
import eventlet
import netaddr
+from oslo_log import log as logging
from oslo_serialization import jsonutils
import requests
from neutron.common import exceptions as n_exc
from neutron.extensions import providernet
-from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_constants as c_const
from neutron.plugins.cisco.common import cisco_credentials_v2 as c_cred
from neutron.plugins.cisco.common import cisco_exceptions as c_exc
# under the License.
import eventlet
-
from oslo_config import cfg as q_conf
+from oslo_log import log as logging
from oslo_utils import excutils
from oslo_utils import importutils
from neutron.extensions import providernet
from neutron.i18n import _LW
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils as uuidutils
from neutron.plugins.cisco.common import cisco_constants as c_const
from neutron.plugins.cisco.common import cisco_credentials_v2 as c_cred
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
from oslo_utils import importutils
import webob.exc as wexc
from neutron.api import extensions as neutron_extensions
from neutron.api.v2 import base
from neutron.db import db_base_plugin_v2
-from neutron.openstack.common import log as logging
from neutron.plugins.cisco.common import cisco_exceptions as cexc
from neutron.plugins.cisco.common import config
from neutron.plugins.cisco.db import network_db_v2 as cdb
from eventlet import queue
from heleosapi import constants as h_con
from heleosapi import exceptions as h_exc
+from oslo_log import log as logging
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron.plugins.embrane.agent.operations import router_operations
from neutron.plugins.embrane.common import constants as p_con
from neutron.plugins.embrane.common import contexts as ctx
import functools
from heleosapi import exceptions as h_exc
+from oslo_log import log as logging
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.embrane.common import constants as p_con
LOG = logging.getLogger(__name__)
from heleosapi import constants as h_con
from heleosapi import exceptions as h_exc
from oslo_config import cfg
+from oslo_log import log as logging
from sqlalchemy.orm import exc
from neutron.common import constants as l3_constants
from neutron.db import models_v2
from neutron.extensions import l3
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron.plugins.embrane.agent import dispatcher
from neutron.plugins.embrane.common import config # noqa
from neutron.plugins.embrane.common import constants as p_con
# under the License.
from heleosapi import info as h_info
+from oslo_log import log as logging
from neutron.common import constants
from neutron.db import models_v2
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
eventlet.monkey_patch()
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from neutron.agent.common import config
from neutron.common import topics
from neutron import context
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.plugins.common import constants as p_const
from neutron.plugins.hyperv.agent import utils
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.agent import firewall
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.hyperv.agent import utilsfactory
from neutron.plugins.hyperv.agent import utilsv2
import time
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.common import exceptions as n_exc
-from neutron.openstack.common import log as logging
# Check needed for unit testing on Unix
if sys.platform == 'win32':
import sys
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.hyperv.agent import utils
from neutron.plugins.hyperv.agent import utilsv2
eventlet.monkey_patch()
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from neutron.agent.linux import ip_lib
from neutron.common import utils as n_utils
from neutron.i18n import _LE, _LI
from neutron import context
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.plugins.ibm.common import constants
import httplib2
from keystoneclient.v2_0 import client as keyclient
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.api.v2 import attributes
from neutron.common import utils
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.ibm.common import config # noqa
from neutron.plugins.ibm.common import constants
from neutron import wsgi
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.ibm.common import constants
LOG = logging.getLogger(__name__)
import functools
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import excutils
from neutron.db import quota_db # noqa
from neutron.extensions import portbindings
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.ibm.common import config # noqa
from neutron.plugins.ibm.common import constants
from neutron.plugins.ibm.common import exceptions as sdnve_exc
eventlet.monkey_patch()
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from six import moves
from neutron.common import utils as q_utils
from neutron import context
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.plugins.common import constants as p_const
from neutron.plugins.linuxbridge.common import config # noqa
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_db import exception as db_exc
+from oslo_log import log
from sqlalchemy import or_
from sqlalchemy.orm import exc
-from oslo_db import exception as db_exc
-
from neutron.common import constants as n_const
from neutron.db import api as db_api
from neutron.db import models_v2
from neutron.extensions import portbindings
from neutron.i18n import _LE, _LI
from neutron import manager
-from neutron.openstack.common import log
from neutron.openstack.common import uuidutils
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2 import models
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log
from oslo_serialization import jsonutils
from neutron.common import constants
from neutron.extensions import portbindings
from neutron.i18n import _LW
-from neutron.openstack.common import log
from neutron.plugins.ml2 import db
from neutron.plugins.ml2 import driver_api as api
from networking_arista.common import db_lib
from networking_arista.ml2 import arista_ml2
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.common import constants as n_const
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2.common import exceptions as ml2_exc
from neutron.plugins.ml2 import driver_api
from neutron.plugins.ml2.drivers.arista import config # noqa
"""Implentation of Brocade ML2 Mechanism driver for ML2 Plugin."""
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
from oslo_utils import importutils
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2 import driver_api
from neutron.plugins.ml2.drivers.brocade.db import models as brocade_db
"""
from ncclient import manager
+from oslo_log import log as logging
from oslo_utils import excutils
from xml.etree import ElementTree
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2.drivers.brocade.nos import nctemplates as template
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log
+
from neutron.common import constants as n_constants
from neutron import context
from neutron.i18n import _LW
from neutron import manager
-from neutron.openstack.common import log
from neutron.openstack.common import loopingcall
from neutron.plugins.ml2 import db as l2_db
from neutron.plugins.ml2 import driver_context
import sys
import eventlet
-
eventlet.monkey_patch()
from oslo_concurrency import lockutils
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from neutron.agent.common import config
from neutron.db import agents_db
from neutron.i18n import _LE, _LI
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import periodic_task
from neutron.openstack.common import service as svc
from neutron.plugins.ml2.drivers.cisco.apic import mechanism_apic as ma
import netaddr
from oslo_concurrency import lockutils
from oslo_config import cfg
+from oslo_log import log
from neutron.common import constants as n_constants
-from neutron.openstack.common import log
from neutron.plugins.common import constants
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers.cisco.apic import apic_model
import re
from oslo_config import cfg
+from oslo_log import log
from oslo_serialization import jsonutils
import requests
-from neutron.openstack.common import log
from neutron.plugins.ml2 import driver_api as api
LOG = log.getLogger(__name__)
# See the License for the specific language governing permissions and
# limitations under the License.
+from oslo_log import log as logging
+
from neutron.common import constants as n_const
from neutron.common import log
from neutron.extensions import portbindings
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers.freescale import config # noqa
# under the License.
from oslo_db import exception as db_exc
+from oslo_log import log
from neutron.common import exceptions as exc
from neutron.i18n import _LW
-from neutron.openstack.common import log
from neutron.plugins.ml2 import driver_api as api
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.common import constants as const
from neutron import context as n_context
from neutron.db import api as db_api
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2.common import exceptions as ml2_exc
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers.l2pop import config # noqa
import collections
import copy
+from oslo_log import log as logging
import oslo_messaging
from neutron.common import rpc as n_rpc
from neutron.common import topics
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import abc
import six
+from oslo_log import log
+
from neutron.extensions import portbindings
from neutron.i18n import _LW
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_constants
from neutron.plugins.ml2 import driver_api as api
import re
+from oslo_log import log
+
from neutron.common import constants
from neutron.extensions import portbindings
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_constants
from neutron.plugins.ml2.drivers import mech_agent
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log
+
from neutron.agent import securitygroups_rpc
from neutron.common import constants
from neutron.extensions import portbindings
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_constants
from neutron.plugins.ml2.drivers import mech_agent
import netaddr
from oslo_config import cfg
+from oslo_log import log
from neutron.common import constants as n_consts
from neutron.extensions import portbindings
from neutron.i18n import _LE
-from neutron.openstack.common import log
from neutron.plugins.common import constants
from neutron.plugins.ml2 import driver_api as api
from nuage_neutron.plugins.nuage.common import config
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log
+
from neutron.agent import securitygroups_rpc
from neutron.common import constants
from neutron.extensions import portbindings
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_constants
from neutron.plugins.ml2.drivers import mech_agent
from oslo_config import cfg
+from oslo_log import log
from neutron.common import constants
from neutron.extensions import portbindings
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers.mech_sriov import exceptions as exc
from networking_mlnx.plugins.ml2.drivers.mlnx import constants
from oslo_config import cfg
+from oslo_log import log
from neutron.common import constants as n_const
from neutron.extensions import portbindings
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_constants
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import mech_agent
from networking_odl.common import constants as odl_const
from networking_odl.ml2 import mech_driver
from oslo_config import cfg
+from oslo_log import log
from neutron.common import constants as n_const
from neutron.extensions import portbindings
-from neutron.openstack.common import log
from neutron.plugins.common import constants
from neutron.plugins.ml2 import driver_api as api
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log
import sqlalchemy as sa
from neutron.common import exceptions as exc
from neutron.db import model_base
from neutron.i18n import _LI, _LW
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log
from six import moves
import sqlalchemy as sa
from sqlalchemy import sql
from neutron.db import api as db_api
from neutron.db import model_base
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers import type_tunnel
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log
+
from neutron.common import exceptions as exc
from neutron.i18n import _LI
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2 import driver_api as api
# under the License.
import abc
+from oslo_log import log
+
from neutron.common import exceptions as exc
from neutron.common import topics
from neutron.i18n import _LI, _LW
-from neutron.openstack.common import log
from neutron.plugins.common import utils as plugin_utils
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import helpers
import sys
from oslo_config import cfg
+from oslo_log import log
from six import moves
import sqlalchemy as sa
from neutron.db import api as db_api
from neutron.db import model_base
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.common import utils as plugin_utils
from neutron.plugins.ml2 import driver_api as api
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log
from six import moves
import sqlalchemy as sa
from sqlalchemy import sql
from neutron.db import api as db_api
from neutron.db import model_base
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers import type_tunnel
# under the License.
from oslo_config import cfg
+from oslo_log import log
import stevedore
from neutron.api.v2 import attributes
from neutron.extensions import portbindings
from neutron.extensions import providernet as provider
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log
from neutron.plugins.ml2.common import exceptions as ml2_exc
from neutron.plugins.ml2 import db
from neutron.plugins.ml2 import driver_api as api
# under the License.
import contextlib
-from eventlet import greenthread
+from eventlet import greenthread
from oslo_concurrency import lockutils
from oslo_config import cfg
from oslo_db import exception as os_db_exception
+from oslo_log import log
from oslo_serialization import jsonutils
from oslo_utils import excutils
from oslo_utils import importutils
from neutron.extensions import providernet as provider
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
-from neutron.openstack.common import log
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants as service_constants
from neutron.plugins.ml2.common import exceptions as ml2_exc
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log
import oslo_messaging
from sqlalchemy.orm import exc
from neutron.extensions import portbindings
from neutron.i18n import _LW
from neutron import manager
-from neutron.openstack.common import log
from neutron.plugins.common import constants as service_constants
from neutron.plugins.ml2 import driver_api as api
from neutron.plugins.ml2.drivers import type_tunnel
from networking_mlnx.plugins.mlnx.agent import mlnx_eswitch_neutron_agent
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.i18n import _LE, _LI
from neutron.common import config as common_config
from neutron.common import utils
-from neutron.openstack.common import log as logging
from neutron.plugins.mlnx.agent import config # noqa
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.api.v2 import attributes
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import eventlet
eventlet.monkey_patch()
+from oslo_log import log as logging
import oslo_messaging
from neutron.agent.linux import ovs_lib
from neutron import context as n_context
from neutron.extensions import securitygroup as ext_sg
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.oneconvergence.lib import config
LOG = logging.getLogger(__name__)
"""Intermidiate NVSD Library."""
+from oslo_log import log as logging
from oslo_serialization import jsonutils
from oslo_utils import excutils
-from neutron.openstack.common import log as logging
import neutron.plugins.oneconvergence.lib.exception as nvsdexception
from neutron.plugins.oneconvergence.lib import plugin_helper
import time
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_serialization import jsonutils
import requests
from six.moves.urllib import parse
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log as logging
import neutron.plugins.oneconvergence.lib.exception as exception
LOG = logging.getLogger(__name__)
"""Implementation of OneConvergence Neutron Plugin."""
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import excutils
from oslo_utils import importutils
from neutron.db import securitygroups_rpc_base as sg_db_rpc
from neutron.extensions import portbindings
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as svc_constants
import neutron.plugins.oneconvergence.lib.config # noqa
import neutron.plugins.oneconvergence.lib.exception as nvsdexception
#
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_serialization import jsonutils
import requests
from neutron.extensions import portbindings
from neutron.extensions import securitygroup
from neutron import neutron_plugin_base_v2
-from neutron.openstack.common import log as logging
from neutron.plugins.opencontrail.common import exceptions as c_exc
# License for the specific language governing permissions and limitations
# under the License.
-
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import excutils
from neutron.common import constants as n_const
from neutron.common import utils as n_utils
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as p_const
from neutron.plugins.openvswitch.common import constants
eventlet.monkey_patch()
import netaddr
-from neutron.plugins.openvswitch.agent import ovs_dvr_neutron_agent
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from six import moves
from neutron.common import utils as q_utils
from neutron import context
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.plugins.common import constants as p_const
+from neutron.plugins.openvswitch.agent import ovs_dvr_neutron_agent
from neutron.plugins.openvswitch.common import constants
import os
import re
+from oslo_log import log as logging
+
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.sriovnicagent.common import exceptions as exc
from neutron.plugins.sriovnicagent import pci_lib
import re
+from oslo_log import log as logging
+
from neutron.agent.linux import ip_lib
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.sriovnicagent.common import exceptions as exc
LOG = logging.getLogger(__name__)
eventlet.monkey_patch()
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from neutron.agent import rpc as agent_rpc
from neutron.common import utils as q_utils
from neutron import context
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.plugins.sriovnicagent.common import config # noqa
from neutron.plugins.sriovnicagent.common import exceptions as exc
import collections
import itertools
-import logging
+import logging as std_logging
import re
+from oslo_log import log as logging
from oslo_utils import excutils
from oslo_utils import importutils
from neutron.common import constants as const
from neutron.common import exceptions
from neutron.i18n import _LE, _LI, _LW
-from neutron.openstack.common import log
from neutron.openstack.common import policy
-LOG = log.getLogger(__name__)
+LOG = logging.getLogger(__name__)
_ENFORCER = None
ADMIN_CTX_POLICY = 'context_is_admin'
def log_rule_list(match_rule):
- if LOG.isEnabledFor(logging.DEBUG):
+ if LOG.isEnabledFor(std_logging.DEBUG):
rules = _process_rules_list([], match_rule)
LOG.debug("Enforcing rules: %s", rules)
import sys
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
import webob
from neutron.common import exceptions
from neutron.i18n import _LI, _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
QUOTA_DB_MODULE = 'neutron.db.quota_db'
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log as logging
from sqlalchemy import sql
from neutron.common import constants
from neutron.db import agents_db
from neutron.db import agentschedulers_db
from neutron.i18n import _LI, _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
from oslo_config import cfg
from oslo_db import exception as db_exc
+from oslo_log import log as logging
import six
from sqlalchemy import sql
from neutron.db import l3_db
from neutron.db import l3_hamode_db
from neutron.i18n import _LE, _LW
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import eventlet
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.common import config
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
from neutron import service
LOG = logging.getLogger(__name__)
import random
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_messaging import server as rpc_server
from oslo_utils import excutils
from oslo_utils import importutils
from neutron.db import api as session
from neutron.i18n import _LE, _LI
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.openstack.common import service as common_service
from neutron import wsgi
# License for the specific language governing permissions and limitations
# under the License.
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
LOG = logging.getLogger(__name__)
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from neutron.common import rpc as n_rpc
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
from neutron.agent.linux import ip_lib
from neutron.common import topics
from neutron import context
from neutron.i18n import _LE
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.services.firewall.agents import firewall_agent_api as api
from neutron.services import provider_configuration as provconf
"""Implentation of Brocade SVI service Plugin."""
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.common import constants as l3_constants
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2 import db
from neutron.plugins.ml2.drivers.brocade.db import models as brocade_db
from neutron.plugins.ml2.drivers.brocade.nos import nosdriver as driver
from networking_arista.common import db_lib
from networking_arista.l3Plugin import arista_l3_driver
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import excutils
from neutron.api.rpc.agentnotifiers import l3_rpc_agent_api
from neutron.db import l3_agentschedulers_db
from neutron.db import l3_gwmode_db
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.plugins.ml2.driver_context import NetworkContext # noqa
import time
from oslo_config import cfg
+from oslo_log import log as logging
import oslo_messaging
from oslo_utils import importutils
from neutron import context
from neutron.i18n import _LE, _LI, _LW
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall
from neutron.openstack.common import periodic_task
from neutron.openstack.common import service
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
import six
from neutron.common import ipv6_utils
from neutron.common import log
from neutron.i18n import _LI
-from neutron.openstack.common import log as logging
from neutron.services.metering.drivers import abstract_driver
# under the License.
from oslo_config import cfg
+from oslo_log import log as logging
import stevedore
from neutron.common import exceptions as n_exc
from neutron.common import repos
from neutron.i18n import _LW
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
LOG = logging.getLogger(__name__)
import abc
+from oslo_log import log as logging
from oslo_utils import excutils
from oslo_utils import importutils
import six
from neutron.api import extensions
from neutron.db import servicetype_db as sdb
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.services import provider_configuration as pconf
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
+
from neutron.tests.tempest.common import cred_provider
from neutron.tests.tempest import config
from neutron.tests.tempest import manager
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
from neutron.agent.common import config
from neutron.agent.linux import interface
from neutron.agent.linux import ip_lib
from neutron.common import utils
-from neutron.openstack.common import log as logging
from neutron.tests.functional.agent.linux import base
LOG = logging.getLogger(__name__)
import mock
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
import testtools
import webob
import webob.dec
from neutron.common import config as common_config
from neutron.common import constants as l3_constants
from neutron.common import utils as common_utils
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.services import advanced_service as adv_svc
from neutron.tests.functional.agent.linux import base
config = cfg.ConfigOpts()
config.register_opts(common_config.core_opts)
config.register_opts(common_config.core_cli_opts)
- config.register_cli_opts(logging.common_cli_opts)
- config.register_cli_opts(logging.logging_cli_opts)
- config.register_opts(logging.generic_log_opts)
- config.register_opts(logging.log_opts)
+ logging.register_options(config)
agent_config.register_process_monitor_opts(config)
return config
# under the License.
import netaddr
+from oslo_log import log as logging
from tempest_lib import exceptions as lib_exc
from neutron.tests.api.contrib import clients
from neutron.tests.tempest.common.utils import data_utils
from neutron.tests.tempest import config
from neutron.tests.tempest import exceptions
-from neutron.openstack.common import log as logging
import neutron.tests.tempest.test
CONF = config.CONF
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.tests.tempest.api.network import base
from neutron.tests.tempest.common.utils import data_utils
-from neutron.openstack.common import log as logging
from neutron.tests.tempest import test
import re
import urlparse
+from oslo_log import log as logging
import six
-from neutron.openstack.common import log as logging
from neutron.tests.tempest.services.identity.v2.json import token_client as json_v2id
from neutron.tests.tempest.services.identity.v3.json import token_client as json_v3id
import hashlib
import os
+from oslo_concurrency import lockutils
+from oslo_log import log as logging
import yaml
from neutron.tests.tempest.common import cred_provider
from neutron.tests.tempest import config
from neutron.tests.tempest import exceptions
-from oslo_concurrency import lockutils
-from neutron.openstack.common import log as logging
CONF = config.CONF
LOG = logging.getLogger(__name__)
import shlex
import subprocess
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
LOG = logging.getLogger(__name__)
import abc
+from oslo_log import log as logging
import six
from neutron.tests.tempest import auth
from neutron.tests.tempest import config
from neutron.tests.tempest import exceptions
-from neutron.openstack.common import log as logging
CONF = config.CONF
LOG = logging.getLogger(__name__)
import functools
import jsonschema
-
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
LOG = logging.getLogger(__name__)
import copy
+from oslo_log import log as logging
+
import neutron.tests.tempest.common.generator.base_generator as base
import neutron.tests.tempest.common.generator.valid_generator as valid
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
import neutron.tests.tempest.common.generator.base_generator as base
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
import OpenSSL
+from oslo_log import log as logging
from six import moves
from tempest_lib import exceptions as lib_exc
from neutron.tests.tempest import exceptions as exc
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
USER_AGENT = 'tempest'
# under the License.
import netaddr
+from oslo_log import log as logging
from tempest_lib import exceptions as lib_exc
from neutron.tests.api.contrib import clients
from neutron.tests.tempest.common.utils import data_utils
from neutron.tests.tempest import config
from neutron.tests.tempest import exceptions
-from neutron.openstack.common import log as logging
CONF = config.CONF
LOG = logging.getLogger(__name__)
import time
import warnings
+from oslo_log import log as logging
import six
from neutron.tests.tempest import exceptions
-from neutron.openstack.common import log as logging
with warnings.catch_warnings():
import inspect
import re
-from neutron.openstack.common import log as logging
+from oslo_log import log as logging
LOG = logging.getLogger(__name__)
import time
+from oslo_log import log as logging
+
from neutron.tests.tempest.common.utils import misc as misc_utils
from neutron.tests.tempest import config
from neutron.tests.tempest import exceptions
-from neutron.openstack.common import log as logging
CONF = config.CONF
LOG = logging.getLogger(__name__)
import logging as std_logging
import os
-from oslo.config import cfg
-
from oslo_concurrency import lockutils
-from neutron.openstack.common import log as logging
+from oslo_config import cfg
+from oslo_log import log as logging
def register_opt_group(conf, opt_group, options):
register_opt_group(cfg.CONF, g, o)
+# TODO(ihrachys): this function should probably be removed since it's not used
+# anywhere, and accesses internal implementation details of olso libraries
def list_opts():
"""Return a list of oslo.config options available.
cfg.CONF([], project='tempest', default_config_files=config_files)
else:
cfg.CONF([], project='tempest')
- logging.setup('tempest')
+ logging.setup(cfg.CONF, 'tempest')
LOG = logging.getLogger('tempest')
LOG.info("Using tempest config file %s" % path)
register_opts()
def _fix_log_levels(self):
"""Tweak the oslo log defaults."""
+ # TODO(ihrachys): this code accesses internal details of oslo.log
+ # library (and does it wrong), hence should be fixed
for opt in logging.log_opts:
if opt.dest == 'default_log_levels':
opt.default.extend(self._extra_log_defaults)
import uuid
import fixtures
+from oslo_log import log as logging
+from oslo_utils import importutils
import six
import testscenarios
import testtools
import neutron.tests.tempest.common.generator.valid_generator as valid
from neutron.tests.tempest import config
from neutron.tests.tempest import exceptions
-from oslo_utils import importutils
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
"""stubs.py provides interface methods for the database test cases"""
+from oslo_log import log as logging
+
from neutron.db import api as db
-from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__)
def test_log_translations(self):
expected_marks = {
- 'audit': '_',
'error': '_LE',
'info': '_LI',
'warn': '_LW',
import mock
from oslo_config import cfg
from oslo_context import context as oslo_context
+from oslo_log import log as logging
from oslo_utils import importutils
from neutron.db import api as db
-from neutron.openstack.common import log as logging
from neutron.tests.unit import test_l3_plugin
LOG = logging.getLogger(__name__)
# limitations under the License.
import mock
+from oslo_log import log as logging
from oslo_utils import importutils
-from neutron.openstack.common import log as logging
from neutron.plugins.ml2 import config as ml2_config
from neutron.plugins.ml2.drivers.brocade import (mechanism_brocade
as brocademechanism)
# License for the specific language governing permissions and limitations
# under the License.
+from oslo_log import log as logging
+
from neutron.agent import securitygroups_rpc
from neutron.common import constants
from neutron.extensions import portbindings
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_constants
from neutron.plugins.ml2.drivers import mech_agent
-LOG = log.getLogger(__name__)
+LOG = logging.getLogger(__name__)
class FakeAgentMechanismDriver(mech_agent.SimpleAgentMechanismDriverBase):
# License for the specific language governing permissions and limitations
# under the License.
-from neutron.openstack.common import log
+from oslo_log import log
+
from neutron.plugins.ml2 import driver_api as api
LOG = log.getLogger(__name__)
import mock
import netaddr
from oslo_config import cfg
+from oslo_log import log
import testtools
from neutron.agent.linux import async_process
from neutron.agent.linux import ovs_lib
from neutron.agent.linux import utils
from neutron.common import constants as n_const
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
from neutron.plugins.openvswitch.agent import ovs_neutron_agent
with contextlib.nested(
mock.patch.object(async_process.AsyncProcess, "_spawn"),
- mock.patch.object(log.ContextAdapter, 'exception'),
+ mock.patch.object(log.KeywordArgumentAdapter, 'exception'),
mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
'scan_ports'),
mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
import mock
from oslo_config import cfg
+from oslo_log import log
from neutron.agent.linux import ip_lib
from neutron.agent.linux import ovs_lib
-from neutron.openstack.common import log
from neutron.plugins.common import constants as p_const
from neutron.plugins.openvswitch.agent import ovs_neutron_agent
from neutron.plugins.openvswitch.common import constants
]
with contextlib.nested(
- mock.patch.object(log.ContextAdapter, 'exception'),
+ mock.patch.object(log.KeywordArgumentAdapter, 'exception'),
mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
'scan_ports'),
mock.patch.object(ovs_neutron_agent.OVSNeutronAgent,
import time
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import timeutils
from webob import exc
from neutron.db import agents_db
from neutron.db import db_base_plugin_v2
from neutron.extensions import agent
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.tests.unit import test_api_v2
from neutron.tests.unit import test_db_plugin
import itertools
import mock
+from oslo_log import log as logging
import testtools
from webob import exc
from neutron.db import models_v2
from neutron.extensions import external_net as external_net
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.tests.unit import test_api_v2
from neutron.tests.unit import test_db_plugin
# limitations under the License.
import copy
+
+from oslo_log import log as logging
import webob.exc
from neutron.db import db_base_plugin_v2
from neutron.db import extradhcpopt_db as edo_db
from neutron.extensions import extra_dhcp_opt as edo_ext
-from neutron.openstack.common import log as logging
from neutron.tests.unit import test_db_plugin
LOG = logging.getLogger(__name__)
# under the License.
import contextlib
+
from oslo_config import cfg
+from oslo_log import log as logging
from webob import exc
from neutron.common import constants
from neutron.db import extraroute_db
from neutron.extensions import extraroute
from neutron.extensions import l3
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.tests.unit import test_api_v2
from neutron.tests.unit import test_l3_plugin as test_l3
import abc
import mock
+from oslo_log import log as logging
from oslo_serialization import jsonutils
import routes
import webob
from neutron.common import config
from neutron.common import exceptions
from neutron.db import db_base_plugin_v2
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.tests import base
from neutron.tests.unit import extension_stubs as ext_stubs
import contextlib
import copy
-import eventlet
+import eventlet
import mock
import netaddr
+from oslo_log import log
import oslo_messaging
from testtools import matchers
from neutron.common import constants as l3_constants
from neutron.common import exceptions as n_exc
from neutron.i18n import _LE
-from neutron.openstack.common import log
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants as p_const
from neutron.tests import base
super(BasicRouterOperationsFramework, self).setUp()
self.conf = agent_config.setup_conf()
self.conf.register_opts(base_config.core_opts)
- self.conf.register_cli_opts(log.common_cli_opts)
- self.conf.register_cli_opts(log.logging_cli_opts)
+ log.register_options(self.conf)
self.conf.register_opts(l3_config.OPTS)
self.conf.register_opts(ha.OPTS)
agent_config.register_interface_driver_opts_helper(self.conf)
import mock
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from oslo_utils import importutils
from webob import exc
from neutron.extensions import l3
from neutron.extensions import portbindings
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.openstack.common import uuidutils
from neutron.plugins.common import constants as service_constants
from neutron.tests import base
import mock
import netaddr
from oslo_config import cfg
+from oslo_log import log as logging
from neutron.agent.common import config
from neutron.agent.dhcp import config as dhcp_config
from neutron.agent.linux import external_process
from neutron.common import config as base_config
from neutron.common import constants
-from neutron.openstack.common import log as logging
from neutron.tests import base
LOG = logging.getLogger(__name__)
# under the License.
import mock
+from oslo_context import context as oslo_context
from testtools import matchers
from neutron import context
-from neutron.openstack.common import local
from neutron.tests import base
def test_neutron_context_overwrite(self):
ctx1 = context.Context('user_id', 'tenant_id')
- self.assertEqual(ctx1.request_id, local.store.context.request_id)
+ self.assertEqual(ctx1.request_id,
+ oslo_context.get_current().request_id)
# If overwrite is not specified, request_id should be updated.
ctx2 = context.Context('user_id', 'tenant_id')
self.assertNotEqual(ctx2.request_id, ctx1.request_id)
- self.assertEqual(ctx2.request_id, local.store.context.request_id)
+ self.assertEqual(ctx2.request_id,
+ oslo_context.get_current().request_id)
# If overwrite is specified, request_id should be kept.
ctx3 = context.Context('user_id', 'tenant_id', overwrite=False)
self.assertNotEqual(ctx3.request_id, ctx2.request_id)
- self.assertEqual(ctx2.request_id, local.store.context.request_id)
+ self.assertEqual(ctx2.request_id,
+ oslo_context.get_current().request_id)
def test_neutron_context_get_admin_context_not_update_local_store(self):
ctx = context.Context('user_id', 'tenant_id')
- req_id_before = local.store.context.request_id
+ req_id_before = oslo_context.get_current().request_id
self.assertEqual(ctx.request_id, req_id_before)
ctx_admin = context.get_admin_context()
- self.assertEqual(req_id_before, local.store.context.request_id)
+ self.assertEqual(req_id_before, oslo_context.get_current().request_id)
self.assertNotEqual(req_id_before, ctx_admin.request_id)
import types
import fixtures
-
from oslo_config import cfg
+from oslo_log import log as logging
from neutron import manager
-from neutron.openstack.common import log as logging
from neutron.plugins.common import constants
from neutron.tests import base
from neutron.tests.unit import dummy_plugin
server.stop()
@mock.patch.object(wsgi, 'eventlet')
- @mock.patch.object(wsgi, 'logging')
+ @mock.patch.object(wsgi, 'loggers')
def test__run(self, logging_mock, eventlet_mock):
server = wsgi.Server('test')
server._run("app", "socket")
import eventlet.wsgi
from oslo_config import cfg
import oslo_i18n
+from oslo_log import log as logging
+from oslo_log import loggers
from oslo_serialization import jsonutils
from oslo_utils import excutils
import routes.middleware
from neutron import context
from neutron.db import api
from neutron.i18n import _LE, _LI
-from neutron.openstack.common import log as logging
from neutron.openstack.common import service as common_service
from neutron.openstack.common import systemd
"""Start a WSGI server in a new green thread."""
eventlet.wsgi.server(socket, application,
max_size=self.num_threads,
- log=logging.WritableLogger(LOG),
+ log=loggers.WritableLogger(LOG),
keepalive=CONF.wsgi_keep_alive,
socket_timeout=self.client_socket_timeout)
module=eventlet_backdoor
module=fileutils
module=install_venv_common
-module=local
-module=log
module=loopingcall
module=middleware
module=periodic_task
module=systemd
module=threadgroup
module=uuidutils
+module=versionutils
# The base module to hold the copy of openstack.common
base=neutron
Code Review / openstack-build / neutron-build.git / commitdiff