Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions lib/pan/xapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -603,22 +603,26 @@ def keygen(self, extra_qs=None):
if extra_qs is not None:
query = self.__merge_extra_qs(query, extra_qs)

response = self.__api_request(query)
if not response:
raise PanXapiError(self.status_detail)
try:
response = self.__api_request(query)
if not response:
raise PanXapiError(self.status_detail)

if not self.__set_response(response):
raise PanXapiError(self.status_detail)
if not self.__set_response(response):
raise PanXapiError(self.status_detail)

if self.element_result is None:
raise PanXapiError('keygen(): result element not found')
element = self.element_result.find('key')
if element is None:
raise PanXapiError('keygen(): key element not found')
if self.element_result is None:
raise PanXapiError('keygen(): result element not found')
element = self.element_result.find('key')
if element is None:
raise PanXapiError('keygen(): key element not found')

self.api_key = element.text
self.api_key = element.text

return self.api_key
return self.api_key
finally:
if isinstance(query, dict) and 'password' in query:
del query['password']

@staticmethod
def __qs_to_dict(qs):
Expand Down