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
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
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
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
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
# 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])