openstack/neutron
Code Issues Proposed changes

openflow_processed_per_port should be ovs-agent only

Browse Source 
"conf/agent/ovs_conf.py" has some common options for ovs agent and
L3/dhcp/metadata agent [1] to handle records on ovsdb, mostly for ovsdb
related action only when the interface driver is 'openvswitch' [2][3].
The options of "conf/plugins/ml2/drivers/ovs_conf.py" are mainly
for ovs-agent. The "openflow_processed_per_port" is in
wrong place, because L3/DHCP/metadata agent will never try to
"install flows per port".

The option ``openflow_processed_per_port`` is still in [OVS] section
for openvswitch agent.

[1] https://github.com/openstack/neutron/blob/master/neutron/opts.py#L209
[2] https://codesearch.openstack.org/?q=from%20neutron.conf.agent%20import%20ovs_conf&i=nope&literal=nope&files=&excludeFiles=&repos=
[3] https://codesearch.openstack.org/?q=ovs_conf.register_ovs_agent_opts&i=nope&literal=nope&files=&excludeFiles=&repos=

Change-Id: I43756c81ba3eede2ff8b1f4c6ead4c9426d78f90
This commit is contained in:
LIU Yulong 2022-06-01 08:36:33 +08:00 committed by liuyulong
parent ae66417cee
commit 62d3f91f92
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/conf/agent/ovs_conf.py
View File

@ -44,15 +44,6 @@ OPTS = [
'unregistered multicast packets to all ports. ' 'unregistered multicast packets to all ports. '
'The switch will send unregistered multicast packets ' 'The switch will send unregistered multicast packets '
'only to ports connected to multicast routers.')), 'only to ports connected to multicast routers.')),
cfg.BoolOpt('openflow_processed_per_port',
default=False,
help=_('If enabled, all OpenFlow rules associated to a port '
'are processed at once, in one single transaction. '
'That avoids possible inconsistencies during OVS agent '
'restart and port updates. '
'If disabled, the flows will be processed in batches '
'of ``_constants.AGENT_RES_PROCESSING_STEP`` number of '
'OpenFlow rules.')),
] ]

9
neutron/conf/plugins/ml2/drivers/ovs_conf.py
View File

@ -171,6 +171,15 @@ ovs_opts = [
help=_("The inactivity_probe interval in seconds for the local " help=_("The inactivity_probe interval in seconds for the local "
"switch connection to the controller. " "switch connection to the controller. "
"A value of 0 disables inactivity probes.")), "A value of 0 disables inactivity probes.")),
cfg.BoolOpt('openflow_processed_per_port',
default=False,
help=_('If enabled, all OpenFlow rules associated to a port '
'are processed at once, in one single transaction. '
'That avoids possible inconsistencies during OVS agent '
'restart and port updates. '
'If disabled, the flows will be processed in batches '
'of ``_constants.AGENT_RES_PROCESSING_STEP`` number of '
'OpenFlow rules.')),
] ]
agent_opts = [ agent_opts = [