Merge "Arista Drivers decomposition part II"

diff --cc neutron/db/migration/alembic_migrations/external.py
Simple merge

diff --cc neutron/db/migration/models/head.py
index 6044cd4ab5ca0a07fb3a2afc3199dcc400738cec,43eb02ee43238f77783b2dd5cd3a883e14cc27ee..8680b06a4f47723a776da017552203eeaad556ff
--- 1/neutron/db/migration/models/head.py
--- 2/neutron/db/migration/models/head.py
+++ b/neutron/db/migration/models/head.py
@@@ -52,9 -52,9 +52,8 @@@ from neutron.plugins.brocade.db import 
  from neutron.plugins.cisco.db.l3 import l3_models  # noqa
  from neutron.plugins.cisco.db import n1kv_models_v2  # noqa
  from neutron.plugins.cisco.db import network_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.n1kv import n1kv_models  # noqa
  from neutron.plugins.ml2.drivers.cisco.nexus import (  # noqa
      nexus_models_v2 as ml2_nexus_models_v2)
  from neutron.plugins.ml2.drivers.cisco.ucsm import ucsm_model  # noqa

diff --cc setup.cfg
Simple merge

diff --cc tox.ini
Simple merge