From: Henry Gessau Date: Wed, 12 Aug 2015 15:43:29 +0000 (-0400) Subject: Final decomposition of the ML2 NCS driver X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=26b226f43ed436b190ca6392d289df3b0e090b30;p=openstack-build%2Fneutron-build.git Final decomposition of the ML2 NCS driver Closes-Bug: #1484160 Related-Blueprint: core-vendor-decomposition Depends-On: I713f2378050f514a427fb9937b2a1fc5cc48bd6f Change-Id: I0a447fd5b176faf96fc0f5e164fa7a3b098ae74f --- diff --git a/neutron/plugins/ml2/drivers/cisco/ncs/__init__.py b/neutron/plugins/ml2/drivers/cisco/ncs/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/neutron/plugins/ml2/drivers/cisco/ncs/driver.py b/neutron/plugins/ml2/drivers/cisco/ncs/driver.py deleted file mode 100644 index 6f8b8a6c7..000000000 --- a/neutron/plugins/ml2/drivers/cisco/ncs/driver.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2013 OpenStack Foundation -# 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. - -""" -ML2 Mechanism Driver for Cisco NCS. -""" - -from networking_cisco.plugins.ml2.drivers.cisco.ncs import driver as cisco - -NCSMechanismDriver = cisco.NCSMechanismDriver diff --git a/setup.cfg b/setup.cfg index 9cda3e8d2..480710fd5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -166,10 +166,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 hyperv = neutron.plugins.ml2.drivers.hyperv.mech_hyperv:HypervMechanismDriver - # 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_ucsm = neutron.plugins.ml2.drivers.cisco.ucsm.mech_cisco_ucsm:CiscoUcsmMechanismDriver l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver