Improve naming of some methods and variable in library/decort_account_info.py and module_utils/decort_utils.py

This commit is contained in:
2024-07-21 10:11:57 +03:00
parent ced031bba8
commit 8e4ce18d8a
2 changed files with 103 additions and 102 deletions

View File

@@ -2026,9 +2026,9 @@ class DecortController(object):
def account_find(self, account_name: str, account_id=0,
resource_consumption=False,
resource_groups_params: None | dict = None,
computes_params: None | dict = None,
vinses_params: None | dict = None,
resource_groups_args: None | dict = None,
computes_args: None | dict = None,
vinses_args: None | dict = None,
fail_if_not_found=False):
"""
Find account specified by account ID or name and return
@@ -2045,22 +2045,22 @@ class DecortController(object):
the call will be added to
account info dict (key `resource_consumption`).
@param (None | dict) resource_groups_params: If dict is
@param (None | dict) resource_groups_args: If dict is
specified, then the method `account_resource_groups`
will be called passing founded account ID
and `**resource_groups_params`. Result of the call will
and `**resource_groups_args`. Result of the call will
be added to account info dict (key `resource_groups`).
@param (None | dict) computes_params: If dict is
@param (None | dict) computes_args: If dict is
specified, then the method `account_computes`
will be called passing founded account ID
and `**computes_params`. Result of the call will
and `**computes_args`. Result of the call will
be added to account info dict (key `computes`).
@param (None | dict) vinses_params: If dict is
@param (None | dict) vinses_args: If dict is
specified, then the method `account_vinses`
will be called passing founded account ID
and `**vinses_params`. Result of the call will
and `**vinses_args`. Result of the call will
be added to account info dict (key `vinses`).
@param (bool) fail_if_not_found: If `True` is specified, then
@@ -2143,24 +2143,24 @@ class DecortController(object):
account_details['resource_reserved'] =\
resource_consumption['Reserved']
if resource_groups_params is not None:
if resource_groups_args is not None:
account_details['resource_groups'] =\
self.account_resource_groups(
account_id=account_details['id'],
**resource_groups_params
**resource_groups_args
)
if computes_params is not None:
if computes_args is not None:
account_details['computes'] =\
self.account_computes(
account_id=account_details['id'],
**computes_params
**computes_args
)
if vinses_params is not None:
if vinses_args is not None:
account_details['vinses'] = self.account_vinses(
account_id=account_details['id'],
**vinses_params
**vinses_args
)
return account_details['id'], account_details