Move NCS mech driver to its new home
The NCS driver is scheduled for decomposition, and in the targetted vendor repo the files are in a new location in the tree. Before we can decompose the driver we must move it to its new location in the neutron tree. A future patch will decompose (thin) the driver and add requirements.txt. Partial-Bug: #1416713 Partially Implements: blueprint core-vendor-decomposition Change-Id: If9d098bbbd571f53f945122e007d12d561295546
This commit is contained in:
parent
5e69e9a18c
commit
31ee6f094f
|
@ -44,8 +44,8 @@ also called as part of the port binding process, to determine whether
|
||||||
the associated mechanism can provide connectivity for the network, and
|
the associated mechanism can provide connectivity for the network, and
|
||||||
if so, the network segment and VIF driver to be used. The havana
|
if so, the network segment and VIF driver to be used. The havana
|
||||||
release includes mechanism drivers for the Open vSwitch, Linux bridge,
|
release includes mechanism drivers for the Open vSwitch, Linux bridge,
|
||||||
and Hyper-V L2 agents, for Arista and Cisco switches, and for the
|
and Hyper-V L2 agents, and for vendor switches/controllers/etc.
|
||||||
Tail-f NCS. It also includes an L2 Population mechanism driver that
|
It also includes an L2 Population mechanism driver that
|
||||||
can help optimize tunneled virtual network traffic.
|
can help optimize tunneled virtual network traffic.
|
||||||
|
|
||||||
For additional information regarding the ML2 plugin and its collection
|
For additional information regarding the ML2 plugin and its collection
|
||||||
|
|
|
@ -45,7 +45,7 @@ class OpenDaylightMechanismDriver(api.MechanismDriver):
|
||||||
|
|
||||||
"""Mechanism Driver for OpenDaylight.
|
"""Mechanism Driver for OpenDaylight.
|
||||||
|
|
||||||
This driver was a port from the Tail-F NCS MechanismDriver. The API
|
This driver was a port from the NCS MechanismDriver. The API
|
||||||
exposed by ODL is slightly different from the API exposed by NCS,
|
exposed by ODL is slightly different from the API exposed by NCS,
|
||||||
but the general concepts are the same.
|
but the general concepts are the same.
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from neutron.plugins.ml2.drivers import mechanism_ncs
|
from neutron.plugins.ml2.drivers.cisco.ncs import driver
|
||||||
from neutron.tests.unit.ml2 import test_ml2_plugin as test_plugin
|
from neutron.tests.unit.ml2 import test_ml2_plugin as test_plugin
|
||||||
|
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ class NCSTestCase(test_plugin.Ml2PluginV2TestCase):
|
||||||
# driver apis.
|
# driver apis.
|
||||||
super(NCSTestCase, self).setUp()
|
super(NCSTestCase, self).setUp()
|
||||||
self.port_create_status = 'DOWN'
|
self.port_create_status = 'DOWN'
|
||||||
mechanism_ncs.NCSMechanismDriver.sendjson = self.check_sendjson
|
driver.NCSMechanismDriver.sendjson = self.check_sendjson
|
||||||
|
|
||||||
def check_sendjson(self, method, urlpath, obj):
|
def check_sendjson(self, method, urlpath, obj):
|
||||||
# Confirm fix for bug #1224981
|
# Confirm fix for bug #1224981
|
|
@ -169,8 +169,11 @@ neutron.ml2.mechanism_drivers =
|
||||||
linuxbridge = neutron.plugins.ml2.drivers.mech_linuxbridge:LinuxbridgeMechanismDriver
|
linuxbridge = neutron.plugins.ml2.drivers.mech_linuxbridge:LinuxbridgeMechanismDriver
|
||||||
openvswitch = neutron.plugins.ml2.drivers.mech_openvswitch:OpenvswitchMechanismDriver
|
openvswitch = neutron.plugins.ml2.drivers.mech_openvswitch:OpenvswitchMechanismDriver
|
||||||
hyperv = neutron.plugins.ml2.drivers.mech_hyperv:HypervMechanismDriver
|
hyperv = neutron.plugins.ml2.drivers.mech_hyperv:HypervMechanismDriver
|
||||||
ncs = neutron.plugins.ml2.drivers.mechanism_ncs:NCSMechanismDriver
|
|
||||||
arista = neutron.plugins.ml2.drivers.arista.mechanism_arista:AristaDriver
|
arista = neutron.plugins.ml2.drivers.arista.mechanism_arista:AristaDriver
|
||||||
|
# Note: ncs and cisco_ncs point to the same driver entrypoint
|
||||||
|
# TODO: The old name (ncs) can be dropped when it is no longer used
|
||||||
|
ncs = neutron.plugins.ml2.drivers.cisco.ncs.driver:NCSMechanismDriver
|
||||||
|
cisco_ncs = neutron.plugins.ml2.drivers.cisco.ncs.driver:NCSMechanismDriver
|
||||||
cisco_nexus = neutron.plugins.ml2.drivers.cisco.nexus.mech_cisco_nexus:CiscoNexusMechanismDriver
|
cisco_nexus = neutron.plugins.ml2.drivers.cisco.nexus.mech_cisco_nexus:CiscoNexusMechanismDriver
|
||||||
cisco_apic = neutron.plugins.ml2.drivers.cisco.apic.mechanism_apic:APICMechanismDriver
|
cisco_apic = neutron.plugins.ml2.drivers.cisco.apic.mechanism_apic:APICMechanismDriver
|
||||||
l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver
|
l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver
|
||||||
|
|
Loading…
Reference in New Issue