From 97452d1e30e46f6b17c6c5c03535e2d8f56fb32d Mon Sep 17 00:00:00 2001 From: Fawad Khaliq Date: Mon, 10 Aug 2015 07:13:26 -0700 Subject: [PATCH] PLUMgrid plugin decomposition part II As part of the phase II plugin decomposition [1], this change moves PLUMgrid plugin to its new home: networking-plumgrid [2] [1] http://docs.openstack.org/developer/neutron/devref/contribute.html [2] https://github.com/openstack/networking-plumgrid Partial-Implements: blueprint core-vendor-decomposition Change-Id: Ifc6bbb4fe45ee9b8d298ff171ee43c0da37d075c Signed-off-by: Fawad Khaliq --- etc/neutron/plugins/plumgrid/plumgrid.ini | 14 ----------- neutron/plugins/plumgrid/README | 14 ----------- neutron/plugins/plumgrid/__init__.py | 0 .../plumgrid/plumgrid_plugin/__init__.py | 0 .../plumgrid_plugin/plumgrid_plugin.py | 25 ------------------- neutron/plugins/plumgrid/requirements.txt | 1 - setup.cfg | 2 -- 7 files changed, 56 deletions(-) delete mode 100644 etc/neutron/plugins/plumgrid/plumgrid.ini delete mode 100644 neutron/plugins/plumgrid/README delete mode 100644 neutron/plugins/plumgrid/__init__.py delete mode 100644 neutron/plugins/plumgrid/plumgrid_plugin/__init__.py delete mode 100644 neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py delete mode 100644 neutron/plugins/plumgrid/requirements.txt diff --git a/etc/neutron/plugins/plumgrid/plumgrid.ini b/etc/neutron/plugins/plumgrid/plumgrid.ini deleted file mode 100644 index bfe8062ae..000000000 --- a/etc/neutron/plugins/plumgrid/plumgrid.ini +++ /dev/null @@ -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_server_port= -# Authentification parameters for the Director. -# These are the admin credentials to manage and control -# the PLUMgrid Director server. -# username= -# password= -# servertimeout=5 -# driver= diff --git a/neutron/plugins/plumgrid/README b/neutron/plugins/plumgrid/README deleted file mode 100644 index 5fc4050e4..000000000 --- a/neutron/plugins/plumgrid/README +++ /dev/null @@ -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 diff --git a/neutron/plugins/plumgrid/__init__.py b/neutron/plugins/plumgrid/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/neutron/plugins/plumgrid/plumgrid_plugin/__init__.py b/neutron/plugins/plumgrid/plumgrid_plugin/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py b/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py deleted file mode 100644 index e69d6d653..000000000 --- a/neutron/plugins/plumgrid/plumgrid_plugin/plumgrid_plugin.py +++ /dev/null @@ -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__() diff --git a/neutron/plugins/plumgrid/requirements.txt b/neutron/plugins/plumgrid/requirements.txt deleted file mode 100644 index 9d9d8a09c..000000000 --- a/neutron/plugins/plumgrid/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -networking-plumgrid diff --git a/setup.cfg b/setup.cfg index 63ce1645c..de3d295e7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -73,7 +73,6 @@ data_files = etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.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 = @@ -118,7 +117,6 @@ neutron.core_plugins = nec = neutron.plugins.nec.nec_plugin:NECPluginV2 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 -- 2.45.2