]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Remove IBM SDN-VE left-overs
authorarmando-migliaccio <armamig@gmail.com>
Tue, 20 Oct 2015 17:59:08 +0000 (10:59 -0700)
committerHenry Gessau <gessau@cisco.com>
Tue, 20 Oct 2015 18:49:11 +0000 (14:49 -0400)
The project has been removed in I8def7fc2e92f967785b9ab05f8496de641e8f866
and it's been retired from stackforge [1]. So it's safe to remove it from
the list with the remaining bits.

[1] https://github.com/stackforge/networking-ibm/commit/f66ddfa0a1e8c2ab2931a87d84bd5a5feab2f540

Change-Id: Ic1bb021d91bbaaa01d0ac305c8060b3af9e2389b

doc/source/devref/sub_projects.rst
neutron/plugins/ml2/drivers/ibm/mechanism_sdnve.py [deleted file]
neutron/plugins/ml2/drivers/ibm/requirements.txt [deleted file]
neutron/services/l3_router/l3_sdnve.py [deleted file]
setup.cfg

index c2cbd5482d8c41f8498c44f0ec173ae6cf60a9e0..35455dbb09b6315f1c56a2bbca8cf88f16aa6f8c 100644 (file)
@@ -127,8 +127,6 @@ repo but are summarized here to describe the functionality they provide.
 +-------------------------------+-----------------------+
 | networking-hyperv_            |          ml2          |
 +-------------------------------+-----------------------+
-| networking-ibm_               |         ml2,l3        |
-+-------------------------------+-----------------------+
 | networking-l2gw_              |         l2            |
 +-------------------------------+-----------------------+
 | networking-midonet_           |        core,lb        |
@@ -289,14 +287,6 @@ Group Based Policy
 * Launchpad: https://launchpad.net/group-based-policy
 * PyPi: https://pypi.python.org/pypi/group-based-policy
 
-.. _networking-ibm:
-
-IBM SDNVE
-+++++++++
-
-* Git: https://git.openstack.org/cgit/stackforge/networking-ibm
-* Launchpad: https://launchpad.net/networking-ibm
-
 .. _kuryr:
 
 Kuryr
diff --git a/neutron/plugins/ml2/drivers/ibm/mechanism_sdnve.py b/neutron/plugins/ml2/drivers/ibm/mechanism_sdnve.py
deleted file mode 100644 (file)
index 5b322e6..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2015 IBM Corp.
-#
-# All Rights Reserved.
-#
-#    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.
-
-from networking_ibm.sdnve.ml2 import sdnve_driver
-from oslo_log import log as logging
-
-from neutron.common import constants as n_const
-from neutron.extensions import portbindings
-from neutron.plugins.ml2 import driver_api as api
-
-LOG = logging.getLogger(__name__)
-
-
-class SdnveMechanismDriver(api.MechanismDriver):
-    """Ml2 Mechanism driver for IBM SDNVE Controller"""
-    def initialize(self):
-        self.vif_type = portbindings.VIF_TYPE_BRIDGE
-        self.vif_details = {portbindings.CAP_PORT_FILTER: False}
-        self.restrict_update_subnet = ['enable_dhcp',
-                                       'gateway_ip',
-                                       'allocation-pool']
-        self.restrict_update_network = ['router:external']
-        self.sdnve_drv = sdnve_driver.SdnveDriver()
-
-    # NETWORK
-    def create_network_precommit(self, context):
-        self.sdnve_drv._pre_create_network(context)
-
-    def create_network_postcommit(self, context):
-        self.sdnve_drv._create_network(context)
-
-    def update_network_precommit(self, context):
-        self.sdnve_drv._pre_update_network(context)
-
-    def update_network_postcommit(self, context):
-        self.sdnve_drv._update_network(context)
-
-    def delete_network_postcommit(self, context):
-        self.sdnve_drv._delete_network(context)
-
-    # SUBNET
-    def create_subnet_precommit(self, context):
-        self.sdnve_drv._pre_create_subnet(context)
-
-    def create_subnet_postcommit(self, context):
-        self.sdnve_drv._create_subnet(context)
-
-    def update_subnet_postcommit(self, context):
-        self.sdnve_drv._update_subnet(context)
-
-    def update_subnet_precommit(self, context):
-        self.sdnve_drv._pre_update_subnet(context)
-
-    def delete_subnet_postcommit(self, context):
-        self.sdnve_drv._delete_subnet(context)
-
-    # PORT
-    def create_port_postcommit(self, context):
-        self.sdnve_drv._create_port(context)
-
-    def create_port_precommit(self, context):
-        self.sdnve_drv._pre_create_port(context)
-
-    def delete_port_precommit(self, context):
-        self.sdnve_drv._pre_delete_port(context)
-
-    def update_port_postcommit(self, context):
-        self.sdnve_drv._update_port(context)
-
-    def delete_port_postcommit(self, context):
-        self.sdnve_drv._delete_port(context)
-
-    def bind_port(self, context):
-        LOG.debug("Attempting to bind port %(port)s on "
-                  "network %(network)s",
-                  {'port': context.current['id'],
-                   'network': context.network.current['id']})
-        for segment in context.network.network_segments:
-            if self.sdnve_drv._check_segment(segment):
-                context.set_binding(segment[api.ID],
-                                    self.vif_type,
-                                    self.vif_details,
-                                    status=n_const.PORT_STATUS_ACTIVE)
-                LOG.debug("Bound using segment: %s", segment)
-                return
-            else:
-                LOG.debug("Refusing to bind port for segment ID %(id)s, "
-                          "segment %(seg)s, phys net %(physnet)s, and "
-                          "network type %(nettype)s",
-                          {'id': segment[api.ID],
-                           'seg': segment[api.SEGMENTATION_ID],
-                           'physnet': segment[api.PHYSICAL_NETWORK],
-                           'nettype': segment[api.NETWORK_TYPE]})
diff --git a/neutron/plugins/ml2/drivers/ibm/requirements.txt b/neutron/plugins/ml2/drivers/ibm/requirements.txt
deleted file mode 100644 (file)
index 4d5b188..0000000
+++ /dev/null
@@ -1 +0,0 @@
-networking-ibm
diff --git a/neutron/services/l3_router/l3_sdnve.py b/neutron/services/l3_router/l3_sdnve.py
deleted file mode 100644 (file)
index 6db745e..0000000
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 2015 IBM Corp.
-#
-# All Rights Reserved.
-#
-#    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.
-
-from networking_ibm.sdnve.common import exceptions as sdnve_exc
-from networking_ibm.sdnve.l3plugin import sdnve_l3driver
-from oslo_log import log as logging
-from oslo_utils import excutils
-
-from neutron.common import constants as n_const
-from neutron.common import exceptions as n_exc
-from neutron.db import db_base_plugin_v2
-from neutron.db import extraroute_db
-from neutron.db import l3_gwmode_db
-from neutron.i18n import _LE
-from neutron.plugins.common import constants as l3_constants
-
-
-LOG = logging.getLogger(__name__)
-
-
-class SdnveL3ServicePlugin(db_base_plugin_v2.NeutronDbPluginV2,
-                   extraroute_db.ExtraRoute_db_mixin,
-                   l3_gwmode_db.L3_NAT_db_mixin):
-
-    supported_extension_aliases = ["router", "ext-gw-mode",
-                                   "extraroute"]
-
-    def __init__(self):
-        self.driver = sdnve_l3driver.SdnveL3Driver()
-
-    def get_plugin_type(self):
-        return l3_constants.L3_ROUTER_NAT
-
-    def get_plugin_description(self):
-        """Returns string description of the plugin."""
-        return ("SDNVE Service plugin")
-
-    def create_router(self, context, router):
-        if router['router']['admin_state_up'] is False:
-            router['router']['admin_state_up'] = True
-        with context.session.begin(subtransactions=True):
-            new_router = super(SdnveL3ServicePlugin, self).create_router(
-                context, router)
-        try:
-            self.driver.create_router(context, new_router)
-            return new_router
-        except Exception as e:
-            with excutils.save_and_reraise_exception():
-                LOG.error(_LE("Create router failed in SDN-VE with error %s"),
-                          e)
-                super(SdnveL3ServicePlugin, self).delete_router(
-                    context, new_router['id'])
-
-    def update_router(self, context, id, router):
-        if not router['router'].get('admin_state_up', True):
-            raise n_exc.NotImplementedError(_('admin_state_up=False '
-                                              'routers are not '
-                                              'supported.'))
-        original_router = {}
-        updated_router = {}
-        with context.session.begin(subtransactions=True):
-            original_router = super(SdnveL3ServicePlugin, self).get_router(
-                context, id)
-            updated_router = super(SdnveL3ServicePlugin, self).update_router(
-                context, id, router)
-        try:
-            self.driver.update_router(context, id, original_router, router)
-            return updated_router
-        except Exception as e:
-            LOG.error(_LE("Update router failed in SDN-VE with error %s"),
-                      e)
-
-    def delete_router(self, context, id):
-        with context.session.begin(subtransactions=True):
-            super(SdnveL3ServicePlugin, self).delete_router(context, id)
-        try:
-            self.driver.delete_router(context, id)
-        except Exception as e:
-            LOG.error(_LE("Delete router operation failed in SDN-VE after "
-                          "deleting the router in DB: %s"), e)
-
-    def add_router_interface(self, context, router_id, interface_info):
-        new_interface = super(SdnveL3ServicePlugin, self).add_router_interface(
-            context, router_id, interface_info)
-        request_info = interface_info.copy()
-        request_info['port_id'] = new_interface['port_id']
-        if 'subnet_id' not in interface_info:
-            request_info['subnet_id'] = new_interface['subnet_id']
-        try:
-            self.driver.add_router_interface(context, router_id, request_info)
-            return new_interface
-        except Exception as e:
-            with excutils.save_and_reraise_exception():
-                LOG.error(_LE("Update router-add-interface failed in SDN-VE "
-                              "with error %s"), e)
-                super(SdnveL3ServicePlugin, self).remove_router_interface(
-                    context, router_id, interface_info)
-
-    def _add_router_interface_only(self, context, router_id, interface_info):
-        if interface_info.get('port_id'):
-            try:
-                self.driver._add_router_interface_only(context,
-                                                       router_id,
-                                                       interface_info)
-            except Exception as e:
-                LOG.error(_LE("Add interface in the rollback of a "
-                              "remove_router_interface operation failed %s"),
-                          e)
-
-    def remove_router_interface(self, context, router_id, interface_info):
-        subnet_id = interface_info.get('subnet_id')
-        if not subnet_id:
-            portid = interface_info.get('port_id')
-            if not portid:
-                raise sdnve_exc.BadInputException(msg=_('No port ID'))
-
-            myport = super(SdnveL3ServicePlugin, self).\
-                get_port(context, portid)
-            myfixed_ips = myport.get('fixed_ips')
-            if not myfixed_ips:
-                raise sdnve_exc.BadInputException(msg=_('No fixed IP'))
-            subnet_id = myfixed_ips[0].get('subnet_id')
-            if subnet_id:
-                interface_info['subnet_id'] = subnet_id
-        else:
-            portid = interface_info.get('port_id')
-            if not portid:
-                subnet = super(SdnveL3ServicePlugin, self).\
-                    get_subnet(context, subnet_id)
-                device_filter = {'device_id': [router_id],
-                    'device_owner': [n_const.DEVICE_OWNER_ROUTER_INTF],
-                    'network_id': [subnet['network_id']]}
-                ports = super(SdnveL3ServicePlugin, self).get_ports(context,
-                                                   filters=device_filter)
-                if ports:
-                    portid = ports[0]['id']
-                    interface_info['port_id'] = portid
-        with context.session.begin(subtransactions=True):
-            info = super(SdnveL3ServicePlugin, self).remove_router_interface(
-                        context, router_id, interface_info)
-        try:
-            self.driver.remove_router_interface(context,
-                                                router_id,
-                                                interface_info)
-            return info
-        except Exception as e:
-            with excutils.save_and_reraise_exception():
-                LOG.error(_LE("Update router-remove-interface"
-                          " failed : %s"), e)
-                self._add_router_interface_only(context,
-                                                router_id, interface_info)
-
-    def create_floatingip(self, context, floatingip):
-        with context.session.begin(subtransactions=True):
-            new_floatingip = super(SdnveL3ServicePlugin,
-                self).create_floatingip(context, floatingip)
-        try:
-            self.driver.create_floatingip(context, new_floatingip)
-            return new_floatingip
-        except Exception as e:
-            with excutils.save_and_reraise_exception():
-                LOG.error(_LE("Create floating ip failed with error %s"), e)
-                super(SdnveL3ServicePlugin, self).delete_floatingip(
-                    context, new_floatingip['id'])
-
-    def update_floatingip(self, context, id, floatingip):
-        with context.session.begin(subtransactions=True):
-            original_floatingip = super(
-                SdnveL3ServicePlugin, self).get_floatingip(context, id)
-            updated_floatingip = super(
-                SdnveL3ServicePlugin, self).update_floatingip(
-                    context, id, floatingip)
-        try:
-            self.driver.update_floatingip(context,
-                                          id,
-                                          original_floatingip,
-                                          floatingip)
-            return updated_floatingip
-        except Exception as e:
-            with excutils.save_and_reraise_exception():
-                LOG.error(_LE("Update floating ip failed with error %s"), e)
-                super(SdnveL3ServicePlugin, self).update_floatingip(
-                    context, id, {'floatingip': original_floatingip})
-
-    def delete_floatingip(self, context, id):
-        super(SdnveL3ServicePlugin, self).delete_floatingip(context, id)
-        try:
-            self.driver.delete_floatingip(context, id)
-        except Exception as e:
-            LOG.error(_LE("Delete floatingip failed in SDN-VE: %s"), e)
index dd3f3b6c29a82e39ecb43800375615abb7a35ab4..2355cbd2170b3ac66d45c27b697037f7db80adf5 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -119,7 +119,6 @@ neutron.service_plugins =
     neutron.services.firewall.fwaas_plugin.FirewallPlugin = neutron_fwaas.services.firewall.fwaas_plugin:FirewallPlugin
     neutron.services.loadbalancer.plugin.LoadBalancerPlugin = neutron_lbaas.services.loadbalancer.plugin:LoadBalancerPlugin
     neutron.services.vpn.plugin.VPNDriverPlugin = neutron_vpnaas.services.vpn.plugin:VPNDriverPlugin
-    ibm_l3 = neutron.services.l3_router.l3_sdnve:SdnveL3ServicePlugin
     qos = neutron.services.qos.qos_plugin:QoSPlugin
 neutron.qos.notification_drivers =
     message_queue = neutron.services.qos.notification_drivers.message_queue:RpcQosServiceNotificationDriver
@@ -146,7 +145,6 @@ neutron.ml2.mechanism_drivers =
     fslsdn = neutron.plugins.ml2.drivers.freescale.mechanism_fslsdn:FslsdnMechanismDriver
     sriovnicswitch = neutron.plugins.ml2.drivers.mech_sriov.mech_driver.mech_driver:SriovNicSwitchMechanismDriver
     fake_agent = neutron.tests.unit.plugins.ml2.drivers.mech_fake_agent:FakeAgentMechanismDriver
-    sdnve = neutron.plugins.ml2.drivers.ibm.mechanism_sdnve:SdnveMechanismDriver
 neutron.ml2.extension_drivers =
     test = neutron.tests.unit.plugins.ml2.drivers.ext_test:TestExtensionDriver
     testdb = neutron.tests.unit.plugins.ml2.drivers.ext_test:TestDBExtensionDriver