Add block name to switch config options for MLX plug-ins.

In the INI files, the switch_names option uses a dynamic
value to determine the block names for the switch options.
In order to create proper config option reference docs,
there needs to be an example block name for the switch
options.

Change-Id: Ic5bf6de02ba1b7d1bc90ee29a5a0570fb45b9956
Closes-Bug: #1442357

diff --git a/etc/neutron/plugins/brocade/brocade_mlx.ini b/etc/neutron/plugins/brocade/brocade_mlx.ini
index 54d54142276bd602546648bf5162218130fdae1a..3e1e3387fd22b6f70f61992e9fac5960109b627c 100644 (file)
--- a/etc/neutron/plugins/brocade/brocade_mlx.ini
+++ b/etc/neutron/plugins/brocade/brocade_mlx.ini
@@ -3,7 +3,7 @@
 # Example:
 # switch_names = mlx
 
-# [EXAMPLE_SWITCH]
+[L3_BROCADE_MLX_EXAMPLE]
 # address  = The IP address of the MLX switch
 # username = The SSH username to use to connect to device
 # password = The SSH password to use to connect to device

diff --git a/etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini b/etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini
index 887ccf5abb3e5210e4cf30989c7549d4bce4138e..b37fa43fce1958b55cc6aa837e1d5e5eedcee1f8 100644 (file)
--- a/etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini
+++ b/etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini
@@ -3,7 +3,7 @@
 # Example:
 # switch_names = icx-1, icx-2
 
-# [switch-name-1]
+[ML2_BROCADE_MLX_EXAMPLE]
 # address  = The address of the host to SSH to
 # username = The username to use to connect to device
 # password = The password to use to connect to device

diff --git a/neutron/plugins/ml2/drivers/brocade/fi_ni/mechanism_brocade_fi_ni.py b/neutron/plugins/ml2/drivers/brocade/fi_ni/mechanism_brocade_fi_ni.py
index d8c7dc4d71c05f3d2bd77950d81600af80667450..433319204f19c77003cb5bd62b90be3bb1803248 100644 (file)
--- a/neutron/plugins/ml2/drivers/brocade/fi_ni/mechanism_brocade_fi_ni.py
+++ b/neutron/plugins/ml2/drivers/brocade/fi_ni/mechanism_brocade_fi_ni.py
@@ -41,10 +41,10 @@ ML2_BROCADE = [cfg.StrOpt('address', default='',
                           help=('OS type of the device.')),
                ]
 cfg.CONF.register_opts(SWITCHES, 'ml2_brocade_fi_ni')
+cfg.CONF.register_opts(ML2_BROCADE, 'ML2_BROCADE_MLX_EXAMPLE')
 
 
 class BrocadeFiNiMechanism(mechanism_brocade_fi_ni.BrocadeFiNiMechanism):
-
     def __init__(self):
         self._switch_names = cfg.CONF.ml2_brocade_fi_ni.switch_names
         switches = [x.strip() for x in self._switch_names.split(',')]

diff --git a/neutron/services/l3_router/brocade/mlx/l3_router_plugin.py b/neutron/services/l3_router/brocade/mlx/l3_router_plugin.py
index 87f1e59c29f5ed126d24674c2b4d38f30a25e489..85e5d2d3b92999e22d15e5f27d74c89fda59d7dc 100644 (file)
--- a/neutron/services/l3_router/brocade/mlx/l3_router_plugin.py
+++ b/neutron/services/l3_router/brocade/mlx/l3_router_plugin.py
@@ -39,6 +39,7 @@ L3_BROCADE = [cfg.StrOpt('address', default='',
                                'configured on the switch')),
               ]
 cfg.CONF.register_opts(SWITCHES, 'l3_brocade_mlx')
+cfg.CONF.register_opts(L3_BROCADE, 'L3_BROCADE_MLX_EXAMPLE')
 
 
 class BrocadeRouterPlugin(plugin.BrocadeRouterPlugin):