Revert MLX plugin changes in Liberty branch

Changes for Mitaka were merged to master before
Liberty branch was created.  So, reverting those
changes in the Liberty branch so MLX plugin works
in the stable Liberty branch.

Change-Id: I6b679449ab65d811b0e1499e0307e6e6ac8f48c3
changes/61/298961/1
Angela Smith 7 years ago
parent 9d3c974cbb
commit 3a4c8810c1
  1. 1
      .gitreview
  2. 20
      devstack/plugin.sh
  3. 19
      etc/neutron/plugins/brocade/brocade_mlx.ini
  4. 33
      etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini
  5. 44
      networking_brocade/_i18n.py
  6. 48
      networking_brocade/mlx/ml2/fi_ni/brcd_config.py
  7. 4
      networking_brocade/mlx/ml2/fi_ni/mechanism_brocade_fi_ni.py
  8. 4
      networking_brocade/mlx/services/l3_router/brocade/l3_router_plugin.py
  9. 14
      requirements.txt
  10. 12
      setup.cfg

@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/networking-brocade.git
defaultbranch=stable/liberty

@ -1,20 +0,0 @@
#!/usr/bin/env bash
DIR_BRCD=$DEST/networking-brocade
if is_service_enabled net-brcd; then
if [[ "$1" == "source" ]]; then
:
fi
if [[ "$1" == "stack" && "$2" == "install" ]]; then
cd $DIR_BRCD
echo "Installing networking-brocade"
setup_develop $DIR_BRCD
fi
if [[ "$1" == "clean" ]]; then
:
fi
fi

@ -1,19 +0,0 @@
[l3_brocade_mlx]
# switch_names = Comma separated list of names of MLX switches to be configured
# Example:
# switch_names = mlx
[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
# physical_networks = Allowed physical networks for VLAN configuration
# ports = Comma separated list of ports on the switch which needs to be tagged to VLAN
#
# Example:
# [mlx]
# address = 10.24.20.21
# username = admin
# password = password
# physical_networks = physnet1
# ports = 3/3, 3/9

@ -1,33 +0,0 @@
[ml2_brocade_fi_ni]
# switch_names = Comma separated names of switch to be configured
# Example:
# switch_names = icx-1, icx-2
[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
# physical_networks = Allowed physical networks
# ports = Ports on the switch which needs to tagged to VLAN. Multiple ports can be separated by a comma.
# transport = Protocol to use for device connection(SSH or Telnet). Default is SSH. This is an optional parameter
# ostype = Optional parameter, which will identify the firmware version(FI/NI)
#
# Example:
# [icx-1]
# address = 10.24.20.22
# username = admin
# password = password
# physical_networks = physnet1
# ports = 1/1/1, 1/1/2
# transport = SSH
# ostype = FI
# Example:
# [mlx]
# address = 10.24.20.21
# username = admin
# password = password
# physical_networks = physnet1
# ports = 3/3, 3/9
# transport = SSH
# ostype = NI

@ -1,44 +0,0 @@
# Copyright 2016 Brocade Communications
#
# 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.
import oslo_i18n
DOMAIN = "networking-brocade"
_translators = oslo_i18n.TranslatorFactory(domain=DOMAIN)
# The primary translation function using the well-known name "_"
_ = _translators.primary
# The contextual translation function using the name "_C"
# requires oslo.i18n >=2.1.0
_C = _translators.contextual_form
# The plural translation function using the name "_P"
# requires oslo.i18n >=2.1.0
_P = _translators.plural_form
# Translators for log levels.
#
# The abbreviated names are meant to reflect the usual use of a short
# name like '_'. The "L" is for "log" and the other letter comes from
# the level.
_LI = _translators.log_info
_LW = _translators.log_warning
_LE = _translators.log_error
_LC = _translators.log_critical
def get_available_languages():
return oslo_i18n.get_available_languages(DOMAIN)

@ -20,50 +20,6 @@ Parses the brocade ethernet configuration template
from oslo_config import cfg
SWITCHES = [
cfg.StrOpt(
'switch_names',
default='',
help=('Switches connected to the compute nodes'))]
ML2_BROCADE = [cfg.StrOpt('address', default='',
help=('The IP address of the MLX or ICX switch')),
cfg.StrOpt('username', default='admin',
help=('The SSH username of the switch')),
cfg.StrOpt('password', default='password', secret=True,
help=('The SSH password of the switch')),
cfg.StrOpt('physical_networks', default='',
help=('Allowed physical networks where VLAN can '
'be configured on this switch')),
cfg.StrOpt('ports', default='',
help=('Ports to be tagged in the VLAN being '
'configured on the switch')),
cfg.StrOpt('transport', default='SSH',
choices=('SSH', 'TELNET'),
help=('Protocol used to communicate with switch')),
cfg.StrOpt('ostype', default='NI', choices=('NI', 'FI'),
help=('OS type of the device. NI is NetIron '
'for MLX switches. FI is FastIron for '
'ICX switches.')),
]
L3_BROCADE = [cfg.StrOpt('address', default='',
help=('The IP address of the MLX switch')),
cfg.StrOpt('username', default='admin',
help=('The SSH username of the switch')),
cfg.StrOpt('password', default='password', secret=True,
help=('The SSH password of the switch')),
cfg.StrOpt('physical_networks', default='',
help=('Allowed physical networks where VLAN can '
'be configured on this switch')),
cfg.StrOpt('ports', default='',
help=('Ports to be tagged in the VLAN being '
'configured on the switch')),
]
cfg.CONF.register_opts(SWITCHES, 'ml2_brocade_fi_ni')
cfg.CONF.register_opts(SWITCHES, 'l3_brocade_mlx')
cfg.CONF.register_opts(ML2_BROCADE, 'ML2_BROCADE_MLX_EXAMPLE')
cfg.CONF.register_opts(L3_BROCADE, 'L3_BROCADE_MLX_EXAMPLE')
class ML2BrocadeConfig(object):
@ -96,10 +52,6 @@ class ML2BrocadeConfig(object):
for switch in switches:
switch_info = {}
switch = switch.strip()
if isL2:
cfg.CONF.register_opts(ML2_BROCADE, switch)
else:
cfg.CONF.register_opts(L3_BROCADE, switch)
for key, value in cfg.CONF._get(switch).items():
value = value.strip()
switch_info.update({key: value})

@ -16,8 +16,8 @@
"""Implementation of Brocade ML2 Mechanism driver for ICX and MLX."""
from networking_brocade._i18n import _LE
from networking_brocade._i18n import _LI
from neutron.i18n import _LE
from neutron.i18n import _LI
from neutron.plugins.ml2.common import exceptions as ml2_exc
from neutron.plugins.ml2 import driver_api
from oslo_log import log as logging

@ -17,8 +17,8 @@
"""Implementation of Brocade L3RouterPlugin for NI devices."""
from networking_brocade._i18n import _LE
from networking_brocade._i18n import _LI
from neutron.i18n import _LE
from neutron.i18n import _LI
from neutron.plugins.ml2.driver_context import NetworkContext
from neutron.services.l3_router import l3_router_plugin as router
from oslo_log import log as logging

@ -3,14 +3,14 @@
# process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0
eventlet!=0.18.3,>=0.18.2 # MIT
eventlet>=0.17.4 # MIT
httplib2>=0.7.5 # MIT
netaddr!=0.7.16,>=0.7.12 #BSD
SQLAlchemy<1.1.0,>=1.0.10 # MIT
SQLAlchemy<1.1.0,>=0.9.9 # MIT
alembic>=0.8.0 # MIT
six>=1.9.0 # MIT
oslo.config>=3.7.0 # Apache-2.0
oslo.db>=4.1.0 # Apache-2.0
oslo.messaging>=4.0.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0
oslo.config>=2.3.0 # Apache-2.0
oslo.db>=2.4.1 # Apache-2.0
oslo.messaging!=1.17.0,!=1.17.1,!=2.6.0,!=2.6.1,!=2.7.0,!=2.8.0,!=2.8.1,!=2.9.0,!=3.1.0,>=1.16.0
oslo.serialization>=1.4.0 # Apache-2.0
oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0

@ -26,18 +26,6 @@ version = 2015.1.1
[files]
packages =
networking_brocade
data_files =
etc/neutron =
etc/neutron/plugins/ml2/ml2_conf_brocade_fi_ni.ini
etc/neutron/plugins/brocade/brocade_mlx.ini
[entry_points]
neutron.ml2.mechanism_drivers =
brocade_fi_ni = networking_brocade.mlx.ml2.fi_ni.mechanism_brocade_fi_ni:BrocadeFiNiMechanism
# Service Plugins
neutron.service_plugins =
brocade_mlx_l3 = networking_brocade.mlx.services.l3_router.brocade.l3_router_plugin.BrocadeRouterPlugin
[build_sphinx]
source-dir = doc/source

Loading…
Cancel
Save