Merge "Refactoring config opts for ml2 plugin openvswitch"
This commit is contained in:
commit
f545cc50f1
neutron
conf/plugins/ml2/drivers
opts.pyplugins/ml2/drivers/openvswitch/agent/common
tests/functional/agent/l2
164
neutron/conf/plugins/ml2/drivers/ovs_conf.py
Normal file
164
neutron/conf/plugins/ml2/drivers/ovs_conf.py
Normal file
@ -0,0 +1,164 @@
|
||||
# Copyright 2012 Red Hat, Inc.
|
||||
#
|
||||
# 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.
|
||||
|
||||
from neutron_lib import constants as n_const
|
||||
from oslo_config import cfg
|
||||
|
||||
from neutron._i18n import _
|
||||
from neutron.plugins.common import constants as p_const
|
||||
from neutron.plugins.ml2.drivers.openvswitch.agent.common \
|
||||
import constants
|
||||
|
||||
|
||||
DEFAULT_BRIDGE_MAPPINGS = []
|
||||
DEFAULT_TUNNEL_TYPES = []
|
||||
|
||||
ovs_opts = [
|
||||
cfg.StrOpt('integration_bridge', default='br-int',
|
||||
help=_("Integration bridge to use. "
|
||||
"Do not change this parameter unless you have a good "
|
||||
"reason to. This is the name of the OVS integration "
|
||||
"bridge. There is one per hypervisor. The integration "
|
||||
"bridge acts as a virtual 'patch bay'. All VM VIFs are "
|
||||
"attached to this bridge and then 'patched' according "
|
||||
"to their network connectivity.")),
|
||||
cfg.StrOpt('tunnel_bridge', default='br-tun',
|
||||
help=_("Tunnel bridge to use.")),
|
||||
cfg.StrOpt('int_peer_patch_port', default='patch-tun',
|
||||
help=_("Peer patch port in integration bridge for tunnel "
|
||||
"bridge.")),
|
||||
cfg.StrOpt('tun_peer_patch_port', default='patch-int',
|
||||
help=_("Peer patch port in tunnel bridge for integration "
|
||||
"bridge.")),
|
||||
cfg.IPOpt('local_ip',
|
||||
help=_("IP address of local overlay (tunnel) network endpoint. "
|
||||
"Use either an IPv4 or IPv6 address that resides on one "
|
||||
"of the host network interfaces. The IP version of this "
|
||||
"value must match the value of the 'overlay_ip_version' "
|
||||
"option in the ML2 plug-in configuration file on the "
|
||||
"neutron server node(s).")),
|
||||
cfg.ListOpt('bridge_mappings',
|
||||
default=DEFAULT_BRIDGE_MAPPINGS,
|
||||
help=_("Comma-separated list of <physical_network>:<bridge> "
|
||||
"tuples mapping physical network names to the agent's "
|
||||
"node-specific Open vSwitch bridge names to be used "
|
||||
"for flat and VLAN networks. The length of bridge "
|
||||
"names should be no more than 11. Each bridge must "
|
||||
"exist, and should have a physical network interface "
|
||||
"configured as a port. All physical networks "
|
||||
"configured on the server should have mappings to "
|
||||
"appropriate bridges on each agent. "
|
||||
"Note: If you remove a bridge from this "
|
||||
"mapping, make sure to disconnect it from the "
|
||||
"integration bridge as it won't be managed by the "
|
||||
"agent anymore.")),
|
||||
cfg.BoolOpt('use_veth_interconnection', default=False,
|
||||
help=_("Use veths instead of patch ports to interconnect the "
|
||||
"integration bridge to physical networks. "
|
||||
"Support kernel without Open vSwitch patch port "
|
||||
"support so long as it is set to True.")),
|
||||
cfg.StrOpt('of_interface', default='native',
|
||||
choices=['ovs-ofctl', 'native'],
|
||||
help=_("OpenFlow interface to use.")),
|
||||
cfg.StrOpt('datapath_type', default=constants.OVS_DATAPATH_SYSTEM,
|
||||
choices=[constants.OVS_DATAPATH_SYSTEM,
|
||||
constants.OVS_DATAPATH_NETDEV],
|
||||
help=_("OVS datapath to use. 'system' is the default value and "
|
||||
"corresponds to the kernel datapath. To enable the "
|
||||
"userspace datapath set this value to 'netdev'.")),
|
||||
cfg.StrOpt('vhostuser_socket_dir', default=constants.VHOST_USER_SOCKET_DIR,
|
||||
help=_("OVS vhost-user socket directory.")),
|
||||
cfg.IPOpt('of_listen_address', default='127.0.0.1',
|
||||
help=_("Address to listen on for OpenFlow connections. "
|
||||
"Used only for 'native' driver.")),
|
||||
cfg.PortOpt('of_listen_port', default=6633,
|
||||
help=_("Port to listen on for OpenFlow connections. "
|
||||
"Used only for 'native' driver.")),
|
||||
cfg.IntOpt('of_connect_timeout', default=30,
|
||||
help=_("Timeout in seconds to wait for "
|
||||
"the local switch connecting the controller. "
|
||||
"Used only for 'native' driver.")),
|
||||
cfg.IntOpt('of_request_timeout', default=10,
|
||||
help=_("Timeout in seconds to wait for a single "
|
||||
"OpenFlow request. "
|
||||
"Used only for 'native' driver.")),
|
||||
]
|
||||
|
||||
agent_opts = [
|
||||
cfg.IntOpt('polling_interval', default=2,
|
||||
help=_("The number of seconds the agent will wait between "
|
||||
"polling for local device changes.")),
|
||||
cfg.BoolOpt('minimize_polling',
|
||||
default=True,
|
||||
help=_("Minimize polling by monitoring ovsdb for interface "
|
||||
"changes.")),
|
||||
cfg.IntOpt('ovsdb_monitor_respawn_interval',
|
||||
default=constants.DEFAULT_OVSDBMON_RESPAWN,
|
||||
help=_("The number of seconds to wait before respawning the "
|
||||
"ovsdb monitor after losing communication with it.")),
|
||||
cfg.ListOpt('tunnel_types', default=DEFAULT_TUNNEL_TYPES,
|
||||
help=_("Network types supported by the agent "
|
||||
"(gre and/or vxlan).")),
|
||||
cfg.PortOpt('vxlan_udp_port', default=p_const.VXLAN_UDP_PORT,
|
||||
help=_("The UDP port to use for VXLAN tunnels.")),
|
||||
cfg.IntOpt('veth_mtu', default=9000,
|
||||
help=_("MTU size of veth interfaces")),
|
||||
cfg.BoolOpt('l2_population', default=False,
|
||||
help=_("Use ML2 l2population mechanism driver to learn "
|
||||
"remote MAC and IPs and improve tunnel scalability.")),
|
||||
cfg.BoolOpt('arp_responder', default=False,
|
||||
help=_("Enable local ARP responder if it is supported. "
|
||||
"Requires OVS 2.1 and ML2 l2population driver. "
|
||||
"Allows the switch (when supporting an overlay) "
|
||||
"to respond to an ARP request locally without "
|
||||
"performing a costly ARP broadcast into the overlay.")),
|
||||
cfg.BoolOpt('prevent_arp_spoofing', default=True,
|
||||
deprecated_for_removal=True,
|
||||
help=_("Enable suppression of ARP responses that don't match "
|
||||
"an IP address that belongs to the port from which "
|
||||
"they originate. Note: This prevents the VMs attached "
|
||||
"to this agent from spoofing, it doesn't protect them "
|
||||
"from other devices which have the capability to spoof "
|
||||
"(e.g. bare metal or VMs attached to agents without "
|
||||
"this flag set to True). Spoofing rules will not be "
|
||||
"added to any ports that have port security disabled. "
|
||||
"For LinuxBridge, this requires ebtables. For OVS, it "
|
||||
"requires a version that supports matching ARP "
|
||||
"headers. This option will be removed in Ocata so "
|
||||
"the only way to disable protection will be via the "
|
||||
"port security extension.")),
|
||||
cfg.BoolOpt('dont_fragment', default=True,
|
||||
help=_("Set or un-set the don't fragment (DF) bit on "
|
||||
"outgoing IP packet carrying GRE/VXLAN tunnel.")),
|
||||
cfg.BoolOpt('enable_distributed_routing', default=False,
|
||||
help=_("Make the l2 agent run in DVR mode.")),
|
||||
cfg.IntOpt('quitting_rpc_timeout', default=10,
|
||||
help=_("Set new timeout in seconds for new rpc calls after "
|
||||
"agent receives SIGTERM. If value is set to 0, rpc "
|
||||
"timeout won't be changed")),
|
||||
cfg.BoolOpt('drop_flows_on_start', default=False,
|
||||
help=_("Reset flow table on start. Setting this to True will "
|
||||
"cause brief traffic interruption.")),
|
||||
cfg.BoolOpt('tunnel_csum', default=False,
|
||||
help=_("Set or un-set the tunnel header checksum on "
|
||||
"outgoing IP packet carrying GRE/VXLAN tunnel.")),
|
||||
cfg.StrOpt('agent_type', default=n_const.AGENT_TYPE_OVS,
|
||||
deprecated_for_removal=True,
|
||||
help=_("Selects the Agent Type reported"))
|
||||
]
|
||||
|
||||
|
||||
def register_ovs_agent_opts(cfg=cfg.CONF):
|
||||
cfg.register_opts(ovs_opts, "OVS")
|
||||
cfg.register_opts(agent_opts, "AGENT")
|
@ -38,6 +38,7 @@ import neutron.conf.plugins.ml2.drivers.driver_type
|
||||
import neutron.conf.plugins.ml2.drivers.linuxbridge
|
||||
import neutron.conf.plugins.ml2.drivers.macvtap
|
||||
import neutron.conf.plugins.ml2.drivers.mech_sriov.agent_common
|
||||
import neutron.conf.plugins.ml2.drivers.ovs_conf
|
||||
import neutron.conf.quota
|
||||
import neutron.conf.service
|
||||
import neutron.conf.services.metering_agent
|
||||
@ -56,7 +57,6 @@ import neutron.extensions.l3
|
||||
import neutron.extensions.securitygroup
|
||||
import neutron.plugins.ml2.config
|
||||
import neutron.plugins.ml2.drivers.mech_sriov.agent.common.config
|
||||
import neutron.plugins.ml2.drivers.openvswitch.agent.common.config
|
||||
import neutron.wsgi
|
||||
|
||||
|
||||
@ -261,14 +261,12 @@ def list_ovs_opts():
|
||||
return [
|
||||
('ovs',
|
||||
itertools.chain(
|
||||
neutron.plugins.ml2.drivers.openvswitch.agent.common.config.
|
||||
ovs_opts,
|
||||
neutron.conf.plugins.ml2.drivers.ovs_conf.ovs_opts,
|
||||
neutron.agent.ovsdb.api.OPTS)
|
||||
),
|
||||
('agent',
|
||||
itertools.chain(
|
||||
neutron.plugins.ml2.drivers.openvswitch.agent.common.config.
|
||||
agent_opts,
|
||||
neutron.conf.plugins.ml2.drivers.ovs_conf.agent_opts,
|
||||
neutron.conf.agent.agent_extensions_manager.
|
||||
AGENT_EXT_MANAGER_OPTS)
|
||||
),
|
||||
|
@ -12,154 +12,10 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from neutron_lib import constants as n_const
|
||||
from oslo_config import cfg
|
||||
|
||||
from neutron._i18n import _
|
||||
from neutron.agent.common import config
|
||||
from neutron.plugins.common import constants as p_const
|
||||
from neutron.plugins.ml2.drivers.openvswitch.agent.common \
|
||||
import constants
|
||||
from neutron.conf.plugins.ml2.drivers import ovs_conf
|
||||
|
||||
|
||||
DEFAULT_BRIDGE_MAPPINGS = []
|
||||
DEFAULT_TUNNEL_TYPES = []
|
||||
|
||||
ovs_opts = [
|
||||
cfg.StrOpt('integration_bridge', default='br-int',
|
||||
help=_("Integration bridge to use. "
|
||||
"Do not change this parameter unless you have a good "
|
||||
"reason to. This is the name of the OVS integration "
|
||||
"bridge. There is one per hypervisor. The integration "
|
||||
"bridge acts as a virtual 'patch bay'. All VM VIFs are "
|
||||
"attached to this bridge and then 'patched' according "
|
||||
"to their network connectivity.")),
|
||||
cfg.StrOpt('tunnel_bridge', default='br-tun',
|
||||
help=_("Tunnel bridge to use.")),
|
||||
cfg.StrOpt('int_peer_patch_port', default='patch-tun',
|
||||
help=_("Peer patch port in integration bridge for tunnel "
|
||||
"bridge.")),
|
||||
cfg.StrOpt('tun_peer_patch_port', default='patch-int',
|
||||
help=_("Peer patch port in tunnel bridge for integration "
|
||||
"bridge.")),
|
||||
cfg.IPOpt('local_ip',
|
||||
help=_("IP address of local overlay (tunnel) network endpoint. "
|
||||
"Use either an IPv4 or IPv6 address that resides on one "
|
||||
"of the host network interfaces. The IP version of this "
|
||||
"value must match the value of the 'overlay_ip_version' "
|
||||
"option in the ML2 plug-in configuration file on the "
|
||||
"neutron server node(s).")),
|
||||
cfg.ListOpt('bridge_mappings',
|
||||
default=DEFAULT_BRIDGE_MAPPINGS,
|
||||
help=_("Comma-separated list of <physical_network>:<bridge> "
|
||||
"tuples mapping physical network names to the agent's "
|
||||
"node-specific Open vSwitch bridge names to be used "
|
||||
"for flat and VLAN networks. The length of bridge "
|
||||
"names should be no more than 11. Each bridge must "
|
||||
"exist, and should have a physical network interface "
|
||||
"configured as a port. All physical networks "
|
||||
"configured on the server should have mappings to "
|
||||
"appropriate bridges on each agent. "
|
||||
"Note: If you remove a bridge from this "
|
||||
"mapping, make sure to disconnect it from the "
|
||||
"integration bridge as it won't be managed by the "
|
||||
"agent anymore.")),
|
||||
cfg.BoolOpt('use_veth_interconnection', default=False,
|
||||
help=_("Use veths instead of patch ports to interconnect the "
|
||||
"integration bridge to physical networks. "
|
||||
"Support kernel without Open vSwitch patch port "
|
||||
"support so long as it is set to True.")),
|
||||
cfg.StrOpt('of_interface', default='native',
|
||||
choices=['ovs-ofctl', 'native'],
|
||||
help=_("OpenFlow interface to use.")),
|
||||
cfg.StrOpt('datapath_type', default=constants.OVS_DATAPATH_SYSTEM,
|
||||
choices=[constants.OVS_DATAPATH_SYSTEM,
|
||||
constants.OVS_DATAPATH_NETDEV],
|
||||
help=_("OVS datapath to use. 'system' is the default value and "
|
||||
"corresponds to the kernel datapath. To enable the "
|
||||
"userspace datapath set this value to 'netdev'.")),
|
||||
cfg.StrOpt('vhostuser_socket_dir', default=constants.VHOST_USER_SOCKET_DIR,
|
||||
help=_("OVS vhost-user socket directory.")),
|
||||
cfg.IPOpt('of_listen_address', default='127.0.0.1',
|
||||
help=_("Address to listen on for OpenFlow connections. "
|
||||
"Used only for 'native' driver.")),
|
||||
cfg.PortOpt('of_listen_port', default=6633,
|
||||
help=_("Port to listen on for OpenFlow connections. "
|
||||
"Used only for 'native' driver.")),
|
||||
cfg.IntOpt('of_connect_timeout', default=30,
|
||||
help=_("Timeout in seconds to wait for "
|
||||
"the local switch connecting the controller. "
|
||||
"Used only for 'native' driver.")),
|
||||
cfg.IntOpt('of_request_timeout', default=10,
|
||||
help=_("Timeout in seconds to wait for a single "
|
||||
"OpenFlow request. "
|
||||
"Used only for 'native' driver.")),
|
||||
]
|
||||
|
||||
agent_opts = [
|
||||
cfg.IntOpt('polling_interval', default=2,
|
||||
help=_("The number of seconds the agent will wait between "
|
||||
"polling for local device changes.")),
|
||||
cfg.BoolOpt('minimize_polling',
|
||||
default=True,
|
||||
help=_("Minimize polling by monitoring ovsdb for interface "
|
||||
"changes.")),
|
||||
cfg.IntOpt('ovsdb_monitor_respawn_interval',
|
||||
default=constants.DEFAULT_OVSDBMON_RESPAWN,
|
||||
help=_("The number of seconds to wait before respawning the "
|
||||
"ovsdb monitor after losing communication with it.")),
|
||||
cfg.ListOpt('tunnel_types', default=DEFAULT_TUNNEL_TYPES,
|
||||
help=_("Network types supported by the agent "
|
||||
"(gre and/or vxlan).")),
|
||||
cfg.PortOpt('vxlan_udp_port', default=p_const.VXLAN_UDP_PORT,
|
||||
help=_("The UDP port to use for VXLAN tunnels.")),
|
||||
cfg.IntOpt('veth_mtu', default=9000,
|
||||
help=_("MTU size of veth interfaces")),
|
||||
cfg.BoolOpt('l2_population', default=False,
|
||||
help=_("Use ML2 l2population mechanism driver to learn "
|
||||
"remote MAC and IPs and improve tunnel scalability.")),
|
||||
cfg.BoolOpt('arp_responder', default=False,
|
||||
help=_("Enable local ARP responder if it is supported. "
|
||||
"Requires OVS 2.1 and ML2 l2population driver. "
|
||||
"Allows the switch (when supporting an overlay) "
|
||||
"to respond to an ARP request locally without "
|
||||
"performing a costly ARP broadcast into the overlay.")),
|
||||
cfg.BoolOpt('prevent_arp_spoofing', default=True,
|
||||
deprecated_for_removal=True,
|
||||
help=_("Enable suppression of ARP responses that don't match "
|
||||
"an IP address that belongs to the port from which "
|
||||
"they originate. Note: This prevents the VMs attached "
|
||||
"to this agent from spoofing, it doesn't protect them "
|
||||
"from other devices which have the capability to spoof "
|
||||
"(e.g. bare metal or VMs attached to agents without "
|
||||
"this flag set to True). Spoofing rules will not be "
|
||||
"added to any ports that have port security disabled. "
|
||||
"For LinuxBridge, this requires ebtables. For OVS, it "
|
||||
"requires a version that supports matching ARP "
|
||||
"headers. This option will be removed in Ocata so "
|
||||
"the only way to disable protection will be via the "
|
||||
"port security extension.")),
|
||||
cfg.BoolOpt('dont_fragment', default=True,
|
||||
help=_("Set or un-set the don't fragment (DF) bit on "
|
||||
"outgoing IP packet carrying GRE/VXLAN tunnel.")),
|
||||
cfg.BoolOpt('enable_distributed_routing', default=False,
|
||||
help=_("Make the l2 agent run in DVR mode.")),
|
||||
cfg.IntOpt('quitting_rpc_timeout', default=10,
|
||||
help=_("Set new timeout in seconds for new rpc calls after "
|
||||
"agent receives SIGTERM. If value is set to 0, rpc "
|
||||
"timeout won't be changed")),
|
||||
cfg.BoolOpt('drop_flows_on_start', default=False,
|
||||
help=_("Reset flow table on start. Setting this to True will "
|
||||
"cause brief traffic interruption.")),
|
||||
cfg.BoolOpt('tunnel_csum', default=False,
|
||||
help=_("Set or un-set the tunnel header checksum on "
|
||||
"outgoing IP packet carrying GRE/VXLAN tunnel.")),
|
||||
cfg.StrOpt('agent_type', default=n_const.AGENT_TYPE_OVS,
|
||||
deprecated_for_removal=True,
|
||||
help=_("Selects the Agent Type reported"))
|
||||
]
|
||||
|
||||
|
||||
cfg.CONF.register_opts(ovs_opts, "OVS")
|
||||
cfg.CONF.register_opts(agent_opts, "AGENT")
|
||||
ovs_conf.register_ovs_agent_opts()
|
||||
config.register_agent_state_opts_helper(cfg.CONF)
|
||||
|
@ -29,9 +29,8 @@ from neutron.agent.linux import interface
|
||||
from neutron.agent.linux import polling
|
||||
from neutron.common import utils
|
||||
from neutron.conf import common as common_config
|
||||
from neutron.conf.plugins.ml2.drivers import ovs_conf
|
||||
from neutron.plugins.common import constants as p_const
|
||||
from neutron.plugins.ml2.drivers.openvswitch.agent.common import config \
|
||||
as ovs_config
|
||||
from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
|
||||
from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
|
||||
import br_int
|
||||
@ -71,8 +70,7 @@ class OVSAgentTestFramework(base.BaseOVSLinuxTestCase):
|
||||
config = cfg.ConfigOpts()
|
||||
config.register_opts(common_config.core_opts)
|
||||
config.register_opts(interface.OPTS)
|
||||
config.register_opts(ovs_config.ovs_opts, "OVS")
|
||||
config.register_opts(ovs_config.agent_opts, "AGENT")
|
||||
ovs_conf.register_ovs_agent_opts(config)
|
||||
agent_config.register_interface_driver_opts_helper(config)
|
||||
agent_config.register_agent_state_opts_helper(config)
|
||||
ext_manager.register_opts(config)
|
||||
|
Loading…
Reference in New Issue
Block a user