Merge "This patch changes the name of directory from mech_arista to arista"

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

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__)
 

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
 
 

setup.cfg

@@ -159,7 +159,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