From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Sun, 31 Jul 2011 18:38:26 +0000 (-0700)
Subject: Changed the directory structure to a more organized one.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6fa2f538e7a825e3e582f44615c2599cb73fce41;p=openstack-build%2Fneutron-build.git

Changed the directory structure to a more organized one.
Fixed the imports to reflect the new structure.
---

diff --git a/quantum/plugins/cisco/README b/quantum/plugins/cisco/README
index 6c2bc0cdc..cb6057c72 100644
--- a/quantum/plugins/cisco/README
+++ b/quantum/plugins/cisco/README
@@ -27,16 +27,16 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OPENSTACK
 provider = quantum.plugins.cisco.l2network_plugin.L2Network
 * You should have the following files in quantum/quantum/plugins/cisco directory (if you have pulled the Cisco Quantum branch, you will already have them):
 l2network_plugin.py
-cisco_configuration.py
-cisco_constants.py
-cisco_credentials.py
-cisco_exceptions.py
-cisco_nexus_plugin.py
-cisco_ucs_network_driver.py
-cisco_ucs_plugin.py
-cisco_utils.py
+common/cisco_configuration.py
+common/cisco_constants.py
+common/cisco_credentials.py
+common/cisco_exceptions.py
+nexus/cisco_nexus_plugin.py
+ucs/cisco_ucs_network_driver.py
+ucs/cisco_ucs_plugin.py
+common/cisco_utils.py
 __init__.py
-get-vif.sh
+ucs/get-vif.sh
 * Configure the L2 Network Pllugin:
 	+ In cisco_configuration.py, 
 		- change the UCSM IP in the following statement to your UCSM IP
diff --git a/quantum/plugins/cisco/cisco_configuration.py b/quantum/plugins/cisco/common/cisco_configuration.py
similarity index 100%
rename from quantum/plugins/cisco/cisco_configuration.py
rename to quantum/plugins/cisco/common/cisco_configuration.py
diff --git a/quantum/plugins/cisco/cisco_constants.py b/quantum/plugins/cisco/common/cisco_constants.py
similarity index 100%
rename from quantum/plugins/cisco/cisco_constants.py
rename to quantum/plugins/cisco/common/cisco_constants.py
diff --git a/quantum/plugins/cisco/cisco_credentials.py b/quantum/plugins/cisco/common/cisco_credentials.py
similarity index 96%
rename from quantum/plugins/cisco/cisco_credentials.py
rename to quantum/plugins/cisco/common/cisco_credentials.py
index c0cd28253..cdbb6c379 100644
--- a/quantum/plugins/cisco/cisco_credentials.py
+++ b/quantum/plugins/cisco/common/cisco_credentials.py
@@ -19,7 +19,7 @@
 
 import logging as LOG
 
-from quantum.plugins.cisco import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_constants as const
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
diff --git a/quantum/plugins/cisco/cisco_exceptions.py b/quantum/plugins/cisco/common/cisco_exceptions.py
similarity index 100%
rename from quantum/plugins/cisco/cisco_exceptions.py
rename to quantum/plugins/cisco/common/cisco_exceptions.py
diff --git a/quantum/plugins/cisco/cisco_utils.py b/quantum/plugins/cisco/common/cisco_utils.py
similarity index 89%
rename from quantum/plugins/cisco/cisco_utils.py
rename to quantum/plugins/cisco/common/cisco_utils.py
index bd0b257d5..8d0d803b3 100644
--- a/quantum/plugins/cisco/cisco_utils.py
+++ b/quantum/plugins/cisco/common/cisco_utils.py
@@ -23,9 +23,9 @@ import sys
 import traceback
 
 from quantum.common import exceptions as exc
-from quantum.plugins.cisco import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_configuration as conf
+from quantum.plugins.cisco.common import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_credentials as cred
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
diff --git a/quantum/plugins/cisco/l2network_plugin.py b/quantum/plugins/cisco/l2network_plugin.py
index 47f63874e..8be63bb06 100644
--- a/quantum/plugins/cisco/l2network_plugin.py
+++ b/quantum/plugins/cisco/l2network_plugin.py
@@ -20,13 +20,13 @@
 import logging as LOG
 
 from quantum.common import exceptions as exc
-from quantum.plugins.cisco import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
-from quantum.plugins.cisco import cisco_exceptions as cexc
-from quantum.plugins.cisco import cisco_nexus_plugin
-from quantum.plugins.cisco import cisco_ucs_plugin
-from quantum.plugins.cisco import cisco_utils as cutil
+from quantum.plugins.cisco.common import cisco_configuration as conf
+from quantum.plugins.cisco.common import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
+from quantum.plugins.cisco.nexus import cisco_nexus_plugin
+from quantum.plugins.cisco.ucs import cisco_ucs_plugin
+from quantum.plugins.cisco.common import cisco_utils as cutil
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
diff --git a/quantum/plugins/cisco/cisco_nexus_plugin.py b/quantum/plugins/cisco/nexus/cisco_nexus_plugin.py
similarity index 93%
rename from quantum/plugins/cisco/cisco_nexus_plugin.py
rename to quantum/plugins/cisco/nexus/cisco_nexus_plugin.py
index 545499fe9..9d55115ab 100644
--- a/quantum/plugins/cisco/cisco_nexus_plugin.py
+++ b/quantum/plugins/cisco/nexus/cisco_nexus_plugin.py
@@ -19,11 +19,11 @@
 import logging as LOG
 
 from quantum.common import exceptions as exc
-from quantum.plugins.cisco import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
-from quantum.plugins.cisco import cisco_exceptions as cexc
-from quantum.plugins.cisco import cisco_utils as cutil
+from quantum.plugins.cisco.common import cisco_configuration as conf
+from quantum.plugins.cisco.common import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
+from quantum.plugins.cisco.common import cisco_utils as cutil
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
diff --git a/quantum/plugins/cisco/nxosapi.py b/quantum/plugins/cisco/nexus/nxosapi.py
similarity index 100%
rename from quantum/plugins/cisco/nxosapi.py
rename to quantum/plugins/cisco/nexus/nxosapi.py
diff --git a/quantum/plugins/cisco/cisco_ucs_network_driver.py b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
similarity index 98%
rename from quantum/plugins/cisco/cisco_ucs_network_driver.py
rename to quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
index ca912edf9..593706e3d 100644
--- a/quantum/plugins/cisco/cisco_ucs_network_driver.py
+++ b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
@@ -27,9 +27,9 @@ import subprocess
 from xml.etree import ElementTree as et
 import urllib
 
-from quantum.plugins.cisco import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
-from quantum.plugins.cisco import cisco_exceptions as cexc
+from quantum.plugins.cisco.common import cisco_configuration as conf
+from quantum.plugins.cisco.common import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
diff --git a/quantum/plugins/cisco/cisco_ucs_plugin.py b/quantum/plugins/cisco/ucs/cisco_ucs_plugin.py
similarity index 96%
rename from quantum/plugins/cisco/cisco_ucs_plugin.py
rename to quantum/plugins/cisco/ucs/cisco_ucs_plugin.py
index 52195a555..264d14f78 100644
--- a/quantum/plugins/cisco/cisco_ucs_plugin.py
+++ b/quantum/plugins/cisco/ucs/cisco_ucs_plugin.py
@@ -20,12 +20,12 @@
 import logging as LOG
 
 from quantum.common import exceptions as exc
-from quantum.plugins.cisco import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
-from quantum.plugins.cisco import cisco_exceptions as cexc
-from quantum.plugins.cisco import cisco_ucs_network_driver
-from quantum.plugins.cisco import cisco_utils as cutil
+from quantum.plugins.cisco.common import cisco_configuration as conf
+from quantum.plugins.cisco.common import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
+from quantum.plugins.cisco.ucs import cisco_ucs_network_driver
+from quantum.plugins.cisco.common import cisco_utils as cutil
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
diff --git a/quantum/plugins/cisco/get-vif.py b/quantum/plugins/cisco/ucs/get-vif.py
similarity index 100%
rename from quantum/plugins/cisco/get-vif.py
rename to quantum/plugins/cisco/ucs/get-vif.py
diff --git a/quantum/plugins/cisco/get-vif.sh b/quantum/plugins/cisco/ucs/get-vif.sh
similarity index 100%
rename from quantum/plugins/cisco/get-vif.sh
rename to quantum/plugins/cisco/ucs/get-vif.sh