From 1e91b6392ef73498a8873dbe30287ee8c2d6dbe3 Mon Sep 17 00:00:00 2001 From: Anindita Das Date: Mon, 8 Aug 2016 19:57:25 +0000 Subject: [PATCH] Refactoring config options for plugin l2pop opts Refactoring neutron ml2 plugin l2pop driver config opts to be in neutron/conf/plugins/ml2/drivers/l2pop so that all the configuration options for l2pop drivers reside in a centralized location. This simplifies the process of looking up the l2pop driver config opts and provides an easy way to import. Change-Id: Ia06c0c31ef40c691d67cfc5d514fdff907f5dca4 Partial-Bug: #1563069 --- .../l2pop/config.py => conf/plugins/ml2/drivers/l2pop.py} | 4 +++- neutron/plugins/ml2/drivers/l2pop/mech_driver.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) rename neutron/{plugins/ml2/drivers/l2pop/config.py => conf/plugins/ml2/drivers/l2pop.py} (89%) diff --git a/neutron/plugins/ml2/drivers/l2pop/config.py b/neutron/conf/plugins/ml2/drivers/l2pop.py similarity index 89% rename from neutron/plugins/ml2/drivers/l2pop/config.py rename to neutron/conf/plugins/ml2/drivers/l2pop.py index d8d685d24e9..a8b6f23ec3d 100644 --- a/neutron/plugins/ml2/drivers/l2pop/config.py +++ b/neutron/conf/plugins/ml2/drivers/l2pop.py @@ -24,4 +24,6 @@ l2_population_options = [ 'existing ports whent it restarts')), ] -cfg.CONF.register_opts(l2_population_options, "l2pop") + +def register_l2_population_opts(cfg=cfg.CONF): + cfg.register_opts(l2_population_options, "l2pop") diff --git a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py index cce40a4fe7a..1a65390ec8f 100644 --- a/neutron/plugins/ml2/drivers/l2pop/mech_driver.py +++ b/neutron/plugins/ml2/drivers/l2pop/mech_driver.py @@ -19,18 +19,20 @@ from oslo_config import cfg from oslo_log import log as logging from neutron._i18n import _, _LW +from neutron.conf.plugins.ml2.drivers import l2pop as config from neutron import context as n_context from neutron.db import api as db_api from neutron.db import l3_hamode_db from neutron import manager from neutron.plugins.common import constants as service_constants from neutron.plugins.ml2 import driver_api as api -from neutron.plugins.ml2.drivers.l2pop import config # noqa from neutron.plugins.ml2.drivers.l2pop import db as l2pop_db from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc LOG = logging.getLogger(__name__) +config.register_l2_population_opts() + class L2populationMechanismDriver(api.MechanismDriver):