Refactoring cfg opts for ml2 plugin linuxbridge
Refactoring neutron ml2 linuxbridge drivers configuration options to be in neutron/conf/plugins/ml2/drivers/linuxbridge. This would allow centralization of all configuration options and provides an easy way to import. Change-Id: I4d86831978a18c96a9cf60df743246d46e7a8a05 Partial-Bug: #1563069
This commit is contained in:
parent
26bbc783d2
commit
0810cbdad8
|
@ -0,0 +1,95 @@
|
||||||
|
# Copyright 2012 Cisco Systems, Inc. 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.
|
||||||
|
|
||||||
|
from oslo_config import cfg
|
||||||
|
|
||||||
|
from neutron._i18n import _
|
||||||
|
|
||||||
|
DEFAULT_BRIDGE_MAPPINGS = []
|
||||||
|
DEFAULT_INTERFACE_MAPPINGS = []
|
||||||
|
DEFAULT_VXLAN_GROUP = '224.0.0.1'
|
||||||
|
DEFAULT_KERNEL_HZ_VALUE = 250 # [Hz]
|
||||||
|
DEFAULT_TC_TBF_LATENCY = 50 # [ms]
|
||||||
|
|
||||||
|
vxlan_opts = [
|
||||||
|
cfg.BoolOpt('enable_vxlan', default=True,
|
||||||
|
help=_("Enable VXLAN on the agent. Can be enabled when "
|
||||||
|
"agent is managed by ml2 plugin using linuxbridge "
|
||||||
|
"mechanism driver")),
|
||||||
|
cfg.IntOpt('ttl',
|
||||||
|
help=_("TTL for vxlan interface protocol packets.")),
|
||||||
|
cfg.IntOpt('tos',
|
||||||
|
help=_("TOS for vxlan interface protocol packets.")),
|
||||||
|
cfg.StrOpt('vxlan_group', default=DEFAULT_VXLAN_GROUP,
|
||||||
|
help=_("Multicast group(s) for vxlan interface. A range of "
|
||||||
|
"group addresses may be specified by using CIDR "
|
||||||
|
"notation. Specifying a range allows different VNIs to "
|
||||||
|
"use different group addresses, reducing or eliminating "
|
||||||
|
"spurious broadcast traffic to the tunnel endpoints. "
|
||||||
|
"To reserve a unique group for each possible "
|
||||||
|
"(24-bit) VNI, use a /8 such as 239.0.0.0/8. This "
|
||||||
|
"setting must be the same on all the agents.")),
|
||||||
|
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.BoolOpt('l2_population', default=False,
|
||||||
|
help=_("Extension to use alongside ml2 plugin's l2population "
|
||||||
|
"mechanism driver. It enables the plugin to populate "
|
||||||
|
"VXLAN forwarding table.")),
|
||||||
|
cfg.BoolOpt('arp_responder', default=False,
|
||||||
|
help=_("Enable local ARP responder which provides local "
|
||||||
|
"responses instead of performing ARP broadcast into "
|
||||||
|
"the overlay. Enabling local ARP responder is not "
|
||||||
|
"fully compatible with the allowed-address-pairs "
|
||||||
|
"extension.")
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
bridge_opts = [
|
||||||
|
cfg.ListOpt('physical_interface_mappings',
|
||||||
|
default=DEFAULT_INTERFACE_MAPPINGS,
|
||||||
|
help=_("Comma-separated list of "
|
||||||
|
"<physical_network>:<physical_interface> tuples "
|
||||||
|
"mapping physical network names to the agent's "
|
||||||
|
"node-specific physical network interfaces to be used "
|
||||||
|
"for flat and VLAN networks. All physical networks "
|
||||||
|
"listed in network_vlan_ranges on the server should "
|
||||||
|
"have mappings to appropriate interfaces on each "
|
||||||
|
"agent.")),
|
||||||
|
cfg.ListOpt('bridge_mappings',
|
||||||
|
default=DEFAULT_BRIDGE_MAPPINGS,
|
||||||
|
help=_("List of <physical_network>:<physical_bridge>")),
|
||||||
|
]
|
||||||
|
|
||||||
|
qos_options = [
|
||||||
|
cfg.IntOpt('kernel_hz', default=DEFAULT_KERNEL_HZ_VALUE,
|
||||||
|
help=_("Value of host kernel tick rate (hz) for calculating "
|
||||||
|
"minimum burst value in bandwidth limit rules for "
|
||||||
|
"a port with QoS. See kernel configuration file for "
|
||||||
|
"HZ value and tc-tbf manual for more information.")),
|
||||||
|
cfg.IntOpt('tbf_latency', default=DEFAULT_TC_TBF_LATENCY,
|
||||||
|
help=_("Value of latency (ms) for calculating size of queue "
|
||||||
|
"for a port with QoS. See tc-tbf manual for more "
|
||||||
|
"information."))
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def register_linuxbridge_opts(cfg=cfg.CONF):
|
||||||
|
cfg.register_opts(vxlan_opts, "VXLAN")
|
||||||
|
cfg.register_opts(bridge_opts, "LINUX_BRIDGE")
|
||||||
|
cfg.register_opts(qos_options, "QOS")
|
|
@ -32,6 +32,7 @@ import neutron.conf.agent.dhcp
|
||||||
import neutron.conf.agent.l3.config
|
import neutron.conf.agent.l3.config
|
||||||
import neutron.conf.agent.ovs_conf
|
import neutron.conf.agent.ovs_conf
|
||||||
import neutron.conf.common
|
import neutron.conf.common
|
||||||
|
import neutron.conf.plugins.ml2.drivers.linuxbridge
|
||||||
import neutron.conf.quota
|
import neutron.conf.quota
|
||||||
import neutron.conf.service
|
import neutron.conf.service
|
||||||
import neutron.db.agents_db
|
import neutron.db.agents_db
|
||||||
|
@ -48,7 +49,6 @@ import neutron.extensions.l3
|
||||||
import neutron.extensions.securitygroup
|
import neutron.extensions.securitygroup
|
||||||
import neutron.plugins.ml2.config
|
import neutron.plugins.ml2.config
|
||||||
import neutron.plugins.ml2.drivers.agent.config
|
import neutron.plugins.ml2.drivers.agent.config
|
||||||
import neutron.plugins.ml2.drivers.linuxbridge.agent.common.config
|
|
||||||
import neutron.plugins.ml2.drivers.macvtap.agent.config
|
import neutron.plugins.ml2.drivers.macvtap.agent.config
|
||||||
import neutron.plugins.ml2.drivers.mech_sriov.agent.common.config
|
import neutron.plugins.ml2.drivers.mech_sriov.agent.common.config
|
||||||
import neutron.plugins.ml2.drivers.mech_sriov.mech_driver.mech_driver
|
import neutron.plugins.ml2.drivers.mech_sriov.mech_driver.mech_driver
|
||||||
|
@ -181,11 +181,9 @@ def list_dhcp_agent_opts():
|
||||||
def list_linux_bridge_opts():
|
def list_linux_bridge_opts():
|
||||||
return [
|
return [
|
||||||
('linux_bridge',
|
('linux_bridge',
|
||||||
neutron.plugins.ml2.drivers.linuxbridge.agent.common.config.
|
neutron.conf.plugins.ml2.drivers.linuxbridge.bridge_opts),
|
||||||
bridge_opts),
|
|
||||||
('vxlan',
|
('vxlan',
|
||||||
neutron.plugins.ml2.drivers.linuxbridge.agent.common.config.
|
neutron.conf.plugins.ml2.drivers.linuxbridge.vxlan_opts),
|
||||||
vxlan_opts),
|
|
||||||
('agent',
|
('agent',
|
||||||
neutron.plugins.ml2.drivers.agent.config.agent_opts),
|
neutron.plugins.ml2.drivers.agent.config.agent_opts),
|
||||||
('securitygroup',
|
('securitygroup',
|
||||||
|
|
|
@ -12,83 +12,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_config import cfg
|
from neutron.conf.plugins.ml2.drivers import linuxbridge
|
||||||
|
|
||||||
from neutron._i18n import _
|
|
||||||
|
|
||||||
DEFAULT_BRIDGE_MAPPINGS = []
|
|
||||||
DEFAULT_INTERFACE_MAPPINGS = []
|
|
||||||
DEFAULT_VXLAN_GROUP = '224.0.0.1'
|
|
||||||
DEFAULT_KERNEL_HZ_VALUE = 250 # [Hz]
|
|
||||||
DEFAULT_TC_TBF_LATENCY = 50 # [ms]
|
|
||||||
|
|
||||||
vxlan_opts = [
|
|
||||||
cfg.BoolOpt('enable_vxlan', default=True,
|
|
||||||
help=_("Enable VXLAN on the agent. Can be enabled when "
|
|
||||||
"agent is managed by ml2 plugin using linuxbridge "
|
|
||||||
"mechanism driver")),
|
|
||||||
cfg.IntOpt('ttl',
|
|
||||||
help=_("TTL for vxlan interface protocol packets.")),
|
|
||||||
cfg.IntOpt('tos',
|
|
||||||
help=_("TOS for vxlan interface protocol packets.")),
|
|
||||||
cfg.StrOpt('vxlan_group', default=DEFAULT_VXLAN_GROUP,
|
|
||||||
help=_("Multicast group(s) for vxlan interface. A range of "
|
|
||||||
"group addresses may be specified by using CIDR "
|
|
||||||
"notation. Specifying a range allows different VNIs to "
|
|
||||||
"use different group addresses, reducing or eliminating "
|
|
||||||
"spurious broadcast traffic to the tunnel endpoints. "
|
|
||||||
"To reserve a unique group for each possible "
|
|
||||||
"(24-bit) VNI, use a /8 such as 239.0.0.0/8. This "
|
|
||||||
"setting must be the same on all the agents.")),
|
|
||||||
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.BoolOpt('l2_population', default=False,
|
|
||||||
help=_("Extension to use alongside ml2 plugin's l2population "
|
|
||||||
"mechanism driver. It enables the plugin to populate "
|
|
||||||
"VXLAN forwarding table.")),
|
|
||||||
cfg.BoolOpt('arp_responder', default=False,
|
|
||||||
help=_("Enable local ARP responder which provides local "
|
|
||||||
"responses instead of performing ARP broadcast into "
|
|
||||||
"the overlay. Enabling local ARP responder is not "
|
|
||||||
"fully compatible with the allowed-address-pairs "
|
|
||||||
"extension.")
|
|
||||||
),
|
|
||||||
]
|
|
||||||
|
|
||||||
bridge_opts = [
|
|
||||||
cfg.ListOpt('physical_interface_mappings',
|
|
||||||
default=DEFAULT_INTERFACE_MAPPINGS,
|
|
||||||
help=_("Comma-separated list of "
|
|
||||||
"<physical_network>:<physical_interface> tuples "
|
|
||||||
"mapping physical network names to the agent's "
|
|
||||||
"node-specific physical network interfaces to be used "
|
|
||||||
"for flat and VLAN networks. All physical networks "
|
|
||||||
"listed in network_vlan_ranges on the server should "
|
|
||||||
"have mappings to appropriate interfaces on each "
|
|
||||||
"agent.")),
|
|
||||||
cfg.ListOpt('bridge_mappings',
|
|
||||||
default=DEFAULT_BRIDGE_MAPPINGS,
|
|
||||||
help=_("List of <physical_network>:<physical_bridge>")),
|
|
||||||
]
|
|
||||||
|
|
||||||
qos_options = [
|
|
||||||
cfg.IntOpt('kernel_hz', default=DEFAULT_KERNEL_HZ_VALUE,
|
|
||||||
help=_("Value of host kernel tick rate (hz) for calculating "
|
|
||||||
"minimum burst value in bandwidth limit rules for "
|
|
||||||
"a port with QoS. See kernel configuration file for "
|
|
||||||
"HZ value and tc-tbf manual for more information.")),
|
|
||||||
cfg.IntOpt('tbf_latency', default=DEFAULT_TC_TBF_LATENCY,
|
|
||||||
help=_("Value of latency (ms) for calculating size of queue "
|
|
||||||
"for a port with QoS. See tc-tbf manual for more "
|
|
||||||
"information."))
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
cfg.CONF.register_opts(vxlan_opts, "VXLAN")
|
linuxbridge.register_linuxbridge_opts()
|
||||||
cfg.CONF.register_opts(bridge_opts, "LINUX_BRIDGE")
|
|
||||||
cfg.CONF.register_opts(qos_options, "QOS")
|
|
||||||
|
|
|
@ -28,8 +28,8 @@ from neutron.tests.fullstack.resources import environment
|
||||||
from neutron.tests.fullstack.resources import machine
|
from neutron.tests.fullstack.resources import machine
|
||||||
from neutron.tests.unit import testlib_api
|
from neutron.tests.unit import testlib_api
|
||||||
|
|
||||||
from neutron.plugins.ml2.drivers.linuxbridge.agent.common import \
|
from neutron.conf.plugins.ml2.drivers import linuxbridge as \
|
||||||
config as linuxbridge_agent_config
|
linuxbridge_agent_config
|
||||||
from neutron.plugins.ml2.drivers.linuxbridge.agent import \
|
from neutron.plugins.ml2.drivers.linuxbridge.agent import \
|
||||||
linuxbridge_neutron_agent as linuxbridge_agent
|
linuxbridge_neutron_agent as linuxbridge_agent
|
||||||
from neutron.plugins.ml2.drivers.openvswitch.mech_driver import \
|
from neutron.plugins.ml2.drivers.openvswitch.mech_driver import \
|
||||||
|
|
Loading…
Reference in New Issue