]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Earlier fix resulted in a different issue (profile client name, was also being used...
authorSumit Naiksatam <snaiksat@cisco.com>
Wed, 3 Aug 2011 01:39:51 +0000 (18:39 -0700)
committerSumit Naiksatam <snaiksat@cisco.com>
Wed, 3 Aug 2011 01:39:51 +0000 (18:39 -0700)
quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py

index 9383f9b9650117979e1732d5d5c15015f551b93b..be1c89e22368a62b49fda13acbedf2853104798e 100644 (file)
@@ -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,