From: Sumit Naiksatam <snaiksat@cisco.com>
Date: Wed, 3 Aug 2011 01:39:51 +0000 (-0700)
Subject: Earlier fix resulted in a different issue (profile client name, was also being used... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=33ee4cabd061ba696c227289bea932e57a865554;p=openstack-build%2Fneutron-build.git

Earlier fix resulted in a different issue (profile client name, was also being used as profile name, hence breaking).
---

diff --git a/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
index 9383f9b96..be1c89e22 100644
--- a/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
+++ b/quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
@@ -158,9 +158,9 @@ class CiscoUCSMDriver():
         data = data.replace(VLAN_NAME, vlan_name)
         return data
 
-    def _create_profile_client_post_data(self, profile_name):
+    def _create_profile_client_post_data(self, profile_name, profile_client_name):
         data = ASSOCIATE_PROFILE.replace(PROFILE_NAME, profile_name)
-        data = data.replace(PROFILE_CLIENT, profile_name)
+        data = data.replace(PROFILE_CLIENT, profile_client_name)
         return data
 
     def _change_vlan_in_profile_post_data(self, profile_name, old_vlan_name,
@@ -198,7 +198,7 @@ class CiscoUCSMDriver():
                        ucsm_password):
         data = self._create_profile_post_data(profile_name, vlan_name)
         self._post_data(ucsm_ip, ucsm_username, ucsm_password, data)
-        data = self._create_profile_client_post_data(profile_name[-16:])
+        data = self._create_profile_client_post_data(profile_name, profile_name[-16:])
         self._post_data(ucsm_ip, ucsm_username, ucsm_password, data)
 
     def change_vlan_in_profile(self, profile_name, old_vlan_name,