Changed the directory structure to a more organized one.

Fixed the imports to reflect the new structure.

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
+common/cisco_configuration.py
-cisco_constants.py
+common/cisco_constants.py
-cisco_credentials.py
+common/cisco_credentials.py
-cisco_exceptions.py
+common/cisco_exceptions.py
-cisco_nexus_plugin.py
+nexus/cisco_nexus_plugin.py
-cisco_ucs_network_driver.py
+ucs/cisco_ucs_network_driver.py
-cisco_ucs_plugin.py
+ucs/cisco_ucs_plugin.py
-cisco_utils.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

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)

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.common import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_credentials as cred
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)

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.common import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_credentials as cred
-from quantum.plugins.cisco import cisco_exceptions as cexc
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
-from quantum.plugins.cisco import cisco_nexus_plugin
+from quantum.plugins.cisco.nexus import cisco_nexus_plugin
-from quantum.plugins.cisco import cisco_ucs_plugin
+from quantum.plugins.cisco.ucs import cisco_ucs_plugin
-from quantum.plugins.cisco import cisco_utils as cutil
+from quantum.plugins.cisco.common import cisco_utils as cutil
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)

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.common import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_credentials as cred
-from quantum.plugins.cisco import cisco_exceptions as cexc
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
-from quantum.plugins.cisco import cisco_utils as cutil
+from quantum.plugins.cisco.common import cisco_utils as cutil
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)

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.common import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco import cisco_exceptions as cexc
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)

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.common import cisco_configuration as conf
-from quantum.plugins.cisco import cisco_constants as const
+from quantum.plugins.cisco.common import cisco_constants as const
-from quantum.plugins.cisco import cisco_credentials as cred
+from quantum.plugins.cisco.common import cisco_credentials as cred
-from quantum.plugins.cisco import cisco_exceptions as cexc
+from quantum.plugins.cisco.common import cisco_exceptions as cexc
-from quantum.plugins.cisco import cisco_ucs_network_driver
+from quantum.plugins.cisco.ucs import cisco_ucs_network_driver
-from quantum.plugins.cisco import cisco_utils as cutil
+from quantum.plugins.cisco.common import cisco_utils as cutil
 
 LOG.basicConfig(level=LOG.WARN)
 LOG.getLogger(const.LOGGER_COMPONENT_NAME)