From: armando-migliaccio <amigliaccio@nicira.com>
Date: Wed, 12 Jun 2013 22:24:21 +0000 (-0700)
Subject: Move NVP DB extensions under dbexts module.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=37627645e47d35643454a84ae4a8c682ee0b18eb;p=openstack-build%2Fneutron-build.git

Move NVP DB extensions under dbexts module.

Small clean-up to the plugin directory. This is also
more in line with how API extensions have their own
module.

Change-Id: Idae52e30128f4ed9f8f7f5164991952bc3189f53
---

diff --git a/quantum/plugins/nicira/QuantumPlugin.py b/quantum/plugins/nicira/QuantumPlugin.py
index bd8258625..245854b27 100644
--- a/quantum/plugins/nicira/QuantumPlugin.py
+++ b/quantum/plugins/nicira/QuantumPlugin.py
@@ -59,12 +59,12 @@ from quantum.plugins.nicira.common import exceptions as nvp_exc
 from quantum.plugins.nicira.common import metadata_access as nvp_meta
 from quantum.plugins.nicira.common import securitygroups as nvp_sec
 from quantum.plugins.nicira.dbexts import maclearning as mac_db
+from quantum.plugins.nicira.dbexts import nicira_db
+from quantum.plugins.nicira.dbexts import nicira_networkgw_db as networkgw_db
+from quantum.plugins.nicira.dbexts import nicira_qos_db as qos_db
 from quantum.plugins.nicira.extensions import maclearning as mac_ext
 from quantum.plugins.nicira.extensions import nvp_networkgw as networkgw
 from quantum.plugins.nicira.extensions import nvp_qos as ext_qos
-from quantum.plugins.nicira import nicira_db
-from quantum.plugins.nicira import nicira_networkgw_db as networkgw_db
-from quantum.plugins.nicira import nicira_qos_db as qos_db
 from quantum.plugins.nicira import nvp_cluster
 from quantum.plugins.nicira import NvpApiClient
 from quantum.plugins.nicira import nvplib
diff --git a/quantum/plugins/nicira/nicira_db.py b/quantum/plugins/nicira/dbexts/nicira_db.py
similarity index 95%
rename from quantum/plugins/nicira/nicira_db.py
rename to quantum/plugins/nicira/dbexts/nicira_db.py
index 87fdd2be6..04821f860 100644
--- a/quantum/plugins/nicira/nicira_db.py
+++ b/quantum/plugins/nicira/dbexts/nicira_db.py
@@ -19,8 +19,8 @@ from sqlalchemy.orm import exc
 
 import quantum.db.api as db
 from quantum.openstack.common import log as logging
-from quantum.plugins.nicira import nicira_models
-from quantum.plugins.nicira import nicira_networkgw_db
+from quantum.plugins.nicira.dbexts import nicira_models
+from quantum.plugins.nicira.dbexts import nicira_networkgw_db
 
 LOG = logging.getLogger(__name__)
 
diff --git a/quantum/plugins/nicira/nicira_models.py b/quantum/plugins/nicira/dbexts/nicira_models.py
similarity index 100%
rename from quantum/plugins/nicira/nicira_models.py
rename to quantum/plugins/nicira/dbexts/nicira_models.py
diff --git a/quantum/plugins/nicira/nicira_networkgw_db.py b/quantum/plugins/nicira/dbexts/nicira_networkgw_db.py
similarity index 100%
rename from quantum/plugins/nicira/nicira_networkgw_db.py
rename to quantum/plugins/nicira/dbexts/nicira_networkgw_db.py
diff --git a/quantum/plugins/nicira/nicira_qos_db.py b/quantum/plugins/nicira/dbexts/nicira_qos_db.py
similarity index 100%
rename from quantum/plugins/nicira/nicira_qos_db.py
rename to quantum/plugins/nicira/dbexts/nicira_qos_db.py
diff --git a/quantum/tests/unit/nicira/test_networkgw.py b/quantum/tests/unit/nicira/test_networkgw.py
index de5c31fc0..8ba561834 100644
--- a/quantum/tests/unit/nicira/test_networkgw.py
+++ b/quantum/tests/unit/nicira/test_networkgw.py
@@ -29,8 +29,8 @@ from quantum import context
 from quantum.db import api as db_api
 from quantum.db import db_base_plugin_v2
 from quantum import manager
+from quantum.plugins.nicira.dbexts import nicira_networkgw_db
 from quantum.plugins.nicira.extensions import nvp_networkgw as networkgw
-from quantum.plugins.nicira import nicira_networkgw_db
 from quantum.tests import base
 from quantum.tests.unit import test_api_v2
 from quantum.tests.unit import test_db_plugin