From: Sukhdev Date: Tue, 22 Jul 2014 02:28:17 +0000 (-0700) Subject: This patch changes the name of directory from mech_arista to arista X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=78bb3d2be8e944f8832534c861da74899b404d29;p=openstack-build%2Fneutron-build.git This patch changes the name of directory from mech_arista to arista This name change of directroy is needed so that additional drivers can be moved into this directory and share the code among drivers. In order to accomodate this name change, setup.cfg is modified to point to the Arista ML2 driver at the new location. Additionally, a similar new directroy is created for test files as well. Change-Id: I614ccf8b6d152aa99e20ef1ea762c26115ab9373 closes-bug: 1346712 --- diff --git a/neutron/db/migration/models/head.py b/neutron/db/migration/models/head.py index 895d77afb..3eb7fa3de 100644 --- a/neutron/db/migration/models/head.py +++ b/neutron/db/migration/models/head.py @@ -54,12 +54,12 @@ from neutron.plugins.cisco.db import nexus_models_v2 # noqa from neutron.plugins.hyperv import model # noqa from neutron.plugins.linuxbridge.db import l2network_models_v2 # noqa from neutron.plugins.metaplugin import meta_models_v2 # noqa +from neutron.plugins.ml2.drivers.arista import db # noqa from neutron.plugins.ml2.drivers.brocade.db import ( # noqa models as ml2_brocade_models) from neutron.plugins.ml2.drivers.cisco.apic import apic_model # noqa from neutron.plugins.ml2.drivers.cisco.nexus import ( # noqa nexus_models_v2 as ml2_nexus_models_v2) -from neutron.plugins.ml2.drivers.mech_arista import db # noqa from neutron.plugins.ml2.drivers import type_flat # noqa from neutron.plugins.ml2.drivers import type_gre # noqa from neutron.plugins.ml2.drivers import type_vlan # noqa diff --git a/neutron/plugins/ml2/drivers/mech_arista/README b/neutron/plugins/ml2/drivers/arista/README similarity index 100% rename from neutron/plugins/ml2/drivers/mech_arista/README rename to neutron/plugins/ml2/drivers/arista/README diff --git a/neutron/plugins/ml2/drivers/mech_arista/__init__.py b/neutron/plugins/ml2/drivers/arista/__init__.py similarity index 100% rename from neutron/plugins/ml2/drivers/mech_arista/__init__.py rename to neutron/plugins/ml2/drivers/arista/__init__.py diff --git a/neutron/plugins/ml2/drivers/mech_arista/config.py b/neutron/plugins/ml2/drivers/arista/config.py similarity index 100% rename from neutron/plugins/ml2/drivers/mech_arista/config.py rename to neutron/plugins/ml2/drivers/arista/config.py diff --git a/neutron/plugins/ml2/drivers/mech_arista/db.py b/neutron/plugins/ml2/drivers/arista/db.py similarity index 100% rename from neutron/plugins/ml2/drivers/mech_arista/db.py rename to neutron/plugins/ml2/drivers/arista/db.py diff --git a/neutron/plugins/ml2/drivers/mech_arista/exceptions.py b/neutron/plugins/ml2/drivers/arista/exceptions.py similarity index 100% rename from neutron/plugins/ml2/drivers/mech_arista/exceptions.py rename to neutron/plugins/ml2/drivers/arista/exceptions.py diff --git a/neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py b/neutron/plugins/ml2/drivers/arista/mechanism_arista.py similarity index 99% rename from neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py rename to neutron/plugins/ml2/drivers/arista/mechanism_arista.py index d825693e2..a86d542d9 100644 --- a/neutron/plugins/ml2/drivers/mech_arista/mechanism_arista.py +++ b/neutron/plugins/ml2/drivers/arista/mechanism_arista.py @@ -23,9 +23,9 @@ from neutron.extensions import portbindings from neutron.openstack.common import log as logging from neutron.plugins.ml2.common import exceptions as ml2_exc from neutron.plugins.ml2 import driver_api -from neutron.plugins.ml2.drivers.mech_arista import config # noqa -from neutron.plugins.ml2.drivers.mech_arista import db -from neutron.plugins.ml2.drivers.mech_arista import exceptions as arista_exc +from neutron.plugins.ml2.drivers.arista import config # noqa +from neutron.plugins.ml2.drivers.arista import db +from neutron.plugins.ml2.drivers.arista import exceptions as arista_exc LOG = logging.getLogger(__name__) diff --git a/neutron/tests/unit/ml2/drivers/arista/__init__.py b/neutron/tests/unit/ml2/drivers/arista/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/neutron/tests/unit/ml2/drivers/test_arista_mechanism_driver.py b/neutron/tests/unit/ml2/drivers/arista/test_arista_mechanism_driver.py similarity index 99% rename from neutron/tests/unit/ml2/drivers/test_arista_mechanism_driver.py rename to neutron/tests/unit/ml2/drivers/arista/test_arista_mechanism_driver.py index 449b65526..42028a8fe 100644 --- a/neutron/tests/unit/ml2/drivers/test_arista_mechanism_driver.py +++ b/neutron/tests/unit/ml2/drivers/arista/test_arista_mechanism_driver.py @@ -18,9 +18,9 @@ from oslo.config import cfg from neutron.common import constants as n_const import neutron.db.api as ndb -from neutron.plugins.ml2.drivers.mech_arista import db -from neutron.plugins.ml2.drivers.mech_arista import exceptions as arista_exc -from neutron.plugins.ml2.drivers.mech_arista import mechanism_arista as arista +from neutron.plugins.ml2.drivers.arista import db +from neutron.plugins.ml2.drivers.arista import exceptions as arista_exc +from neutron.plugins.ml2.drivers.arista import mechanism_arista as arista from neutron.tests import base diff --git a/setup.cfg b/setup.cfg index 94f7d9cd7..5e7cea6c4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -158,7 +158,7 @@ neutron.ml2.mechanism_drivers = openvswitch = neutron.plugins.ml2.drivers.mech_openvswitch:OpenvswitchMechanismDriver hyperv = neutron.plugins.ml2.drivers.mech_hyperv:HypervMechanismDriver ncs = neutron.plugins.ml2.drivers.mechanism_ncs:NCSMechanismDriver - arista = neutron.plugins.ml2.drivers.mech_arista.mechanism_arista:AristaDriver + arista = neutron.plugins.ml2.drivers.arista.mechanism_arista:AristaDriver cisco_nexus = neutron.plugins.ml2.drivers.cisco.nexus.mech_cisco_nexus:CiscoNexusMechanismDriver cisco_apic = neutron.plugins.ml2.drivers.cisco.apic.mechanism_apic:APICMechanismDriver l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver