Reorganize OVSDB API

This reorganization makes adding a second implementation of the
API a lot cleaner.

Partially-Implements: blueprint vsctl-to-ovsdb
Change-Id: Ice869f33b6023d3693ad732276267621912c691b

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
index 740a72984474db4a4f0ce9e1719ad4eb67568991..6895d565f0f9059b5c6efa3f60fb280c95aa227e 100644 (file)
--- a/neutron/agent/linux/ovs_lib.py
+++ b/neutron/agent/linux/ovs_lib.py
@@ -24,7 +24,7 @@ import six
 
 from neutron.agent.linux import ip_lib
 from neutron.agent.linux import utils
-from neutron.agent import ovsdb
+from neutron.agent.ovsdb import api as ovsdb
 from neutron.common import exceptions
 from neutron.i18n import _LE, _LI, _LW
 from neutron.openstack.common import log as logging

diff --git a/neutron/agent/ovsdb/__init__.py b/neutron/agent/ovsdb/__init__.py
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/neutron/agent/ovsdb.py b/neutron/agent/ovsdb/api.py
similarity index 99%
rename from neutron/agent/ovsdb.py
rename to neutron/agent/ovsdb/api.py
index 3f319fd0b0b6d693ef1eb7b90b7cc8e2e28eeff2..10d365acff223e0ca521529f32bb17a35554dffb 100644 (file)
--- a/neutron/agent/ovsdb.py
+++ b/neutron/agent/ovsdb/api.py
@@ -19,7 +19,7 @@ from oslo_utils import importutils
 import six
 
 interface_map = {
-    'vsctl': 'neutron.agent.linux.ovsdb_vsctl.OvsdbVsctl',
+    'vsctl': 'neutron.agent.ovsdb.impl_vsctl.OvsdbVsctl',
 }
 
 OPTS = [

diff --git a/neutron/agent/linux/ovsdb_vsctl.py b/neutron/agent/ovsdb/impl_vsctl.py
similarity index 99%
rename from neutron/agent/linux/ovsdb_vsctl.py
rename to neutron/agent/ovsdb/impl_vsctl.py
index 07bd71d1a580b619d9b8629fe55a338389725fa2..f6d7ea12a68c43fc52b38795db46b9bf201b1602 100644 (file)
--- a/neutron/agent/linux/ovsdb_vsctl.py
+++ b/neutron/agent/ovsdb/impl_vsctl.py
@@ -20,7 +20,7 @@ from oslo_serialization import jsonutils
 from oslo_utils import excutils
 
 from neutron.agent.linux import utils
-from neutron.agent import ovsdb
+from neutron.agent.ovsdb import api as ovsdb
 from neutron.i18n import _LE
 from neutron.openstack.common import log as logging