Refactor DecortController.account_find method
This commit is contained in:
@@ -1981,39 +1981,38 @@ class DecortController(object):
|
||||
if api_resp.status_code == 200:
|
||||
account_details = api_resp.json()
|
||||
|
||||
if account_details:
|
||||
account_details['createdTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['createdTime']
|
||||
)
|
||||
account_details['deactivationTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['deactivationTime']
|
||||
)
|
||||
account_details['deletedTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['deletedTime']
|
||||
)
|
||||
account_details['updatedTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['updatedTime']
|
||||
)
|
||||
|
||||
if resource_consumption:
|
||||
resource_consumption = self.account_resource_consumption(
|
||||
account_id=account_details['id'],
|
||||
fail_if_not_found=True
|
||||
)
|
||||
account_details['resource_consumed'] =\
|
||||
resource_consumption['Consumed']
|
||||
account_details['resource_reserved'] =\
|
||||
resource_consumption['Reserved']
|
||||
|
||||
return account_details['id'], account_details
|
||||
else:
|
||||
if not account_details:
|
||||
if fail_if_not_found:
|
||||
self.result['msg'] = ("Current user does not have access to"
|
||||
" the requested account or non-existent"
|
||||
" account specified.")
|
||||
self.amodule.fail_json(**self.result)
|
||||
else:
|
||||
return 0, None
|
||||
return 0, None
|
||||
|
||||
account_details['createdTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['createdTime']
|
||||
)
|
||||
account_details['deactivationTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['deactivationTime']
|
||||
)
|
||||
account_details['deletedTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['deletedTime']
|
||||
)
|
||||
account_details['updatedTime_readable'] = self.sec_to_dt_str(
|
||||
account_details['updatedTime']
|
||||
)
|
||||
|
||||
if resource_consumption:
|
||||
resource_consumption = self.account_resource_consumption(
|
||||
account_id=account_details['id'],
|
||||
fail_if_not_found=True
|
||||
)
|
||||
account_details['resource_consumed'] =\
|
||||
resource_consumption['Consumed']
|
||||
account_details['resource_reserved'] =\
|
||||
resource_consumption['Reserved']
|
||||
|
||||
return account_details['id'], account_details
|
||||
|
||||
def account_resource_consumption(self, account_id: int,
|
||||
fail_if_not_found=False) -> None | dict:
|
||||
|
||||
Reference in New Issue
Block a user