From: Kyle Mestery <mestery@mestery.com>
Date: Wed, 24 Jun 2015 19:12:06 +0000 (+0000)
Subject: Restructure agent code in preparation for decomp
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=724c78071da28bae838a4145a9d4cea42f853048;p=openstack-build%2Fneutron-build.git

Restructure agent code in preparation for decomp

This commit moves the L2 agents (Linuxbridge and OVS) into the
ML2 directory, while at the same time also moving the ML2 server
bits into toplevel directories. It also moves the configuration
files and unit tests. We also move the l2pop RPC mixin while
here as well.

DocImpact
UpgradeImpact

Partially-Implements: blueprint reference-implementation-split
Partial-Bug: #1468433
Closes-Bug: #1427317
Change-Id: If6feca7b7a6bdd6c3c6feb929fa26fb4b1f72770
Signed-off-by: Kyle Mestery <mestery@mestery.com>
---

diff --git a/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini b/etc/neutron/plugins/ml2/linuxbridge_agent.ini
similarity index 100%
rename from etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
rename to etc/neutron/plugins/ml2/linuxbridge_agent.ini
diff --git a/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini b/etc/neutron/plugins/ml2/openvswitch_agent.ini
similarity index 100%
rename from etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
rename to etc/neutron/plugins/ml2/openvswitch_agent.ini
diff --git a/neutron/agent/linux/polling.py b/neutron/agent/linux/polling.py
index ac3a4a620..be693d8c4 100644
--- a/neutron/agent/linux/polling.py
+++ b/neutron/agent/linux/polling.py
@@ -18,7 +18,7 @@ import eventlet
 
 from neutron.agent.common import base_polling
 from neutron.agent.linux import ovsdb_monitor
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
 
 
 @contextlib.contextmanager
diff --git a/neutron/cmd/eventlet/plugins/ovs_neutron_agent.py b/neutron/cmd/eventlet/plugins/ovs_neutron_agent.py
index 2d545bc53..1f7d2cddc 100644
--- a/neutron/cmd/eventlet/plugins/ovs_neutron_agent.py
+++ b/neutron/cmd/eventlet/plugins/ovs_neutron_agent.py
@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import neutron.plugins.openvswitch.agent.main as agent_main
+import neutron.plugins.ml2.drivers.openvswitch.agent.main as agent_main
 
 
 def main():
diff --git a/neutron/cmd/sanity/checks.py b/neutron/cmd/sanity/checks.py
index 85bc81f32..22570857e 100644
--- a/neutron/cmd/sanity/checks.py
+++ b/neutron/cmd/sanity/checks.py
@@ -27,7 +27,8 @@ from neutron.agent.linux import utils as agent_utils
 from neutron.common import utils
 from neutron.i18n import _LE
 from neutron.plugins.common import constants as const
-from neutron.plugins.openvswitch.common import constants as ovs_const
+from neutron.plugins.ml2.drivers.openvswitch.agent.common \
+    import constants as ovs_const
 
 LOG = logging.getLogger(__name__)
 
diff --git a/neutron/cmd/sanity_check.py b/neutron/cmd/sanity_check.py
index b49808cc9..9d5bae36d 100644
--- a/neutron/cmd/sanity_check.py
+++ b/neutron/cmd/sanity_check.py
@@ -25,9 +25,12 @@ from neutron.i18n import _LE, _LW
 
 
 LOG = logging.getLogger(__name__)
-cfg.CONF.import_group('AGENT', 'neutron.plugins.openvswitch.common.config')
-cfg.CONF.import_group('OVS', 'neutron.plugins.openvswitch.common.config')
-cfg.CONF.import_group('VXLAN', 'neutron.plugins.linuxbridge.common.config')
+cfg.CONF.import_group('AGENT', 'neutron.plugins.ml2.drivers.openvswitch.'
+                      'agent.common.config')
+cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.'
+                      'agent.common.config')
+cfg.CONF.import_group('VXLAN', 'neutron.plugins.ml2.drivers.linuxbridge.'
+                      'agent.common.config')
 cfg.CONF.import_group('ml2', 'neutron.plugins.ml2.config')
 cfg.CONF.import_group('ml2_sriov',
                       'neutron.plugins.ml2.drivers.mech_sriov.mech_driver')
diff --git a/neutron/db/migration/migrate_to_ml2.py b/neutron/db/migration/migrate_to_ml2.py
index 1ca039105..bc78a09ee 100755
--- a/neutron/db/migration/migrate_to_ml2.py
+++ b/neutron/db/migration/migrate_to_ml2.py
@@ -101,7 +101,8 @@ def check_db_schema_version(engine, metadata):
                           )
 
 
-# Duplicated from neutron.plugins.linuxbridge.common.constants to
+# Duplicated from
+# neutron.plugins.ml2.drivers.linuxbridge.agent.common.constants to
 # avoid having any dependency on the linuxbridge plugin being
 # installed.
 def interpret_vlan_id(vlan_id):
diff --git a/neutron/db/migration/models/head.py b/neutron/db/migration/models/head.py
index a2649a122..7119b4d5b 100644
--- a/neutron/db/migration/models/head.py
+++ b/neutron/db/migration/models/head.py
@@ -49,7 +49,6 @@ from neutron.plugins.brocade.db import models as brocade_models  # noqa
 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.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
@@ -59,6 +58,9 @@ 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
+from neutron.plugins.ml2.drivers.linuxbridge.agent import (  # noqa
+    l2network_models_v2)
+from neutron.plugins.ml2.drivers.openvswitch.agent import ovs_models_v2  # 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
@@ -66,7 +68,6 @@ from neutron.plugins.ml2.drivers import type_vxlan  # noqa
 from neutron.plugins.ml2 import models  # noqa
 from neutron.plugins.nec.db import models as nec_models  # noqa
 from neutron.plugins.nuage import nuage_models  # noqa
-from neutron.plugins.openvswitch import ovs_models_v2  # noqa
 from neutron.plugins.vmware.dbexts import nsx_models  # noqa
 from neutron.plugins.vmware.dbexts import nsxv_models  # noqa
 from neutron.plugins.vmware.dbexts import vcns_models  # noqa
diff --git a/neutron/hacking/checks.py b/neutron/hacking/checks.py
index 4b56325f9..cc6d6419b 100644
--- a/neutron/hacking/checks.py
+++ b/neutron/hacking/checks.py
@@ -75,7 +75,8 @@ def use_jsonutils(logical_line, filename):
     # Some files in the tree are not meant to be run from inside Neutron
     # itself, so we should not complain about them not using jsonutils
     json_check_skipped_patterns = [
-        "neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap",
+        "neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/etc/xapi.d/"
+        "plugins/netwrap",
     ]
 
     for pattern in json_check_skipped_patterns:
diff --git a/neutron/plugins/linuxbridge/__init__.py b/neutron/plugins/ml2/drivers/l2pop/rpc_manager/__init__.py
similarity index 100%
rename from neutron/plugins/linuxbridge/__init__.py
rename to neutron/plugins/ml2/drivers/l2pop/rpc_manager/__init__.py
diff --git a/neutron/agent/l2population_rpc.py b/neutron/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc.py
similarity index 100%
rename from neutron/agent/l2population_rpc.py
rename to neutron/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc.py
diff --git a/neutron/plugins/linuxbridge/agent/__init__.py b/neutron/plugins/ml2/drivers/linuxbridge/__init__.py
similarity index 100%
rename from neutron/plugins/linuxbridge/agent/__init__.py
rename to neutron/plugins/ml2/drivers/linuxbridge/__init__.py
diff --git a/neutron/plugins/linuxbridge/README b/neutron/plugins/ml2/drivers/linuxbridge/agent/README
similarity index 100%
rename from neutron/plugins/linuxbridge/README
rename to neutron/plugins/ml2/drivers/linuxbridge/agent/README
diff --git a/neutron/plugins/linuxbridge/common/__init__.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/__init__.py
similarity index 100%
rename from neutron/plugins/linuxbridge/common/__init__.py
rename to neutron/plugins/ml2/drivers/linuxbridge/agent/__init__.py
diff --git a/neutron/plugins/linuxbridge/db/__init__.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/__init__.py
similarity index 100%
rename from neutron/plugins/linuxbridge/db/__init__.py
rename to neutron/plugins/ml2/drivers/linuxbridge/agent/common/__init__.py
diff --git a/neutron/plugins/linuxbridge/common/config.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
similarity index 100%
rename from neutron/plugins/linuxbridge/common/config.py
rename to neutron/plugins/ml2/drivers/linuxbridge/agent/common/config.py
diff --git a/neutron/plugins/linuxbridge/common/constants.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/common/constants.py
similarity index 100%
rename from neutron/plugins/linuxbridge/common/constants.py
rename to neutron/plugins/ml2/drivers/linuxbridge/agent/common/constants.py
diff --git a/neutron/plugins/linuxbridge/db/l2network_models_v2.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/l2network_models_v2.py
similarity index 100%
rename from neutron/plugins/linuxbridge/db/l2network_models_v2.py
rename to neutron/plugins/ml2/drivers/linuxbridge/agent/l2network_models_v2.py
diff --git a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
similarity index 99%
rename from neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
rename to neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
index 01ba2ae2e..66be308a2 100644
--- a/neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
@@ -31,7 +31,6 @@ from oslo_log import log as logging
 import oslo_messaging
 from six import moves
 
-from neutron.agent import l2population_rpc as l2pop_rpc
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils
 from neutron.agent import rpc as agent_rpc
@@ -46,8 +45,11 @@ from neutron.i18n import _LE, _LI, _LW
 from neutron.openstack.common import loopingcall
 from neutron.openstack.common import service
 from neutron.plugins.common import constants as p_const
-from neutron.plugins.linuxbridge.common import config  # noqa
-from neutron.plugins.linuxbridge.common import constants as lconst
+from neutron.plugins.ml2.drivers.l2pop.rpc_manager \
+    import l2population_rpc as l2pop_rpc
+from neutron.plugins.ml2.drivers.linuxbridge.agent.common import config  # noqa
+from neutron.plugins.ml2.drivers.linuxbridge.agent.common \
+    import constants as lconst
 
 
 LOG = logging.getLogger(__name__)
diff --git a/neutron/plugins/openvswitch/__init__.py b/neutron/plugins/ml2/drivers/linuxbridge/mech_driver/__init__.py
similarity index 100%
rename from neutron/plugins/openvswitch/__init__.py
rename to neutron/plugins/ml2/drivers/linuxbridge/mech_driver/__init__.py
diff --git a/neutron/plugins/ml2/drivers/mech_linuxbridge.py b/neutron/plugins/ml2/drivers/linuxbridge/mech_driver/mech_linuxbridge.py
similarity index 100%
rename from neutron/plugins/ml2/drivers/mech_linuxbridge.py
rename to neutron/plugins/ml2/drivers/linuxbridge/mech_driver/mech_linuxbridge.py
diff --git a/neutron/plugins/openvswitch/agent/__init__.py b/neutron/plugins/ml2/drivers/openvswitch/__init__.py
similarity index 100%
rename from neutron/plugins/openvswitch/agent/__init__.py
rename to neutron/plugins/ml2/drivers/openvswitch/__init__.py
diff --git a/neutron/plugins/openvswitch/README b/neutron/plugins/ml2/drivers/openvswitch/agent/README
similarity index 100%
rename from neutron/plugins/openvswitch/README
rename to neutron/plugins/ml2/drivers/openvswitch/agent/README
diff --git a/neutron/plugins/openvswitch/agent/openflow/__init__.py b/neutron/plugins/ml2/drivers/openvswitch/agent/__init__.py
similarity index 100%
rename from neutron/plugins/openvswitch/agent/openflow/__init__.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/__init__.py
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/__init__.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/__init__.py
similarity index 100%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/__init__.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/common/__init__.py
diff --git a/neutron/plugins/openvswitch/common/config.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
similarity index 98%
rename from neutron/plugins/openvswitch/common/config.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
index cbde41733..e7f512a00 100644
--- a/neutron/plugins/openvswitch/common/config.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/common/config.py
@@ -16,7 +16,8 @@ from oslo_config import cfg
 
 from neutron.agent.common import config
 from neutron.plugins.common import constants as p_const
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.common \
+    import constants
 
 
 DEFAULT_BRIDGE_MAPPINGS = []
diff --git a/neutron/plugins/openvswitch/common/constants.py b/neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py
similarity index 100%
rename from neutron/plugins/openvswitch/common/constants.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/common/constants.py
diff --git a/neutron/plugins/openvswitch/agent/main.py b/neutron/plugins/ml2/drivers/openvswitch/agent/main.py
similarity index 85%
rename from neutron/plugins/openvswitch/agent/main.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/main.py
index 7dbac9fbe..b9bd5a96b 100644
--- a/neutron/plugins/openvswitch/agent/main.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/main.py
@@ -26,11 +26,13 @@ from neutron.common import utils as n_utils
 
 
 LOG = logging.getLogger(__name__)
-cfg.CONF.import_group('OVS', 'neutron.plugins.openvswitch.common.config')
+cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.agent.'
+                      'common.config')
 
 
 _main_modules = {
-    'ovs-ofctl': 'neutron.plugins.openvswitch.agent.openflow.ovs_ofctl.main',
+    'ovs-ofctl': 'neutron.plugins.ml2.drivers.openvswitch.agent.openflow.'
+                 'ovs_ofctl.main',
 }
 
 
diff --git a/neutron/plugins/openvswitch/common/__init__.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/__init__.py
similarity index 100%
rename from neutron/plugins/openvswitch/common/__init__.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/__init__.py
diff --git a/neutron/tests/unit/plugins/linuxbridge/__init__.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/__init__.py
similarity index 100%
rename from neutron/tests/unit/plugins/linuxbridge/__init__.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/__init__.py
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_dvr_process.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_dvr_process.py
similarity index 100%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_dvr_process.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_dvr_process.py
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_int.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_int.py
similarity index 96%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_int.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_int.py
index 34e0c2f41..c95a30763 100644
--- a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_int.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_int.py
@@ -20,8 +20,9 @@
 """
 
 from neutron.plugins.common import constants as p_const
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import ovs_bridge
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import ovs_bridge
 
 
 class OVSIntegrationBridge(ovs_bridge.OVSAgentBridge):
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_phys.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_phys.py
similarity index 89%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_phys.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_phys.py
index 3498bb86f..e76b7ddaf 100644
--- a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_phys.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_phys.py
@@ -14,9 +14,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import br_dvr_process
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import ovs_bridge
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import br_dvr_process
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import ovs_bridge
 
 
 class OVSPhysicalBridge(ovs_bridge.OVSAgentBridge,
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_tun.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_tun.py
similarity index 97%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_tun.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_tun.py
index eeaf6ee8f..67c6273e7 100644
--- a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/br_tun.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/br_tun.py
@@ -34,9 +34,12 @@ import functools
 import netaddr
 
 from neutron.agent.common import ovs_lib
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import br_dvr_process
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import ovs_bridge
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.common \
+    import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import br_dvr_process
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import ovs_bridge
 
 
 class OVSTunnelBridge(ovs_bridge.OVSAgentBridge,
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/main.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/main.py
similarity index 73%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/main.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/main.py
index 537c324b1..51ed82c8a 100644
--- a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/main.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/main.py
@@ -14,10 +14,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import br_int
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import br_phys
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import br_tun
-from neutron.plugins.openvswitch.agent import ovs_neutron_agent
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import br_int
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import br_phys
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import br_tun
+from neutron.plugins.ml2.drivers.openvswitch.agent import ovs_neutron_agent
 
 
 def init_config():
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py
similarity index 100%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ofswitch.py
diff --git a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge.py b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge.py
similarity index 92%
rename from neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge.py
index 179994d18..6e957534d 100644
--- a/neutron/plugins/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge.py
@@ -16,7 +16,8 @@
 
 
 from neutron.agent.common import ovs_lib
-from neutron.plugins.openvswitch.agent.openflow.ovs_ofctl import ofswitch
+from neutron.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl \
+    import ofswitch
 
 
 class OVSAgentBridge(ofswitch.OpenFlowSwitchMixin, ovs_lib.OVSBridge):
diff --git a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
similarity index 99%
rename from neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
index 55f5087e3..94d0e8b20 100644
--- a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_dvr_neutron_agent.py
@@ -21,7 +21,7 @@ from neutron.common import constants as n_const
 from neutron.common import utils as n_utils
 from neutron.i18n import _LE, _LI, _LW
 from neutron.plugins.common import constants as p_const
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
 
 LOG = logging.getLogger(__name__)
 
diff --git a/neutron/plugins/openvswitch/ovs_models_v2.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_models_v2.py
similarity index 100%
rename from neutron/plugins/openvswitch/ovs_models_v2.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/ovs_models_v2.py
diff --git a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
similarity index 99%
rename from neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
rename to neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
index ffb29fa82..ca52b2162 100644
--- a/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
@@ -29,7 +29,6 @@ from six import moves
 from neutron.agent.common import ovs_lib
 from neutron.agent.common import polling
 from neutron.agent.common import utils
-from neutron.agent import l2population_rpc
 from neutron.agent.linux import ip_lib
 from neutron.agent import rpc as agent_rpc
 from neutron.agent import securitygroups_rpc as sg_rpc
@@ -43,13 +42,18 @@ from neutron import context
 from neutron.i18n import _LE, _LI, _LW
 from neutron.openstack.common import loopingcall
 from neutron.plugins.common import constants as p_const
-from neutron.plugins.openvswitch.agent import ovs_dvr_neutron_agent
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.l2pop.rpc_manager import l2population_rpc
+from neutron.plugins.ml2.drivers.openvswitch.agent.common \
+    import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent \
+    import ovs_dvr_neutron_agent
 
 
 LOG = logging.getLogger(__name__)
-cfg.CONF.import_group('AGENT', 'neutron.plugins.openvswitch.common.config')
-cfg.CONF.import_group('OVS', 'neutron.plugins.openvswitch.common.config')
+cfg.CONF.import_group('AGENT', 'neutron.plugins.ml2.drivers.openvswitch.'
+                      'agent.common.config')
+cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.agent.'
+                      'common.config')
 
 # A placeholder for dead vlans.
 DEAD_VLAN_TAG = p_const.MAX_VLAN_TAG + 1
diff --git a/neutron/plugins/openvswitch/agent/xenapi/README b/neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/README
similarity index 100%
rename from neutron/plugins/openvswitch/agent/xenapi/README
rename to neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/README
diff --git a/neutron/plugins/openvswitch/agent/xenapi/contrib/build-rpm.sh b/neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/contrib/build-rpm.sh
similarity index 100%
rename from neutron/plugins/openvswitch/agent/xenapi/contrib/build-rpm.sh
rename to neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/contrib/build-rpm.sh
diff --git a/neutron/plugins/openvswitch/agent/xenapi/contrib/rpmbuild/SPECS/openstack-quantum-xen-plugins.spec b/neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/contrib/rpmbuild/SPECS/openstack-quantum-xen-plugins.spec
similarity index 100%
rename from neutron/plugins/openvswitch/agent/xenapi/contrib/rpmbuild/SPECS/openstack-quantum-xen-plugins.spec
rename to neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/contrib/rpmbuild/SPECS/openstack-quantum-xen-plugins.spec
diff --git a/neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap b/neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap
similarity index 100%
rename from neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap
rename to neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/etc/xapi.d/plugins/netwrap
diff --git a/neutron/tests/unit/plugins/linuxbridge/agent/__init__.py b/neutron/plugins/ml2/drivers/openvswitch/mech_driver/__init__.py
similarity index 100%
rename from neutron/tests/unit/plugins/linuxbridge/agent/__init__.py
rename to neutron/plugins/ml2/drivers/openvswitch/mech_driver/__init__.py
diff --git a/neutron/plugins/ml2/drivers/mech_openvswitch.py b/neutron/plugins/ml2/drivers/openvswitch/mech_driver/mech_openvswitch.py
similarity index 100%
rename from neutron/plugins/ml2/drivers/mech_openvswitch.py
rename to neutron/plugins/ml2/drivers/openvswitch/mech_driver/mech_openvswitch.py
diff --git a/neutron/tests/functional/agent/test_ovs_flows.py b/neutron/tests/functional/agent/test_ovs_flows.py
index fbc76f701..0a1a932a7 100644
--- a/neutron/tests/functional/agent/test_ovs_flows.py
+++ b/neutron/tests/functional/agent/test_ovs_flows.py
@@ -21,8 +21,9 @@ from oslo_utils import importutils
 
 from neutron.agent.linux import ip_lib
 from neutron.cmd.sanity import checks
-from neutron.plugins.openvswitch.agent import ovs_neutron_agent as ovsagt
-from neutron.plugins.openvswitch.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
+from neutron.plugins.ml2.drivers.openvswitch.agent \
+    import ovs_neutron_agent as ovsagt
 from neutron.tests.common import base as common_base
 from neutron.tests.common import net_helpers
 from neutron.tests.functional.agent import test_ovs_lib
@@ -30,7 +31,8 @@ from neutron.tests.functional import base
 from neutron.tests import tools
 
 
-cfg.CONF.import_group('OVS', 'neutron.plugins.openvswitch.common.config')
+cfg.CONF.import_group('OVS', 'neutron.plugins.ml2.drivers.openvswitch.agent.'
+                      'common.config')
 
 
 class _OVSAgentTestBase(test_ovs_lib.OVSBridgeTestBase,
@@ -81,7 +83,8 @@ class _OVSAgentTestBase(test_ovs_lib.OVSBridgeTestBase,
 
 
 class _OVSAgentOFCtlTestBase(_OVSAgentTestBase):
-    _MAIN_MODULE = 'neutron.plugins.openvswitch.agent.openflow.ovs_ofctl.main'
+    _MAIN_MODULE = ('neutron.plugins.ml2.drivers.openvswitch.agent.'
+                    'openflow.ovs_ofctl.main')
 
 
 class _ARPSpoofTestCase(object):
diff --git a/neutron/tests/unit/agent/test_securitygroups_rpc.py b/neutron/tests/unit/agent/test_securitygroups_rpc.py
index a7e91cf4a..161560b40 100644
--- a/neutron/tests/unit/agent/test_securitygroups_rpc.py
+++ b/neutron/tests/unit/agent/test_securitygroups_rpc.py
@@ -34,7 +34,7 @@ from neutron.db import securitygroups_rpc_base as sg_db_rpc
 from neutron.extensions import allowedaddresspairs as addr_pair
 from neutron.extensions import securitygroup as ext_sg
 from neutron import manager
-from neutron.plugins.openvswitch.agent import ovs_neutron_agent
+from neutron.plugins.ml2.drivers.openvswitch.agent import ovs_neutron_agent
 from neutron.tests import base
 from neutron.tests import tools
 from neutron.tests.unit.extensions import test_securitygroup as test_sg
diff --git a/neutron/tests/unit/hacking/test_checks.py b/neutron/tests/unit/hacking/test_checks.py
index 7e2d81c0c..f3e98c92d 100644
--- a/neutron/tests/unit/hacking/test_checks.py
+++ b/neutron/tests/unit/hacking/test_checks.py
@@ -85,8 +85,8 @@ class HackingTestCase(base.BaseTestCase):
             self.assertEqual(0,
                 len(list(checks.use_jsonutils(
                     "json.%s" % method,
-                    "./neutron/plugins/openvswitch/agent/xenapi/etc/xapi.d/"
-                    "plugins/netwrap"))))
+                    "./neutron/plugins/ml2/drivers/openvswitch/agent/xenapi/"
+                    "etc/xapi.d/plugins/netwrap"))))
 
     def test_assert_called_once_with(self):
         fail_code1 = """
diff --git a/neutron/tests/unit/plugins/openvswitch/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/__init__.py
similarity index 100%
rename from neutron/tests/unit/plugins/openvswitch/__init__.py
rename to neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/__init__.py
diff --git a/neutron/tests/unit/agent/l2population_rpc_base.py b/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc_base.py
similarity index 97%
rename from neutron/tests/unit/agent/l2population_rpc_base.py
rename to neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc_base.py
index cd4e325dc..3d128fd1a 100644
--- a/neutron/tests/unit/agent/l2population_rpc_base.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/l2population_rpc_base.py
@@ -17,9 +17,9 @@
 import collections
 import mock
 
-from neutron.agent import l2population_rpc
 from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
-from neutron.plugins.openvswitch.agent import ovs_neutron_agent
+from neutron.plugins.ml2.drivers.l2pop.rpc_manager import l2population_rpc
+from neutron.plugins.ml2.drivers.openvswitch.agent import ovs_neutron_agent
 from neutron.tests import base
 
 
diff --git a/neutron/tests/unit/agent/test_l2population_rpc.py b/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/test_l2population_rpc.py
similarity index 99%
rename from neutron/tests/unit/agent/test_l2population_rpc.py
rename to neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/test_l2population_rpc.py
index 5ecad8222..d8a39a32b 100644
--- a/neutron/tests/unit/agent/test_l2population_rpc.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/l2pop/rpc_manager/test_l2population_rpc.py
@@ -17,7 +17,8 @@
 import mock
 
 from neutron.common import constants as n_const
-from neutron.tests.unit.agent import l2population_rpc_base
+from neutron.tests.unit.plugins.ml2.drivers.l2pop.rpc_manager \
+    import l2population_rpc_base
 
 
 class TestL2populationRpcCallBackTunnelMixin(
diff --git a/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py b/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
index 52e233bc9..647ca2b99 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/l2pop/test_mech_driver.py
@@ -17,7 +17,6 @@ import testtools
 
 import mock
 
-from neutron.agent import l2population_rpc
 from neutron.common import constants
 from neutron.common import topics
 from neutron import context
@@ -29,6 +28,7 @@ from neutron.plugins.ml2 import driver_context
 from neutron.plugins.ml2.drivers.l2pop import db as l2pop_db
 from neutron.plugins.ml2.drivers.l2pop import mech_driver as l2pop_mech_driver
 from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
+from neutron.plugins.ml2.drivers.l2pop.rpc_manager import l2population_rpc
 from neutron.plugins.ml2 import managers
 from neutron.plugins.ml2 import rpc
 from neutron.tests import base
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/__init__.py
similarity index 100%
rename from neutron/tests/unit/plugins/openvswitch/agent/__init__.py
rename to neutron/tests/unit/plugins/ml2/drivers/linuxbridge/__init__.py
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/openflow/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/__init__.py
similarity index 100%
rename from neutron/tests/unit/plugins/openvswitch/agent/openflow/__init__.py
rename to neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/__init__.py
diff --git a/neutron/tests/unit/plugins/linuxbridge/agent/test_linuxbridge_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
similarity index 99%
rename from neutron/tests/unit/plugins/linuxbridge/agent/test_linuxbridge_neutron_agent.py
rename to neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
index 991ff43ea..8651a14d8 100644
--- a/neutron/tests/unit/plugins/linuxbridge/agent/test_linuxbridge_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
@@ -22,8 +22,10 @@ from neutron.agent.linux import utils
 from neutron.common import constants
 from neutron.common import exceptions
 from neutron.plugins.common import constants as p_const
-from neutron.plugins.linuxbridge.agent import linuxbridge_neutron_agent
-from neutron.plugins.linuxbridge.common import constants as lconst
+from neutron.plugins.ml2.drivers.linuxbridge.agent.common \
+    import constants as lconst
+from neutron.plugins.ml2.drivers.linuxbridge.agent \
+    import linuxbridge_neutron_agent
 from neutron.tests import base
 
 LOCAL_IP = '192.168.0.33'
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/__init__.py
similarity index 100%
rename from neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/__init__.py
rename to neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/__init__.py
diff --git a/neutron/tests/unit/plugins/ml2/drivers/test_mech_linuxbridge.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py
similarity index 97%
rename from neutron/tests/unit/plugins/ml2/drivers/test_mech_linuxbridge.py
rename to neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py
index ed728548b..fb28aad9c 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/test_mech_linuxbridge.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/mech_driver/test_mech_linuxbridge.py
@@ -15,7 +15,8 @@
 
 from neutron.common import constants
 from neutron.extensions import portbindings
-from neutron.plugins.ml2.drivers import mech_linuxbridge
+from neutron.plugins.ml2.drivers.linuxbridge.mech_driver \
+    import mech_linuxbridge
 from neutron.tests.unit.plugins.ml2 import _test_mech_agent as base
 
 
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
similarity index 98%
rename from neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
index 5d071fe3b..fabf698a8 100644
--- a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/ovs_bridge_test_base.py
@@ -16,7 +16,8 @@
 
 import mock
 
-from neutron.tests.unit.plugins.openvswitch.agent import ovs_test_base
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
+    import ovs_test_base
 
 
 call = mock.call  # short hand
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_int.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_int.py
similarity index 98%
rename from neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_int.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_int.py
index 27cf9de3f..005112762 100644
--- a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_int.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_int.py
@@ -16,8 +16,8 @@
 
 import mock
 
-from neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl \
-    import ovs_bridge_test_base
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.\
+    openflow.ovs_ofctl import ovs_bridge_test_base
 
 
 call = mock.call  # short hand
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_phys.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_phys.py
similarity index 94%
rename from neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_phys.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_phys.py
index ae8753afc..47ca3177d 100644
--- a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_phys.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_phys.py
@@ -16,9 +16,10 @@
 
 import mock
 
-import neutron.plugins.openvswitch.common.constants as ovs_const
-from neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl \
-    import ovs_bridge_test_base
+import neutron.plugins.ml2.drivers.openvswitch.agent.common.constants \
+    as ovs_const
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.\
+    openflow.ovs_ofctl import ovs_bridge_test_base
 
 
 call = mock.call  # short hand
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_tun.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_tun.py
similarity index 98%
rename from neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_tun.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_tun.py
index 1a6ac5816..76769a34f 100644
--- a/neutron/tests/unit/plugins/openvswitch/agent/openflow/ovs_ofctl/test_br_tun.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/openflow/ovs_ofctl/test_br_tun.py
@@ -17,9 +17,10 @@
 import mock
 import netaddr
 
-import neutron.plugins.openvswitch.common.constants as ovs_const
-from neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl \
-    import ovs_bridge_test_base
+import neutron.plugins.ml2.drivers.openvswitch.agent.common.constants \
+    as ovs_const
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.\
+    openflow.ovs_ofctl import ovs_bridge_test_base
 
 
 call = mock.call  # short hand
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/ovs_test_base.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/ovs_test_base.py
similarity index 91%
rename from neutron/tests/unit/plugins/openvswitch/agent/ovs_test_base.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/ovs_test_base.py
index 0932a1ea2..0be0a33c0 100644
--- a/neutron/tests/unit/plugins/openvswitch/agent/ovs_test_base.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/ovs_test_base.py
@@ -20,9 +20,10 @@ from oslo_utils import importutils
 from neutron.tests import base
 
 
-_AGENT_PACKAGE = 'neutron.plugins.openvswitch.agent'
+_AGENT_PACKAGE = 'neutron.plugins.ml2.drivers.openvswitch.agent'
 _AGENT_NAME = _AGENT_PACKAGE + '.ovs_neutron_agent'
-_DVR_AGENT_NAME = 'neutron.plugins.openvswitch.agent.ovs_dvr_neutron_agent'
+_DVR_AGENT_NAME = ('neutron.plugins.ml2.drivers.openvswitch.agent.'
+                   'ovs_dvr_neutron_agent')
 
 
 class OVSAgentConfigTestBase(base.BaseTestCase):
diff --git a/neutron/tests/unit/plugins/openvswitch/test_agent_scheduler.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_agent_scheduler.py
similarity index 100%
rename from neutron/tests/unit/plugins/openvswitch/test_agent_scheduler.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_agent_scheduler.py
diff --git a/neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
similarity index 99%
rename from neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
index 4738413dd..b3ab4fa3e 100644
--- a/neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
@@ -28,8 +28,9 @@ from neutron.agent.linux import ip_lib
 from neutron.common import constants as n_const
 from neutron.plugins.common import constants as p_const
 from neutron.plugins.ml2.drivers.l2pop import rpc as l2pop_rpc
-from neutron.plugins.openvswitch.common import constants
-from neutron.tests.unit.plugins.openvswitch.agent import ovs_test_base
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
+    import ovs_test_base
 
 
 NOTIFIER = 'neutron.plugins.ml2.rpc.AgentNotifierApi'
diff --git a/neutron/tests/unit/plugins/openvswitch/test_ovs_tunnel.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
similarity index 99%
rename from neutron/tests/unit/plugins/openvswitch/test_ovs_tunnel.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
index 1828e394e..6973842aa 100644
--- a/neutron/tests/unit/plugins/openvswitch/test_ovs_tunnel.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py
@@ -23,8 +23,9 @@ from oslo_log import log
 from neutron.agent.common import ovs_lib
 from neutron.agent.linux import ip_lib
 from neutron.plugins.common import constants as p_const
-from neutron.plugins.openvswitch.common import constants
-from neutron.tests.unit.plugins.openvswitch.agent import ovs_test_base
+from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
+    import ovs_test_base
 
 
 # Useful global dummy variables.
diff --git a/neutron/tests/unit/plugins/ml2/drivers/openvswitch/mech_driver/__init__.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/mech_driver/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/neutron/tests/unit/plugins/ml2/drivers/test_mech_openvswitch.py b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/mech_driver/test_mech_openvswitch.py
similarity index 97%
rename from neutron/tests/unit/plugins/ml2/drivers/test_mech_openvswitch.py
rename to neutron/tests/unit/plugins/ml2/drivers/openvswitch/mech_driver/test_mech_openvswitch.py
index 51303ba5a..cbef154e4 100644
--- a/neutron/tests/unit/plugins/ml2/drivers/test_mech_openvswitch.py
+++ b/neutron/tests/unit/plugins/ml2/drivers/openvswitch/mech_driver/test_mech_openvswitch.py
@@ -17,7 +17,8 @@ from oslo_config import cfg
 
 from neutron.common import constants
 from neutron.extensions import portbindings
-from neutron.plugins.ml2.drivers import mech_openvswitch
+from neutron.plugins.ml2.drivers.openvswitch.mech_driver \
+    import mech_openvswitch
 from neutron.tests.unit.plugins.ml2 import _test_mech_agent as base
 
 
diff --git a/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py b/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py
index ed6de34c4..443a82845 100644
--- a/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py
+++ b/neutron/tests/unit/plugins/ml2/test_agent_scheduler.py
@@ -13,8 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent \
+    import test_agent_scheduler
 from neutron.tests.unit.plugins.ml2 import test_plugin
-from neutron.tests.unit.plugins.openvswitch import test_agent_scheduler
 
 
 class Ml2AgentSchedulerTestCase(
diff --git a/setup.cfg b/setup.cfg
index f2fc00fd3..be54b3a1d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,11 +58,11 @@ data_files =
         etc/neutron/plugins/cisco/cisco_vpn_agent.ini
     etc/neutron/plugins/embrane = etc/neutron/plugins/embrane/heleos_conf.ini
     etc/neutron/plugins/ibm = etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini
-    etc/neutron/plugins/linuxbridge = etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
     etc/neutron/plugins/metaplugin = etc/neutron/plugins/metaplugin/metaplugin.ini
     etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini
     etc/neutron/plugins/ml2 =
         etc/neutron/plugins/bigswitch/restproxy.ini
+        etc/neutron/plugins/ml2/linuxbridge_agent.ini
         etc/neutron/plugins/ml2/ml2_conf.ini
         etc/neutron/plugins/ml2/ml2_conf_arista.ini
         etc/neutron/plugins/ml2/ml2_conf_brocade.ini
@@ -72,11 +72,11 @@ data_files =
         etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini
         etc/neutron/plugins/ml2/ml2_conf_sriov.ini
         etc/neutron/plugins/nuage/nuage_plugin.ini
+        etc/neutron/plugins/ml2/openvswitch_agent.ini
     etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini
     etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini
     etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini
     etc/neutron/plugins/oneconvergence = etc/neutron/plugins/oneconvergence/nvsdplugin.ini
-    etc/neutron/plugins/openvswitch = etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
     etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
     etc/neutron/plugins/vmware = etc/neutron/plugins/vmware/nsx.ini
     etc/neutron/plugins/opencontrail = etc/neutron/plugins/opencontrail/contrailplugin.ini
@@ -94,7 +94,7 @@ console_scripts =
     neutron-ibm-agent = neutron.plugins.ibm.agent.sdnve_neutron_agent:main
     neutron-ipset-cleanup = neutron.cmd.ipset_cleanup:main
     neutron-l3-agent = neutron.cmd.eventlet.agents.l3:main
-    neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
+    neutron-linuxbridge-agent = neutron.plugins.ml2.drivers.linuxbridge.agent.linuxbridge_neutron_agent:main
     neutron-metadata-agent = neutron.cmd.eventlet.agents.metadata:main
     neutron-mlnx-agent = neutron.cmd.eventlet.plugins.mlnx_neutron_agent:main
     neutron-nec-agent = neutron.cmd.eventlet.plugins.nec_neutron_agent:main
@@ -168,8 +168,8 @@ neutron.ml2.mechanism_drivers =
     opendaylight = neutron.plugins.ml2.drivers.opendaylight.driver:OpenDaylightMechanismDriver
     logger = neutron.tests.unit.plugins.ml2.drivers.mechanism_logger:LoggerMechanismDriver
     test = neutron.tests.unit.plugins.ml2.drivers.mechanism_test:TestMechanismDriver
-    linuxbridge = neutron.plugins.ml2.drivers.mech_linuxbridge:LinuxbridgeMechanismDriver
-    openvswitch = neutron.plugins.ml2.drivers.mech_openvswitch:OpenvswitchMechanismDriver
+    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
     arista = neutron.plugins.ml2.drivers.arista.mechanism_arista:AristaDriver
     # Note: ncs and cisco_ncs point to the same driver entrypoint
diff --git a/tools/check_unit_test_structure.sh b/tools/check_unit_test_structure.sh
index 0aaa0c3ab..673b2f9cc 100755
--- a/tools/check_unit_test_structure.sh
+++ b/tools/check_unit_test_structure.sh
@@ -27,7 +27,8 @@ ignore_regexes=(
     "^plugins/ml2/test_extension_driver_api.py$"
     "^plugins/ml2/test_ext_portsecurity.py$"
     "^plugins/ml2/test_agent_scheduler.py$"
-    "^plugins/openvswitch/test_ovs_tunnel.py$"
+    "^plugins/ml2/drivers/openvswitch/agent/test_agent_scheduler.py$"
+    "^plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py$"
     "^plugins/openvswitch/test_agent_scheduler.py$"
 )
 
diff --git a/tox.ini b/tox.ini
index f4a8c4a40..923af2bd6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -108,10 +108,10 @@ commands = python -m testtools.run \
     neutron.tests.unit.services.l3_router.test_l3_apic \
     neutron.tests.unit.plugins.sriovnicagent.test_sriov_nic_agent \
     neutron.tests.unit.plugins.sriovnicagent.test_pci_lib \
-    neutron.tests.unit.plugins.openvswitch.agent.ovs_test_base \
-    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \
-    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_int \
-    neutron.tests.unit.plugins.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \
+    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.ovs_test_base \
+    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_phys \
+    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_int \
+    neutron.tests.unit.plugins.ml2.drivers.openvswitch.agent.openflow.ovs_ofctl.test_br_tun \
     neutron.tests.unit.plugins.brocade.test_brocade_db \
     neutron.tests.unit.plugins.brocade.test_brocade_vlan \
     neutron.tests.unit.plugins.oneconvergence.test_nvsd_agent \
@@ -122,8 +122,8 @@ commands = python -m testtools.run \
     neutron.tests.unit.plugins.ml2.test_driver_context \
     neutron.tests.unit.plugins.ml2.test_rpc \
     neutron.tests.unit.plugins.ml2.drivers.mlnx.test_mech_mlnx \
-    neutron.tests.unit.plugins.ml2.drivers.test_mech_openvswitch \
-    neutron.tests.unit.plugins.ml2.drivers.test_mech_linuxbridge \
+    neutron.tests.unit.plugins.ml2.drivers.openvswitch.mech_driver.test_mech_openvswitch \
+    neutron.tests.unit.plugins.ml2.drivers.linuxbridge.mech_driver.test_mech_linuxbridge \
     neutron.tests.unit.plugins.ml2.drivers.base_type_tunnel \
     neutron.tests.unit.plugins.ml2.drivers.ext_test \
     neutron.tests.unit.plugins.ml2.drivers.mech_sriov.test_mech_sriov_nic_switch \
@@ -138,7 +138,9 @@ commands = python -m testtools.run \
     neutron.tests.unit.plugins.ml2.drivers.cisco.apic.test_apic_topology \
     neutron.tests.unit.plugins.ml2.drivers.test_type_flat \
     neutron.tests.unit.plugins.ml2.drivers.mechanism_test \
+    neutron.tests.unit.plugins.ml2.drivers.l2pop.rpc_manager.l2population_rpc_base \
     neutron.tests.unit.plugins.ml2.extensions.fake_extension \
+    neutron.tests.unit.plugins.ml2.drivers.l2pop.rpc_manager.test_l2population_rpc \
     neutron.tests.unit.plugins.cisco.n1kv.fake_client \
     neutron.tests.unit.plugins.cisco.test_network_db \
     neutron.tests.unit.db.test_l3_dvr_db \
@@ -156,9 +158,7 @@ commands = python -m testtools.run \
     neutron.tests.unit.api.rpc.handlers.test_dvr_rpc \
     neutron.tests.unit.api.rpc.agentnotifiers.test_dhcp_rpc_agent_api \
     neutron.tests.unit.agent.metadata.test_driver \
-    neutron.tests.unit.agent.l2population_rpc_base \
     neutron.tests.unit.agent.test_rpc \
-    neutron.tests.unit.agent.test_l2population_rpc \
     neutron.tests.unit.agent.l3.test_link_local_allocator \
     neutron.tests.unit.agent.l3.test_ha_router \
     neutron.tests.unit.agent.l3.test_legacy_router \