x/vmware-nsx
Code Issues Proposed changes

Merge "Update i18n translation for neutron.cmd log msg's"

Browse Source
This commit is contained in:
Jenkins 2014-11-18 11:14:27 +00:00 committed by Gerrit Code Review
commit 50f65e2a9a
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/cmd/sanity/checks.py
View File

@ -19,6 +19,7 @@ from neutron.agent.linux import ip_link_support
from neutron.agent.linux import ovs_lib
from neutron.agent.linux import utils as agent_utils
from neutron.common import utils
from neutron.openstack.common.gettextutils import _LE
from neutron.openstack.common import log as logging
from neutron.plugins.common import constants as const
from neutron.plugins.openvswitch.common import constants as ovs_const
@ -67,11 +68,11 @@ def ofctl_arg_supported(root_helper, cmd, **kwargs):
agent_utils.execute(full_args, root_helper=root_helper)
except RuntimeError as e:
LOG.debug("Exception while checking supported feature via "
"command %s. Exception: %s" % (full_args, e))
"command %s. Exception: %s", (full_args, e))
return False
except Exception:
LOG.exception(_("Unexpected exception while checking supported"
" feature via command: %s") % full_args)
LOG.exception(_LE("Unexpected exception while checking supported"
" feature via command: %s"), full_args)
return False
else:
return True
@ -102,7 +103,7 @@ def vf_management_supported(root_helper):
LOG.debug("ip link command does not support vf capability")
return False
except ip_link_support.UnsupportedIpLinkCommand:
LOG.exception(_("Unexpected exception while checking supported "
"ip link command"))
LOG.exception(_LE("Unexpected exception while checking supported "
"ip link command"))
return False
return True

20
neutron/cmd/sanity_check.py
View File

@ -38,19 +38,19 @@ class BoolOptCallback(cfg.BoolOpt):
def check_ovs_vxlan():
result = checks.vxlan_supported(root_helper=cfg.CONF.AGENT.root_helper)
if not result:
LOG.error(_('Check for Open vSwitch VXLAN support failed. '
'Please ensure that the version of openvswitch '
'being used has VXLAN support.'))
LOG.error(_LE('Check for Open vSwitch VXLAN support failed. '
'Please ensure that the version of openvswitch '
'being used has VXLAN support.'))
return result
def check_ovs_patch():
result = checks.patch_supported(root_helper=cfg.CONF.AGENT.root_helper)
if not result:
LOG.error(_('Check for Open vSwitch patch port support failed. '
'Please ensure that the version of openvswitch '
'being used has patch port support or disable features '
'requiring patch ports (gre/vxlan, etc.).'))
LOG.error(_LE('Check for Open vSwitch patch port support failed. '
'Please ensure that the version of openvswitch '
'being used has patch port support or disable features '
'requiring patch ports (gre/vxlan, etc.).'))
return result
@ -67,9 +67,9 @@ def check_arp_responder():
result = checks.arp_responder_supported(
root_helper=cfg.CONF.AGENT.root_helper)
if not result:
LOG.error(_('Check for Open vSwitch ARP responder support failed. '
'Please ensure that the version of openvswitch '
'being used has ARP flows support.'))
LOG.error(_LE('Check for Open vSwitch ARP responder support failed. '
'Please ensure that the version of openvswitch '
'being used has ARP flows support.'))
return result

3
neutron/hacking/checks.py
View File

@ -44,7 +44,8 @@ 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"]
dirs = ["neutron/agent",
"neutron/cmd"]
return any([dir in filename for dir in dirs])