x/vmware-nsx
Code Issues Proposed changes

Merge "Enforce log hints"

Browse Source
This commit is contained in:
Jenkins 2014-12-14 02:58:34 +00:00 committed by Gerrit Code Review
commit b375f55d0e
11 changed files with 82 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/auth.py
View File

@ -32,7 +32,7 @@ class NeutronKeystoneContext(wsgi.Middleware):
# Determine the user ID # Determine the user ID
user_id = req.headers.get('X_USER_ID') user_id = req.headers.get('X_USER_ID')
if not user_id: if not user_id:
LOG.debug(_("X_USER_ID is not found in request")) LOG.debug("X_USER_ID is not found in request")
return webob.exc.HTTPUnauthorized() return webob.exc.HTTPUnauthorized()
# Determine the tenant # Determine the tenant

3
neutron/context.py
View File

@ -80,8 +80,7 @@ class ContextBase(common_context.RequestContext):
# Log only once the context has been configured to prevent # Log only once the context has been configured to prevent
# format errors. # format errors.
if kwargs: if kwargs:
LOG.debug(_('Arguments dropped when creating ' LOG.debug('Arguments dropped when creating context: %s', kwargs)
'context: %s'), kwargs)
@property @property
def project_id(self): def project_id(self):

64
neutron/hacking/checks.py
View File

@ -28,8 +28,6 @@ import pep8
# - Add test cases for each new rule to # - Add test cases for each new rule to
# neutron/tests/unit/test_hacking.py # neutron/tests/unit/test_hacking.py
log_translation = re.compile(
r"(.)*LOG\.(audit|error|info|warn|warning|critical|exception)\(\s*('|\")")
author_tag_re = (re.compile("^\s*#\s*@?(a|A)uthor"), author_tag_re = (re.compile("^\s*#\s*@?(a|A)uthor"),
re.compile("^\.\.\s+moduleauthor::")) re.compile("^\.\.\s+moduleauthor::"))
_all_hints = set(['_', '_LI', '_LE', '_LW', '_LC']) _all_hints = set(['_', '_LI', '_LE', '_LW', '_LC'])
@ -52,64 +50,17 @@ for level, hint in _all_log_levels.iteritems():
log_translation_hints.append(re.compile(r)) log_translation_hints.append(re.compile(r))
def _directory_to_check_translation(filename):
# In order to try and speed up the integration of this we will
# do it on a directory by directory basis. The last patch of the
# series will remove this and the entire code base will be validated.
dirs = ["neutron/agent",
"neutron/api",
"neutron/cmd",
"neutron/common",
"neutron/db",
"neutron/debug",
"neutron/extensions",
"neutron/hacking",
"neutron/locale",
"neutron/notifiers",
"neutron/openstack",
"neutron/scheduler",
"neutron/server",
"neutron/services",
#"neutron/plugins",
"neutron/plugins/bigswitch",
"neutron/plugins/brocade",
"neutron/plugins/cisco",
"neutron/plugins/common",
"neutron/plugins/embrane",
"neutron/plugins/hyperv",
"neutron/plugins/ibm",
"neutron/plugins/linuxbridge",
"neutron/plugins/metaplugin",
"neutron/plugins/midonet",
"neutron/plugins/ml2",
"neutron/plugins/mlnx",
"neutron/plugins/nec",
"neutron/plugins/nuage",
"neutron/plugins/ofagent",
"neutron/plugins/oneconvergence",
"neutron/plugins/opencontrail",
"neutron/plugins/openvswitch",
"neutron/plugins/plumgrid",
"neutron/plugins/sriovnicagent",
"neutron/plugins/vmware"]
return any([dir in filename for dir in dirs])
def validate_log_translations(logical_line, physical_line, filename): def validate_log_translations(logical_line, physical_line, filename):
# Translations are not required in the test directory # Translations are not required in the test directory
if "neutron/tests" in filename: if "neutron/tests" in filename:
return return
if pep8.noqa(physical_line): if pep8.noqa(physical_line):
return return
msg = "N320: Log messages require translations!"
if log_translation.match(logical_line):
yield (0, msg)
if _directory_to_check_translation(filename): msg = "N320: Log messages require translation hints!"
msg = "N320: Log messages require translation hints!" for log_translation_hint in log_translation_hints:
for log_translation_hint in log_translation_hints: if log_translation_hint.match(logical_line):
if log_translation_hint.match(logical_line): yield (0, msg)
yield (0, msg)
def use_jsonutils(logical_line, filename): def use_jsonutils(logical_line, filename):
@ -153,10 +104,9 @@ def no_translate_debug_logs(logical_line, filename):
* This check assumes that 'LOG' is a logger. * This check assumes that 'LOG' is a logger.
N319 N319
""" """
if _directory_to_check_translation(filename): for hint in _all_hints:
for hint in _all_hints: if logical_line.startswith("LOG.debug(%s(" % hint):
if logical_line.startswith("LOG.debug(%s(" % hint): yield(0, "N319 Don't translate debug level logs")
yield(0, "N319 Don't translate debug level logs")
def check_assert_called_once_with(logical_line, filename): def check_assert_called_once_with(logical_line, filename):

19
neutron/manager.py
View File

@ -20,6 +20,7 @@ from oslo import messaging
from oslo.utils import importutils from oslo.utils import importutils
from neutron.common import utils from neutron.common import utils
from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.openstack.common import periodic_task from neutron.openstack.common import periodic_task
from neutron.plugins.common import constants from neutron.plugins.common import constants
@ -109,7 +110,7 @@ class NeutronManager(object):
# intentionally to allow v2 plugins to be monitored # intentionally to allow v2 plugins to be monitored
# for performance metrics. # for performance metrics.
plugin_provider = cfg.CONF.core_plugin plugin_provider = cfg.CONF.core_plugin
LOG.info(_("Loading core plugin: %s"), plugin_provider) LOG.info(_LI("Loading core plugin: %s"), plugin_provider)
self.plugin = self._get_plugin_instance('neutron.core_plugins', self.plugin = self._get_plugin_instance('neutron.core_plugins',
plugin_provider) plugin_provider)
msg = validate_post_plugin_load() msg = validate_post_plugin_load()
@ -134,14 +135,14 @@ class NeutronManager(object):
try: try:
plugin_class = importutils.import_class(plugin_provider) plugin_class = importutils.import_class(plugin_provider)
except ImportError as e2: except ImportError as e2:
LOG.exception(_("Error loading plugin by name, %s"), e1) LOG.exception(_LE("Error loading plugin by name, %s"), e1)
LOG.exception(_("Error loading plugin by class, %s"), e2) LOG.exception(_LE("Error loading plugin by class, %s"), e2)
raise ImportError(_("Plugin not found.")) raise ImportError(_("Plugin not found."))
return plugin_class() return plugin_class()
def _load_services_from_core_plugin(self): def _load_services_from_core_plugin(self):
"""Puts core plugin in service_plugins for supported services.""" """Puts core plugin in service_plugins for supported services."""
LOG.debug(_("Loading services supported by the core plugin")) LOG.debug("Loading services supported by the core plugin")
# supported service types are derived from supported extensions # supported service types are derived from supported extensions
for ext_alias in getattr(self.plugin, for ext_alias in getattr(self.plugin,
@ -149,7 +150,7 @@ class NeutronManager(object):
if ext_alias in constants.EXT_TO_SERVICE_MAPPING: if ext_alias in constants.EXT_TO_SERVICE_MAPPING:
service_type = constants.EXT_TO_SERVICE_MAPPING[ext_alias] service_type = constants.EXT_TO_SERVICE_MAPPING[ext_alias]
self.service_plugins[service_type] = self.plugin self.service_plugins[service_type] = self.plugin
LOG.info(_("Service %s is supported by the core plugin"), LOG.info(_LI("Service %s is supported by the core plugin"),
service_type) service_type)
def _load_service_plugins(self): def _load_service_plugins(self):
@ -162,12 +163,12 @@ class NeutronManager(object):
self._load_services_from_core_plugin() self._load_services_from_core_plugin()
plugin_providers = cfg.CONF.service_plugins plugin_providers = cfg.CONF.service_plugins
LOG.debug(_("Loading service plugins: %s"), plugin_providers) LOG.debug("Loading service plugins: %s", plugin_providers)
for provider in plugin_providers: for provider in plugin_providers:
if provider == '': if provider == '':
continue continue
LOG.info(_("Loading Plugin: %s"), provider) LOG.info(_LI("Loading Plugin: %s"), provider)
plugin_inst = self._get_plugin_instance('neutron.service_plugins', plugin_inst = self._get_plugin_instance('neutron.service_plugins',
provider) provider)
@ -187,8 +188,8 @@ class NeutronManager(object):
hasattr(plugin_inst, 'agent_notifiers')): hasattr(plugin_inst, 'agent_notifiers')):
self.plugin.agent_notifiers.update(plugin_inst.agent_notifiers) self.plugin.agent_notifiers.update(plugin_inst.agent_notifiers)
LOG.debug(_("Successfully loaded %(type)s plugin. " LOG.debug("Successfully loaded %(type)s plugin. "
"Description: %(desc)s"), "Description: %(desc)s",
{"type": plugin_inst.get_plugin_type(), {"type": plugin_inst.get_plugin_type(),
"desc": plugin_inst.get_plugin_description()}) "desc": plugin_inst.get_plugin_description()})

13
neutron/policy.py
View File

@ -168,8 +168,8 @@ def _build_subattr_match_rule(attr_name, attr, action, target):
return return
data = validate[key[0]] data = validate[key[0]]
if not isinstance(data, dict): if not isinstance(data, dict):
LOG.debug(_("Attribute type descriptor is not a dict. Unable to " LOG.debug("Attribute type descriptor is not a dict. Unable to "
"generate any sub-attr policy rule for %s."), "generate any sub-attr policy rule for %s.",
attr_name) attr_name)
return return
sub_attr_rules = [policy.RuleCheck('rule', '%s:%s:%s' % sub_attr_rules = [policy.RuleCheck('rule', '%s:%s:%s' %
@ -275,7 +275,7 @@ class OwnerCheck(policy.Check):
parent_res, parent_field = do_split(separator) parent_res, parent_field = do_split(separator)
break break
except ValueError: except ValueError:
LOG.debug(_("Unable to find ':' as separator in %s."), LOG.debug("Unable to find ':' as separator in %s.",
self.target_field) self.target_field)
else: else:
# If we are here split failed with both separators # If we are here split failed with both separators
@ -346,10 +346,9 @@ class FieldCheck(policy.Check):
target_value = target_dict.get(self.field) target_value = target_dict.get(self.field)
# target_value might be a boolean, explicitly compare with None # target_value might be a boolean, explicitly compare with None
if target_value is None: if target_value is None:
LOG.debug(_("Unable to find requested field: %(field)s in " LOG.debug("Unable to find requested field: %(field)s in target: "
"target: %(target_dict)s"), "%(target_dict)s",
{'field': self.field, {'field': self.field, 'target_dict': target_dict})
'target_dict': target_dict})
return False return False
return target_value == self.value return target_value == self.value

9
neutron/quota.py
View File

@ -21,6 +21,7 @@ from oslo.utils import importutils
import webob import webob
from neutron.common import exceptions from neutron.common import exceptions
from neutron.i18n import _LI, _LW
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -223,12 +224,12 @@ class QuotaEngine(object):
QUOTA_DB_MODULE not in sys.modules): QUOTA_DB_MODULE not in sys.modules):
# If quotas table is not loaded, force config quota driver. # If quotas table is not loaded, force config quota driver.
_driver_class = QUOTA_CONF_DRIVER _driver_class = QUOTA_CONF_DRIVER
LOG.info(_("ConfDriver is used as quota_driver because the " LOG.info(_LI("ConfDriver is used as quota_driver because the "
"loaded plugin does not support 'quotas' table.")) "loaded plugin does not support 'quotas' table."))
if isinstance(_driver_class, basestring): if isinstance(_driver_class, basestring):
_driver_class = importutils.import_object(_driver_class) _driver_class = importutils.import_object(_driver_class)
self._driver = _driver_class self._driver = _driver_class
LOG.info(_('Loaded quota_driver: %s.'), _driver_class) LOG.info(_LI('Loaded quota_driver: %s.'), _driver_class)
return self._driver return self._driver
def __contains__(self, resource): def __contains__(self, resource):
@ -237,7 +238,7 @@ class QuotaEngine(object):
def register_resource(self, resource): def register_resource(self, resource):
"""Register a resource.""" """Register a resource."""
if resource.name in self._resources: if resource.name in self._resources:
LOG.warn(_('%s is already registered.'), resource.name) LOG.warn(_LW('%s is already registered.'), resource.name)
return return
self._resources[resource.name] = resource self._resources[resource.name] = resource

30
neutron/service.py
View File

@ -27,6 +27,7 @@ from neutron.common import config
from neutron.common import rpc as n_rpc from neutron.common import rpc as n_rpc
from neutron import context from neutron import context
from neutron.db import api as session from neutron.db import api as session
from neutron.i18n import _LE, _LI
from neutron import manager from neutron import manager
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.openstack.common import loopingcall from neutron.openstack.common import loopingcall
@ -102,8 +103,8 @@ def serve_wsgi(cls):
service.start() service.start()
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.exception(_('Unrecoverable error: please check log ' LOG.exception(_LE('Unrecoverable error: please check log '
'for details.')) 'for details.'))
return service return service
@ -141,11 +142,11 @@ def serve_rpc():
# simpler to check this up front by testing whether the plugin supports # simpler to check this up front by testing whether the plugin supports
# multiple RPC workers. # multiple RPC workers.
if not plugin.rpc_workers_supported(): if not plugin.rpc_workers_supported():
LOG.debug(_("Active plugin doesn't implement start_rpc_listeners")) LOG.debug("Active plugin doesn't implement start_rpc_listeners")
if 0 < cfg.CONF.rpc_workers: if 0 < cfg.CONF.rpc_workers:
msg = _("'rpc_workers = %d' ignored because start_rpc_listeners " LOG.error(_LE("'rpc_workers = %d' ignored because "
"is not implemented.") "start_rpc_listeners is not implemented."),
LOG.error(msg, cfg.CONF.rpc_workers) cfg.CONF.rpc_workers)
raise NotImplementedError() raise NotImplementedError()
try: try:
@ -160,23 +161,22 @@ def serve_rpc():
return launcher return launcher
except Exception: except Exception:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.exception(_('Unrecoverable error: please check log ' LOG.exception(_LE('Unrecoverable error: please check log for '
'for details.')) 'details.'))
def _run_wsgi(app_name): def _run_wsgi(app_name):
app = config.load_paste_app(app_name) app = config.load_paste_app(app_name)
if not app: if not app:
LOG.error(_('No known API applications configured.')) LOG.error(_LE('No known API applications configured.'))
return return
server = wsgi.Server("Neutron") server = wsgi.Server("Neutron")
server.start(app, cfg.CONF.bind_port, cfg.CONF.bind_host, server.start(app, cfg.CONF.bind_port, cfg.CONF.bind_host,
workers=cfg.CONF.api_workers) workers=cfg.CONF.api_workers)
# Dump all option values here after all options are parsed # Dump all option values here after all options are parsed
cfg.CONF.log_opt_values(LOG, std_logging.DEBUG) cfg.CONF.log_opt_values(LOG, std_logging.DEBUG)
LOG.info(_("Neutron service started, listening on %(host)s:%(port)s"), LOG.info(_LI("Neutron service started, listening on %(host)s:%(port)s"),
{'host': cfg.CONF.bind_host, {'host': cfg.CONF.bind_host, 'port': cfg.CONF.bind_port})
'port': cfg.CONF.bind_port})
return server return server
@ -275,8 +275,7 @@ class Service(n_rpc.Service):
try: try:
x.stop() x.stop()
except Exception: except Exception:
LOG.exception(_("Exception occurs when timer stops")) LOG.exception(_LE("Exception occurs when timer stops"))
pass
self.timers = [] self.timers = []
def wait(self): def wait(self):
@ -285,8 +284,7 @@ class Service(n_rpc.Service):
try: try:
x.wait() x.wait()
except Exception: except Exception:
LOG.exception(_("Exception occurs when waiting for timer")) LOG.exception(_LE("Exception occurs when waiting for timer"))
pass
def periodic_tasks(self, raise_on_error=False): def periodic_tasks(self, raise_on_error=False):
"""Tasks to be run at a periodic interval.""" """Tasks to be run at a periodic interval."""

4
neutron/tests/unit/bigswitch/fake_server.py
View File

@ -67,8 +67,8 @@ class HTTPConnectionMock(object):
self.response = HTTPResponseMock500(None, errmsg=errmsg) self.response = HTTPResponseMock500(None, errmsg=errmsg)
def request(self, action, uri, body, headers): def request(self, action, uri, body, headers):
LOG.debug(_("Request: action=%(action)s, uri=%(uri)r, " LOG.debug("Request: action=%(action)s, uri=%(uri)r, "
"body=%(body)s, headers=%(headers)s"), "body=%(body)s, headers=%(headers)s",
{'action': action, 'uri': uri, {'action': action, 'uri': uri,
'body': body, 'headers': headers}) 'body': body, 'headers': headers})
if self.broken and "ExceptOnBadServer" in uri: if self.broken and "ExceptOnBadServer" in uri:

22
neutron/tests/unit/nec/stub_ofc_driver.py
View File

@ -75,7 +75,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
if self.autocheck: if self.autocheck:
raise Exception(_('(delete_tenant) OFC tenant %s not found') raise Exception(_('(delete_tenant) OFC tenant %s not found')
% ofc_tenant_id) % ofc_tenant_id)
LOG.debug(_('delete_tenant: SUCCEED')) LOG.debug('delete_tenant: SUCCEED')
@call_log.log @call_log.log
def create_network(self, ofc_tenant_id, description, network_id=None): def create_network(self, ofc_tenant_id, description, network_id=None):
@ -100,7 +100,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
% ofc_network_id) % ofc_network_id)
data = {'description': description} data = {'description': description}
self.ofc_network_dict[ofc_network_id].update(data) self.ofc_network_dict[ofc_network_id].update(data)
LOG.debug(_('update_network: SUCCEED')) LOG.debug('update_network: SUCCEED')
@call_log.log @call_log.log
def delete_network(self, ofc_network_id): def delete_network(self, ofc_network_id):
@ -110,7 +110,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
if self.autocheck: if self.autocheck:
raise Exception(_('(delete_network) OFC network %s not found') raise Exception(_('(delete_network) OFC network %s not found')
% ofc_network_id) % ofc_network_id)
LOG.debug(_('delete_network: SUCCEED')) LOG.debug('delete_network: SUCCEED')
@call_log.log @call_log.log
def create_port(self, ofc_network_id, info, port_id=None, filters=None): def create_port(self, ofc_network_id, info, port_id=None, filters=None):
@ -136,7 +136,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
if self.autocheck: if self.autocheck:
raise Exception(_('(delete_port) OFC port %s not found') raise Exception(_('(delete_port) OFC port %s not found')
% ofc_port_id) % ofc_port_id)
LOG.debug(_('delete_port: SUCCEED')) LOG.debug('delete_port: SUCCEED')
@classmethod @classmethod
def filter_supported(cls): def filter_supported(cls):
@ -190,7 +190,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
if self.autocheck: if self.autocheck:
raise Exception(_('(delete_router) OFC router %s not found') raise Exception(_('(delete_router) OFC router %s not found')
% ofc_router_id) % ofc_router_id)
LOG.debug(_('delete_router: SUCCEED')) LOG.debug('delete_router: SUCCEED')
@call_log.log @call_log.log
def add_router_interface(self, ofc_router_id, ofc_net_id, def add_router_interface(self, ofc_router_id, ofc_net_id,
@ -213,7 +213,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
'network_id': ofc_net_id, 'network_id': ofc_net_id,
'ip_address': ip_address, 'ip_address': ip_address,
'mac_address': mac_address} 'mac_address': mac_address}
LOG.debug(_('add_router_interface: SUCCEED (if_id=%s)'), if_id) LOG.debug('add_router_interface: SUCCEED (if_id=%s)', if_id)
return if_id return if_id
@call_log.log @call_log.log
@ -230,7 +230,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
inf.update({'ip_address': ip_address}) inf.update({'ip_address': ip_address})
if mac_address: if mac_address:
inf.update({'mac_address': mac_address}) inf.update({'mac_address': mac_address})
LOG.debug(_('update_router_route: SUCCEED')) LOG.debug('update_router_route: SUCCEED')
@call_log.log @call_log.log
def delete_router_interface(self, ofc_router_inf_id): def delete_router_interface(self, ofc_router_inf_id):
@ -241,7 +241,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
raise Exception(_('(delete_router_interface) ' raise Exception(_('(delete_router_interface) '
'OFC router interface %s not found') 'OFC router interface %s not found')
% ofc_router_inf_id) % ofc_router_inf_id)
LOG.debug(_('delete_router_interface: SUCCEED')) LOG.debug('delete_router_interface: SUCCEED')
@call_log.log @call_log.log
def add_router_route(self, ofc_router_id, destination, nexthop): def add_router_route(self, ofc_router_id, destination, nexthop):
@ -261,7 +261,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
self.ofc_router_route_dict[route_id] = {'router_id': ofc_router_id, self.ofc_router_route_dict[route_id] = {'router_id': ofc_router_id,
'destination': destination, 'destination': destination,
'nexthop': nexthop} 'nexthop': nexthop}
LOG.debug(_('add_router_route: SUCCEED (route_id=%s)'), route_id) LOG.debug('add_router_route: SUCCEED (route_id=%s)', route_id)
return route_id return route_id
@call_log.log @call_log.log
@ -272,7 +272,7 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
if self.autocheck: if self.autocheck:
raise Exception(_('(delete_router_route) OFC router route %s ' raise Exception(_('(delete_router_route) OFC router route %s '
'not found') % ofc_router_route_id) 'not found') % ofc_router_route_id)
LOG.debug(_('delete_router_route: SUCCEED')) LOG.debug('delete_router_route: SUCCEED')
@call_log.log @call_log.log
def list_router_routes(self, ofc_router_id): def list_router_routes(self, ofc_router_id):
@ -285,5 +285,5 @@ class StubOFCDriver(ofc_driver_base.OFCDriverBase):
'nexthop': v['nexthop']} 'nexthop': v['nexthop']}
for k, v in self.ofc_router_route_dict.items() for k, v in self.ofc_router_route_dict.items()
if v['router_id'] == ofc_router_id] if v['router_id'] == ofc_router_id]
LOG.debug(_('list_router_routes: routes=%s'), routes) LOG.debug('list_router_routes: routes=%s', routes)
return routes return routes

22
neutron/tests/unit/test_hacking.py
View File

@ -27,8 +27,6 @@ class HackingTestCase(base.BaseTestCase):
'exception': '_LE', 'exception': '_LE',
} }
logs = expected_marks.keys() logs = expected_marks.keys()
levels = ['_LI', '_LW', '_LE', '_LC']
all_marks = levels + ['_']
debug = "LOG.debug('OK')" debug = "LOG.debug('OK')"
self.assertEqual( self.assertEqual(
0, len(list(checks.validate_log_translations(debug, debug, 'f')))) 0, len(list(checks.validate_log_translations(debug, debug, 'f'))))
@ -36,35 +34,25 @@ class HackingTestCase(base.BaseTestCase):
bad = 'LOG.%s("Bad")' % log bad = 'LOG.%s("Bad")' % log
self.assertEqual( self.assertEqual(
1, len(list(checks.validate_log_translations(bad, bad, 'f')))) 1, len(list(checks.validate_log_translations(bad, bad, 'f'))))
ok = "LOG.%s(_('OK'))" % log
self.assertEqual(
0, len(list(checks.validate_log_translations(ok, ok, 'f'))))
ok = "LOG.%s('OK') # noqa" % log ok = "LOG.%s('OK') # noqa" % log
self.assertEqual( self.assertEqual(
0, len(list(checks.validate_log_translations(ok, ok, 'f')))) 0, len(list(checks.validate_log_translations(ok, ok, 'f'))))
ok = "LOG.%s(variable)" % log ok = "LOG.%s(variable)" % log
self.assertEqual( self.assertEqual(
0, len(list(checks.validate_log_translations(ok, ok, 'f')))) 0, len(list(checks.validate_log_translations(ok, ok, 'f'))))
for level in levels:
ok = "LOG.%s(%s('OK'))" % (log, level) for mark in checks._all_hints:
self.assertEqual(
0, len(list(checks.validate_log_translations(ok,
ok, 'f'))))
filename = 'neutron/agent/f'
for mark in all_marks:
stmt = "LOG.%s(%s('test'))" % (log, mark) stmt = "LOG.%s(%s('test'))" % (log, mark)
self.assertEqual( self.assertEqual(
0 if expected_marks[log] == mark else 1, 0 if expected_marks[log] == mark else 1,
len(list(checks.validate_log_translations(stmt, len(list(checks.validate_log_translations(stmt, stmt,
stmt, 'f'))))
filename))))
def test_no_translate_debug_logs(self): def test_no_translate_debug_logs(self):
filename = 'neutron/agent/f'
for hint in checks._all_hints: for hint in checks._all_hints:
bad = "LOG.debug(%s('bad'))" % hint bad = "LOG.debug(%s('bad'))" % hint
self.assertEqual( self.assertEqual(
1, len(list(checks.no_translate_debug_logs(bad, filename)))) 1, len(list(checks.no_translate_debug_logs(bad, 'f'))))
def test_use_jsonutils(self): def test_use_jsonutils(self):
def __get_msg(fun): def __get_msg(fun):

42
neutron/wsgi.py
View File

@ -38,6 +38,7 @@ import webob.exc
from neutron.common import exceptions as exception from neutron.common import exceptions as exception
from neutron import context from neutron import context
from neutron.db import api from neutron.db import api
from neutron.i18n import _LE, _LI
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron.openstack.common import service as common_service from neutron.openstack.common import service as common_service
from neutron.openstack.common import systemd from neutron.openstack.common import systemd
@ -126,7 +127,7 @@ class Server(object):
family = info[0] family = info[0]
bind_addr = info[-1] bind_addr = info[-1]
except Exception: except Exception:
LOG.exception(_("Unable to listen on %(host)s:%(port)s"), LOG.exception(_LE("Unable to listen on %(host)s:%(port)s"),
{'host': host, 'port': port}) {'host': host, 'port': port})
sys.exit(1) sys.exit(1)
@ -334,7 +335,7 @@ class Request(webob.Request):
def get_content_type(self): def get_content_type(self):
allowed_types = ("application/json") allowed_types = ("application/json")
if "Content-Type" not in self.headers: if "Content-Type" not in self.headers:
LOG.debug(_("Missing Content-Type")) LOG.debug("Missing Content-Type")
return None return None
_type = self.content_type _type = self.content_type
if _type in allowed_types: if _type in allowed_types:
@ -512,23 +513,23 @@ class RequestDeserializer(object):
try: try:
content_type = request.best_match_content_type() content_type = request.best_match_content_type()
except exception.InvalidContentType: except exception.InvalidContentType:
LOG.debug(_("Unrecognized Content-Type provided in request")) LOG.debug("Unrecognized Content-Type provided in request")
return {} return {}
if content_type is None: if content_type is None:
LOG.debug(_("No Content-Type provided in request")) LOG.debug("No Content-Type provided in request")
return {} return {}
if not len(request.body) > 0: if not len(request.body) > 0:
LOG.debug(_("Empty body provided in request")) LOG.debug("Empty body provided in request")
return {} return {}
try: try:
deserializer = self.get_body_deserializer(content_type) deserializer = self.get_body_deserializer(content_type)
except exception.InvalidContentType: except exception.InvalidContentType:
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.debug(_("Unable to deserialize body as provided " LOG.debug("Unable to deserialize body as provided "
"Content-Type")) "Content-Type")
return deserializer.deserialize(request.body, action) return deserializer.deserialize(request.body, action)
@ -759,27 +760,27 @@ class Resource(Application):
def __call__(self, request): def __call__(self, request):
"""WSGI method that controls (de)serialization and method dispatch.""" """WSGI method that controls (de)serialization and method dispatch."""
LOG.info(_("%(method)s %(url)s"), {"method": request.method, LOG.info(_LI("%(method)s %(url)s"),
"url": request.url}) {"method": request.method, "url": request.url})
try: try:
action, args, accept = self.deserializer.deserialize(request) action, args, accept = self.deserializer.deserialize(request)
except exception.InvalidContentType: except exception.InvalidContentType:
msg = _("Unsupported Content-Type") msg = _("Unsupported Content-Type")
LOG.exception(_("InvalidContentType: %s"), msg) LOG.exception(_LE("InvalidContentType: %s"), msg)
return Fault(webob.exc.HTTPBadRequest(explanation=msg)) return Fault(webob.exc.HTTPBadRequest(explanation=msg))
except exception.MalformedRequestBody: except exception.MalformedRequestBody:
msg = _("Malformed request body") msg = _("Malformed request body")
LOG.exception(_("MalformedRequestBody: %s"), msg) LOG.exception(_LE("MalformedRequestBody: %s"), msg)
return Fault(webob.exc.HTTPBadRequest(explanation=msg)) return Fault(webob.exc.HTTPBadRequest(explanation=msg))
try: try:
action_result = self.dispatch(request, action, args) action_result = self.dispatch(request, action, args)
except webob.exc.HTTPException as ex: except webob.exc.HTTPException as ex:
LOG.info(_("HTTP exception thrown: %s"), unicode(ex)) LOG.info(_LI("HTTP exception thrown: %s"), ex)
action_result = Fault(ex, self._fault_body_function) action_result = Fault(ex, self._fault_body_function)
except Exception: except Exception:
LOG.exception(_("Internal error")) LOG.exception(_LE("Internal error"))
# Do not include the traceback to avoid returning it to clients. # Do not include the traceback to avoid returning it to clients.
action_result = Fault(webob.exc.HTTPServerError(), action_result = Fault(webob.exc.HTTPServerError(),
self._fault_body_function) self._fault_body_function)
@ -792,13 +793,11 @@ class Resource(Application):
response = action_result response = action_result
try: try:
msg_dict = dict(url=request.url, status=response.status_int) LOG.info(_LI("%(url)s returned with HTTP %(status)d"),
msg = _("%(url)s returned with HTTP %(status)d") % msg_dict dict(url=request.url, status=response.status_int))
except AttributeError as e: except AttributeError as e:
msg_dict = dict(url=request.url, exception=e) LOG.info(_LI("%(url)s returned a fault: %(exception)s"),
msg = _("%(url)s returned a fault: %(exception)s") % msg_dict dict(url=request.url, exception=e))
LOG.info(msg)
return response return response
@ -889,9 +888,8 @@ class Controller(object):
response = webob.Response(status=status, response = webob.Response(status=status,
content_type=content_type, content_type=content_type,
body=body) body=body)
msg_dict = dict(url=req.url, status=response.status_int) LOG.debug("%(url)s returned with HTTP %(status)d",
msg = _("%(url)s returned with HTTP %(status)d") % msg_dict dict(url=req.url, status=response.status_int))
LOG.debug(msg)
return response return response
else: else:
return result return result