From ee78b063c7652d52be81fcc8eb41dbf24d459ecc Mon Sep 17 00:00:00 2001 From: fumihiko kakuma Date: Wed, 9 Dec 2015 13:00:39 +0900 Subject: [PATCH] Decompose OFAgent mechanism driver from neutron tree completely All 3rd-party code is required to be removed from the neutron tree. This change removes definition for ofagent mechanism driver from neutron repository. Change-Id: Ia21387eeaed71f38822356e22e4adbd237c1e64c Closes-Bug: #1524164 Depends-On: I04c741daf12e7628e2c1e2d1b81b2b2ce1310542 --- .../neutron/plugins/ml2/.placeholder | 0 etc/neutron/plugins/ml2/ml2_conf_ofa.ini | 13 ------------- neutron/plugins/ml2/drivers/ofagent/driver.py | 19 ------------------- setup.cfg | 3 --- 4 files changed, 35 deletions(-) rename neutron/plugins/ml2/drivers/ofagent/__init__.py => etc/neutron/plugins/ml2/.placeholder (100%) delete mode 100644 etc/neutron/plugins/ml2/ml2_conf_ofa.ini delete mode 100644 neutron/plugins/ml2/drivers/ofagent/driver.py diff --git a/neutron/plugins/ml2/drivers/ofagent/__init__.py b/etc/neutron/plugins/ml2/.placeholder similarity index 100% rename from neutron/plugins/ml2/drivers/ofagent/__init__.py rename to etc/neutron/plugins/ml2/.placeholder diff --git a/etc/neutron/plugins/ml2/ml2_conf_ofa.ini b/etc/neutron/plugins/ml2/ml2_conf_ofa.ini deleted file mode 100644 index 4a94b98704e..00000000000 --- a/etc/neutron/plugins/ml2/ml2_conf_ofa.ini +++ /dev/null @@ -1,13 +0,0 @@ -# Defines configuration options specific to the OpenFlow Agent Mechanism Driver - -[ovs] -# Please refer to configuration options to the OpenvSwitch - -[agent] -# (IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath. -# This is an optional parameter, default value is 60 seconds. -# -# get_datapath_retry_times = -# Example: get_datapath_retry_times = 30 - -# Please refer to configuration options to the OpenvSwitch else the above. diff --git a/neutron/plugins/ml2/drivers/ofagent/driver.py b/neutron/plugins/ml2/drivers/ofagent/driver.py deleted file mode 100644 index 351efd4df63..00000000000 --- a/neutron/plugins/ml2/drivers/ofagent/driver.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2015 VA Linux Systems Japan K.K. -# Copyright (C) 2015 YAMAMOTO Takashi -# 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_ofagent.plugins.ml2.drivers import mech_ofagent - -OfagentMechanismDriver = mech_ofagent.OfagentMechanismDriver diff --git a/setup.cfg b/setup.cfg index d17e5c42193..66ad544c5f6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,8 +37,6 @@ data_files = etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/plugins/cisco = etc/neutron/plugins/cisco/cisco_vpn_agent.ini - etc/neutron/plugins/ml2 = - etc/neutron/plugins/ml2/ml2_conf_ofa.ini scripts = bin/neutron-rootwrap-xen-dom0 @@ -96,7 +94,6 @@ neutron.ml2.mechanism_drivers = linuxbridge = neutron.plugins.ml2.drivers.linuxbridge.mech_driver.mech_linuxbridge:LinuxbridgeMechanismDriver openvswitch = neutron.plugins.ml2.drivers.openvswitch.mech_driver.mech_openvswitch:OpenvswitchMechanismDriver l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver - ofagent = neutron.plugins.ml2.drivers.ofagent.driver:OfagentMechanismDriver sriovnicswitch = neutron.plugins.ml2.drivers.mech_sriov.mech_driver.mech_driver:SriovNicSwitchMechanismDriver fake_agent = neutron.tests.unit.plugins.ml2.drivers.mech_fake_agent:FakeAgentMechanismDriver neutron.ml2.extension_drivers =