From c9a86800f421af7a3c98de2d5ccdf8917d315e79 Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Sat, 31 Jan 2015 09:22:01 -0800 Subject: [PATCH] Drop bw compact module for OpenDayLight Following change [1], this bw-compat measure can be dropped. Depends-on: https://review.openstack.org/#/c/151707 [1] Change-Id: I2283759a5b0ee995573d4e4357dafb3e66ca4aed --- neutron/plugins/ml2/drivers/mechanism_odl.py | 20 -------------------- neutron/tests/unit/ml2/test_mechanism_odl.py | 4 ++-- setup.cfg | 2 +- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 neutron/plugins/ml2/drivers/mechanism_odl.py diff --git a/neutron/plugins/ml2/drivers/mechanism_odl.py b/neutron/plugins/ml2/drivers/mechanism_odl.py deleted file mode 100644 index 7e10a818b..000000000 --- a/neutron/plugins/ml2/drivers/mechanism_odl.py +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2015 OpenStack Foundation -# -# 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. - -# TODO(armax): this file is added for bw-compat. As soon as the respective -# change merges on the networking_odl side, this file can be dropped. - -from neutron.plugins.ml2.drivers.opendaylight import driver - -OpenDaylightMechanismDriver = driver.OpenDaylightMechanismDriver diff --git a/neutron/tests/unit/ml2/test_mechanism_odl.py b/neutron/tests/unit/ml2/test_mechanism_odl.py index 9e1fad5ea..958e7d134 100644 --- a/neutron/tests/unit/ml2/test_mechanism_odl.py +++ b/neutron/tests/unit/ml2/test_mechanism_odl.py @@ -25,7 +25,7 @@ with mock.patch.dict(sys.modules, 'networking_odl.common': mock.Mock(), 'networking_odl.ml2': mock.Mock()}): from networking_odl.common import constants as const - from neutron.plugins.ml2.drivers import mechanism_odl + from neutron.plugins.ml2.drivers.opendaylight import driver class TestODLShim(test_plugin.Ml2PluginV2TestCase): @@ -34,7 +34,7 @@ class TestODLShim(test_plugin.Ml2PluginV2TestCase): super(TestODLShim, self).setUp() self.context = context.get_admin_context() self.plugin = mock.Mock() - self.driver = mechanism_odl.OpenDaylightMechanismDriver() + self.driver = driver.OpenDaylightMechanismDriver() self.driver.odl_drv = mock.Mock() def test_create_network_postcommit(self): diff --git a/setup.cfg b/setup.cfg index 815c65a80..36051fddd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -163,7 +163,7 @@ neutron.ml2.type_drivers = gre = neutron.plugins.ml2.drivers.type_gre:GreTypeDriver vxlan = neutron.plugins.ml2.drivers.type_vxlan:VxlanTypeDriver neutron.ml2.mechanism_drivers = - opendaylight = neutron.plugins.ml2.drivers.mechanism_odl:OpenDaylightMechanismDriver + opendaylight = neutron.plugins.ml2.drivers.opendaylight.driver:OpenDaylightMechanismDriver logger = neutron.tests.unit.ml2.drivers.mechanism_logger:LoggerMechanismDriver test = neutron.tests.unit.ml2.drivers.mechanism_test:TestMechanismDriver linuxbridge = neutron.plugins.ml2.drivers.mech_linuxbridge:LinuxbridgeMechanismDriver -- 2.45.2