Decomposition phase2 for MidoNet plugin

Remove the rest of MidoNet plugin from Neutron tree.

Closes-Bug: #1490852

Change-Id: I260ec3e19c74928390c8e5e4e32629357c184361

diff --git a/etc/neutron/plugins/midonet/midonet.ini b/etc/neutron/plugins/midonet/midonet.ini
deleted file mode 100644 (file)
index a9e51a6..0000000
--- a/etc/neutron/plugins/midonet/midonet.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[midonet]
-# MidoNet API server URI
-# midonet_uri = http://localhost:8080/midonet-api
-
-# MidoNet admin username
-# username = admin
-
-# MidoNet admin password
-# password = passw0rd
-
-# ID of the project that MidoNet admin user belongs to
-# project_id = 77777777-7777-7777-7777-777777777777

diff --git a/neutron/plugins/midonet/__init__.py b/neutron/plugins/midonet/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/neutron/plugins/midonet/plugin.py b/neutron/plugins/midonet/plugin.py
deleted file mode 100644 (file)
index ad88866..0000000
--- a/neutron/plugins/midonet/plugin.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2012 Midokura Japan K.K.
-# Copyright (C) 2013 Midokura PTE LTD
-# 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 oslo_config import cfg
-
-from midonet.neutron import plugin
-
-midonet_opts = [
-    cfg.StrOpt('midonet_uri', default='http://localhost:8080/midonet-api',
-               help=_('MidoNet API server URI.')),
-    cfg.StrOpt('username', default='admin',
-               help=_('MidoNet admin username.')),
-    cfg.StrOpt('password', default='passw0rd',
-               secret=True,
-               help=_('MidoNet admin password.')),
-    cfg.StrOpt('project_id',
-               default='77777777-7777-7777-7777-777777777777',
-               help=_('ID of the project that MidoNet admin user '
-                      'belongs to.'))
-]
-
-
-cfg.CONF.register_opts(midonet_opts, "MIDONET")
-
-
-# Derives from `object` (via at least NeutronDbPluginV2), but pylint
-# can't see that without having the midonet libraries available.
-# pylint: disable=super-on-old-class
-class MidonetPluginV2(plugin.MidonetMixin):
-
-    vendor_extensions = plugin.MidonetMixin.supported_extension_aliases
-    supported_extension_aliases = ['external-net', 'router', 'security-group',
-                                   'agent', 'dhcp_agent_scheduler', 'binding',
-                                   'quotas'] + vendor_extensions
-
-    __native_bulk_support = True
-
-    def __init__(self):
-        super(MidonetPluginV2, self).__init__()

diff --git a/neutron/plugins/midonet/requirements.txt b/neutron/plugins/midonet/requirements.txt
deleted file mode 100644 (file)
index 6629c74..0000000
--- a/neutron/plugins/midonet/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-networking-midonet

diff --git a/setup.cfg b/setup.cfg
index 5f3de4db123ca61bdd6a282800aadde2c4a9cfd1..b0a47339efa8718ef8e60d01c9bdcdf728e4a652 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,7 +56,6 @@ data_files =
         etc/neutron/plugins/cisco/cisco_router_plugin.ini
         etc/neutron/plugins/cisco/cisco_vpn_agent.ini
     etc/neutron/plugins/embrane = etc/neutron/plugins/embrane/heleos_conf.ini
-    etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini
     etc/neutron/plugins/ml2 =
         etc/neutron/plugins/bigswitch/restproxy.ini
         etc/neutron/plugins/ml2/linuxbridge_agent.ini
@@ -107,7 +106,6 @@ neutron.core_plugins =
     brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2
     cisco = neutron.plugins.cisco.network_plugin:PluginV2
     embrane = neutron.plugins.embrane.plugins.embrane_ml2_plugin:EmbraneMl2Plugin
-    midonet = neutron.plugins.midonet.plugin:MidonetPluginV2
     ml2 = neutron.plugins.ml2.plugin:Ml2Plugin
     nuage = neutron.plugins.nuage.plugin:NuagePlugin
     oneconvergence = neutron.plugins.oneconvergence.plugin:OneConvergencePluginV2