openstack/neutron
Code Issues Proposed changes

ml2: Use the base module to register common ml2 agent config

Browse Source 
The neutron.plugins.ml2.drivers.agent.config module registers options
commonly used by the ml2 agents but in fact it is used only by linux
bridge agent and macvtap agent.

This change makes all ml2 agents use that base module consistently in
individual config modules.

Change-Id: Ib3ec8a8eaf347721bb06f092a0887e62f3a6bffd
This commit is contained in:
Takashi Kajinami 2022-06-10 02:53:52 +09:00
parent f8673c0516
commit 17106dc6f5
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
View File

@ -13,6 +13,7 @@
# under the License. # under the License.
from neutron.conf.plugins.ml2.drivers import linuxbridge from neutron.conf.plugins.ml2.drivers import linuxbridge
from neutron.plugins.ml2.drivers.agent import config as cagt_config # noqa
linuxbridge.register_linuxbridge_opts() linuxbridge.register_linuxbridge_opts()

1
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -44,7 +44,6 @@ from neutron.conf.agent import common as agent_config
from neutron.conf import service as service_conf from neutron.conf import service as service_conf
from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb from neutron.plugins.ml2.drivers.agent import _agent_manager_base as amb
from neutron.plugins.ml2.drivers.agent import _common_agent as ca from neutron.plugins.ml2.drivers.agent import _common_agent as ca
from neutron.plugins.ml2.drivers.agent import config as cagt_config # noqa
from neutron.plugins.ml2.drivers.l2pop.rpc_manager \ from neutron.plugins.ml2.drivers.l2pop.rpc_manager \
import l2population_rpc as l2pop_rpc import l2population_rpc as l2pop_rpc
from neutron.plugins.ml2.drivers.linuxbridge.agent import arp_protect from neutron.plugins.ml2.drivers.linuxbridge.agent import arp_protect

7
neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
View File

@ -14,13 +14,10 @@
# limitations under the License. # limitations under the License.
from oslo_config import cfg
from neutron._i18n import _ from neutron._i18n import _
from neutron.conf.agent import common as config
from neutron.conf.plugins.ml2.drivers import agent
from neutron.conf.plugins.ml2.drivers.mech_sriov import agent_common as \ from neutron.conf.plugins.ml2.drivers.mech_sriov import agent_common as \
agent_common_config agent_common_config
from neutron.plugins.ml2.drivers.agent import config as cagt_config # noqa
def parse_exclude_devices(exclude_list): def parse_exclude_devices(exclude_list):
@ -55,6 +52,4 @@ def parse_exclude_devices(exclude_list):
return exclude_mapping return exclude_mapping
agent.register_agent_opts()
agent_common_config.register_agent_sriov_nic_opts() agent_common_config.register_agent_sriov_nic_opts()
config.register_agent_state_opts_helper(cfg.CONF)

8
neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
View File

@ -12,12 +12,8 @@
# 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.agent import common as config
from neutron.conf.plugins.ml2.drivers import agent
from neutron.conf.plugins.ml2.drivers import ovs_conf from neutron.conf.plugins.ml2.drivers import ovs_conf
from neutron.plugins.ml2.drivers.agent import config as cagt_config # noqa
agent.register_agent_opts()
ovs_conf.register_ovs_agent_opts() ovs_conf.register_ovs_agent_opts()
config.register_agent_state_opts_helper(cfg.CONF)