Fixed loading of Nexus DB tables; moved imports to l2nework_db.py, changes discussed...

diff --git a/quantum/plugins/cisco/db/l2network_db.py b/quantum/plugins/cisco/db/l2network_db.py
index 8f85afb55eda5a10302236f741e1749637394a02..6196fe17eaafe8a255161971be6d116c15064182 100644 (file)
--- a/quantum/plugins/cisco/db/l2network_db.py
+++ b/quantum/plugins/cisco/db/l2network_db.py
@@ -24,6 +24,8 @@ from quantum.plugins.cisco.common import cisco_exceptions as c_exc
 import l2network_models
 import logging as LOG
 import quantum.plugins.cisco.db.api as db
+from quantum.plugins.cisco.db import nexus_db as ndb
+from quantum.plugins.cisco.db import ucs_db as udb
 
 
 def initialize():

diff --git a/quantum/plugins/cisco/l2network_plugin.py b/quantum/plugins/cisco/l2network_plugin.py
index 225468bd8ef18155ea444ebd9140f536ac36305e..153f39a468ef97ee64ce625460e7f8e0ca713bbf 100644 (file)
--- a/quantum/plugins/cisco/l2network_plugin.py
+++ b/quantum/plugins/cisco/l2network_plugin.py
@@ -33,7 +33,6 @@ from quantum.plugins.cisco.common import cisco_credentials as cred
 from quantum.plugins.cisco.common import cisco_utils as cutil
 from quantum.plugins.cisco.db import api as db
 from quantum.plugins.cisco.db import l2network_db as cdb
-from quantum.plugins.cisco.db import ucs_db as udb
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)