Changing communication between UCSM driver to UCSM to HTTPS.

diff --git a/quantum/plugins/cisco/README b/quantum/plugins/cisco/README
index f642c67789eaf7fa7a1222fc2cfa86cb30b549cf..a10181ea3e2cfa68a24219915d75524e177e8e97 100755 (executable)
--- a/quantum/plugins/cisco/README
+++ b/quantum/plugins/cisco/README
@@ -127,20 +127,13 @@ provider = quantum.plugins.cisco.l2network_plugin.L2Network
           API instead of the Quantum create port API. More details on using the\r
           multiport extension follow in the section on multi NIC support.\r
 \r
-4.  Disable http redirect on the UCS Fabric Interconnect (61xx). Log into the switch\r
-    using ssh and then enter the following commands:\r
-\r
-# scope system \r
-6120-1-A /system # scope services\r
-6120-1-A /system/services # disable http-redirect\r
-\r
-5.  If you want to turn on support for Cisco Nexus switches:\r
-    5a.  Uncomment the nexus_plugin property in \r
+4.  If you want to turn on support for Cisco Nexus switches:\r
+    4a.  Uncomment the nexus_plugin property in \r
          quantum/plugins/cisco/conf/plugins.ini to read:\r
 \r
 nexus_plugin=quantum.plugins.cisco.nexus.cisco_nexus_plugin.NexusPlugin\r
 \r
-    5b.  Enter the relevant configuration in the \r
+    4b.  Enter the relevant configuration in the \r
          quantum/plugins/cisco/conf/nexus.ini file.  Example:\r
 \r
 [SWITCH]\r
@@ -159,7 +152,7 @@ nexus_ssh_port=22
 [DRIVER]\r
 name=quantum.plugins.cisco.nexus.cisco_nexus_network_driver.CiscoNEXUSDriver\r
 \r
-    5c.  Make sure that SSH host key of the Nexus switch is known to the\r
+    4c.  Make sure that SSH host key of the Nexus switch is known to the\r
          host on which you are running the Quantum service.  You can do\r
          this simply by logging in to your Quantum host as the user that\r
          Quantum runs as and SSHing to the switch at least once.  If the\r
@@ -167,22 +160,22 @@ name=quantum.plugins.cisco.nexus.cisco_nexus_network_driver.CiscoNEXUSDriver
          clearing of the SSH config on the switch), you may need to repeat\r
          this step and remove the old hostkey from ~/.ssh/known_hosts.\r
          \r
-6.  Plugin Persistence framework setup:\r
-    6a.  Create quantum_l2network database in mysql with the following command -\r
+5.  Plugin Persistence framework setup:\r
+    5a.  Create quantum_l2network database in mysql with the following command -\r
        \r
 mysql -u<mysqlusername> -p<mysqlpassword> -e "create database quantum_l2network"\r
 \r
-    6b.  Enter the quantum_l2network database configuration info in the \r
+    5b.  Enter the quantum_l2network database configuration info in the \r
          quantum/plugins/cisco/conf/db_conn.ini file.\r
          \r
-    6c.  If there is a change in the plugin configuration, service would need \r
+    5c.  If there is a change in the plugin configuration, service would need \r
          to be restarted after dropping and re-creating the database using\r
          the following commands -\r
 \r
 mysql -u<mysqlusername> -p<mysqlpassword> -e "drop database quantum_l2network"\r
 mysql -u<mysqlusername> -p<mysqlpassword> -e "create database quantum_l2network"\r
 \r
-7.  Verify that you have the correct credentials for each IP address listed\r
+6.  Verify that you have the correct credentials for each IP address listed\r
     in quantum/plugins/cisco/conf/credentials.ini.  Example:\r
 \r
 # Provide the UCSM credentials, create a separte entry for each UCSM used in your system\r
@@ -201,7 +194,7 @@ password=mySecretPasswordForNexus
     has a credential entry in the above file. This is required for the system to\r
     be able to communicate with those switches.\r
 \r
-8.  Configure the UCS systems' information in your deployment by editing the\r
+7.  Configure the UCS systems' information in your deployment by editing the\r
     quantum/plugins/cisco/conf/ucs_inventory.ini file. You can configure multiple\r
     UCSMs per deployment, multiple chassis per UCSM, and multiple blades per\r
     chassis. Chassis ID and blade ID can be obtained from the UCSM (they will\r
@@ -233,7 +226,7 @@ blade_id = <put_blade_id_here>
 host_name = <put_hostname_here>\r
 \r
 \r
-9.  Start the Quantum service.  If something doesn't work, verify that\r
+8.  Start the Quantum service.  If something doesn't work, verify that\r
     your configuration of each of the above files hasn't gone a little kaka.\r
     Once you've put right what once went wrong, leap on.\r
 \r

diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
index 6a4f691f54b6e3d70e51b04ab0c7b893e880598c..ba3a125a0195967fdb07cb1be78415e44a1a609c 100644 (file)
--- a/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
+++ b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
@@ -145,7 +145,7 @@ class CiscoUCSMDriver():
 
     def _post_data(self, ucsm_ip, ucsm_username, ucsm_password, data):
         """Send command to UCSM in http request"""
-        conn = httplib.HTTPConnection(ucsm_ip)
+        conn = httplib.HTTPSConnection(ucsm_ip)
         login_data = "<aaaLogin inName=\"" + ucsm_username + \
         "\" inPassword=\"" + ucsm_password + "\" />"
         conn.request(METHOD, URL, login_data, HEADERS)