openstack/neutron
Code Issues Proposed changes

Decompose OFAgent mechanism driver from neutron tree completely

Browse Source 
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
This commit is contained in:
fumihiko kakuma 2015-12-09 13:00:39 +09:00
parent a056c8a028
commit ee78b063c7
4 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
neutron/plugins/ml2/drivers/ofagent/__init__.py → etc/neutron/plugins/ml2/.placeholder
View File

13
etc/neutron/plugins/ml2/ml2_conf_ofa.ini
View File

@ -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.

19
neutron/plugins/ml2/drivers/ofagent/driver.py
View File

@ -1,19 +0,0 @@
# Copyright (C) 2015 VA Linux Systems Japan K.K.
# Copyright (C) 2015 YAMAMOTO Takashi <yamamoto at valinux co jp>
# 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

3
setup.cfg
View File

@ -37,8 +37,6 @@ data_files =
etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d/openvswitch-plugin.filters
etc/neutron/plugins/cisco = etc/neutron/plugins/cisco =
etc/neutron/plugins/cisco/cisco_vpn_agent.ini etc/neutron/plugins/cisco/cisco_vpn_agent.ini
etc/neutron/plugins/ml2 =
etc/neutron/plugins/ml2/ml2_conf_ofa.ini
scripts = scripts =
bin/neutron-rootwrap-xen-dom0 bin/neutron-rootwrap-xen-dom0
@ -96,7 +94,6 @@ neutron.ml2.mechanism_drivers =
linuxbridge = neutron.plugins.ml2.drivers.linuxbridge.mech_driver.mech_linuxbridge:LinuxbridgeMechanismDriver linuxbridge = neutron.plugins.ml2.drivers.linuxbridge.mech_driver.mech_linuxbridge:LinuxbridgeMechanismDriver
openvswitch = neutron.plugins.ml2.drivers.openvswitch.mech_driver.mech_openvswitch:OpenvswitchMechanismDriver openvswitch = neutron.plugins.ml2.drivers.openvswitch.mech_driver.mech_openvswitch:OpenvswitchMechanismDriver
l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver 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 sriovnicswitch = neutron.plugins.ml2.drivers.mech_sriov.mech_driver.mech_driver:SriovNicSwitchMechanismDriver
fake_agent = neutron.tests.unit.plugins.ml2.drivers.mech_fake_agent:FakeAgentMechanismDriver fake_agent = neutron.tests.unit.plugins.ml2.drivers.mech_fake_agent:FakeAgentMechanismDriver
neutron.ml2.extension_drivers = neutron.ml2.extension_drivers =