Merge "PLUMgrid plugin decomposition part II"

etc/neutron/plugins/plumgrid/plumgrid.ini

@@ -1,14 +0,0 @@
-# Config file for Neutron PLUMgrid Plugin
-
-[plumgriddirector]
-# This line should be pointing to the PLUMgrid Director,
-# for the PLUMgrid platform.
-# director_server=<director-ip-address>
-# director_server_port=<director-port>
-# Authentification parameters for the Director.
-# These are the admin credentials to manage and control
-# the PLUMgrid Director server.
-# username=<director-admin-username>
-# password=<director-admin-password>
-# servertimeout=5
-# driver=<plugin-driver>

neutron/plugins/plumgrid/README

@@ -1,14 +0,0 @@
-PLUMgrid Neutron Plugin
-========================
-
-PLUMgrid Neutron Plugin for PLUMgrid Open Networking Suite
-
-* Full plugin code is available at:
-  * https://github.com/stackforge/networking-plumgrid
-
-* PyPI package location:
-  * https://pypi.python.org/pypi/networking-plumgrid
-
-* For config, install and other details, please refer to
-  wiki page:
-  * http://wiki.openstack.org/PLUMgrid-Neutron

neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py

@@ -1,25 +0,0 @@
-# Copyright 2013 PLUMgrid, Inc. 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_plumgrid.neutron.plugins import plugin
-
-
-class NeutronPluginPLUMgridV2(plugin.NeutronPluginPLUMgridV2):
-
-    supported_extension_aliases = ["binding", "external-net", "extraroute",
-                                   "provider", "quotas", "router",
-                                   "security-group"]
-
-    def __init__(self):
-        super(NeutronPluginPLUMgridV2, self).__init__()

neutron/plugins/plumgrid/requirements.txt

@@ -1 +0,0 @@
-networking-plumgrid

setup.cfg

@@ -70,7 +70,6 @@ data_files =
     etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini
     etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini
     etc/neutron/plugins/oneconvergence = etc/neutron/plugins/oneconvergence/nvsdplugin.ini
-    etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
     etc/neutron/plugins/opencontrail = etc/neutron/plugins/opencontrail/contrailplugin.ini
     etc/neutron/plugins/ovsvapp = etc/neutron/plugins/ovsvapp/ovsvapp_agent.ini
 scripts =
@@ -112,7 +111,6 @@ neutron.core_plugins =
     ml2 = neutron.plugins.ml2.plugin:Ml2Plugin
     nuage = neutron.plugins.nuage.plugin:NuagePlugin
     oneconvergence = neutron.plugins.oneconvergence.plugin:OneConvergencePluginV2
-    plumgrid = neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin:NeutronPluginPLUMgridV2
 neutron.service_plugins =
     dummy = neutron.tests.unit.dummy_plugin:DummyServicePlugin
     router = neutron.services.l3_router.l3_router_plugin:L3RouterPlugin