@@ -148,25 +148,24 @@ def __createApiClient(self):
148148 "Client Creation Failed" )
149149 return FAILED
150150
151+ user_id = list_user_res [0 ].id
151152 getuser_keys = getUserKeys .getUserKeysCmd ()
152- getuser_keys .id = list_user_res [ 0 ]. id
153+ getuser_keys .id = user_id
153154 getuser_keys_res = self .__apiClient .getUserKeys (getuser_keys )
154- user_id = list_user_res [0 ].id
155155
156- if getuser_keys_res is None :
156+ if getuser_keys_res [ 'apikey' ] is None :
157157 ret = self .__getKeys (user_id )
158- if ret != FAILED :
159- mgmt_details .apiKey = ret [0 ]
160- mgmt_details .securityKey = ret [1 ]
161- else :
158+ if ret == FAILED :
162159 self .__logger .error ("__createApiClient: API Client "
163160 "Creation Failed while "
164161 "Registering User" )
165162 return FAILED
163+ mgmt_details .apiKey = ret [0 ]
164+ mgmt_details .securityKey = ret [1 ]
166165 else :
167166 mgmt_details .port = 8080
168- mgmt_details .apiKey = getuser_keys_res [0 ]. apikey
169- mgmt_details .securityKey = getuser_keys_res [0 ]. secretkey
167+ mgmt_details .apiKey = getuser_keys_res [' apikey' ]
168+ mgmt_details .securityKey = getuser_keys_res [' secretkey' ]
170169 '''
171170 Now Create the Connection objects and Api Client using
172171 new details
@@ -220,11 +219,11 @@ def __getKeys(self, userid):
220219 getuser_keys_res = self .__apiClient .getUserKeys (getuser_keys )
221220 if getuser_keys_res is None :
222221 self .__logger .error ("__createApiClient: API "
223- "Client Creation Failed" )
222+ "Client Creation Failed" )
224223 return FAILED
225224
226- api_key = getuser_keys_res [0 ]. apikey
227- security_key = getuser_keys_res [0 ]. secretkey
225+ api_key = getuser_keys_res [' apikey' ]
226+ security_key = getuser_keys_res [' secretkey' ]
228227 return (api_key , security_key )
229228 except Exception as e :
230229 self .__logger .exception ("Exception Occurred Under __geKeys : "
0 commit comments