From fa22605c152c4ac25a95c53eaed9688d3a023279 Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@redhat.com>
Date: Thu, 22 Jan 2015 01:55:17 -0600
Subject: [PATCH] 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
---
 neutron/agent/linux/ovs_lib.py                              | 2 +-
 neutron/agent/ovsdb/__init__.py                             | 0
 neutron/agent/{ovsdb.py => ovsdb/api.py}                    | 2 +-
 neutron/agent/{linux/ovsdb_vsctl.py => ovsdb/impl_vsctl.py} | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 neutron/agent/ovsdb/__init__.py
 rename neutron/agent/{ovsdb.py => ovsdb/api.py} (99%)
 rename neutron/agent/{linux/ovsdb_vsctl.py => ovsdb/impl_vsctl.py} (99%)

diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py
index 740a72984..6895d565f 100644
--- 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
index 000000000..e69de29bb
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 3f319fd0b..10d365acf 100644
--- 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 07bd71d1a..f6d7ea12a 100644
--- 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
 
-- 
2.45.2