a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ovirt: Return also nested attributes of structs (#49239) 

Previously we returned only nested attributes of the lists not of the
structs, this patch fixes it.

Signed-off-by: Ondra Machacek <omachace@redhat.com>
pull/4420/head
Ondra Machacek 2018-12-12 11:39:31 +01:00 committed by ansibot
parent 1b9b0b85c4
commit 9d965906bd
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ansible/module_utils/ovirt.py
View File

@ -71,7 +71,21 @@ def get_dict_of_struct(struct, connection=None, fetch_nested=False, attributes=N
nested = False nested = False
if isinstance(value, sdk.Struct): if isinstance(value, sdk.Struct):
if not fetch_nested or not value.href:
return get_dict_of_struct(value) return get_dict_of_struct(value)
# Fetch nested values of struct:
try:
value = connection.follow_link(value)
except sdk.Error:
value = None
nested_obj = dict(
(attr, convert_value(getattr(value, attr)))
for attr in attributes if getattr(value, attr, None)
)
nested_obj['id'] = getattr(value, 'id', None)
nested_obj['href'] = getattr(value, 'href', None)
return nested_obj
elif isinstance(value, Enum) or isinstance(value, datetime): elif isinstance(value, Enum) or isinstance(value, datetime):
return str(value) return str(value)
elif isinstance(value, list) or isinstance(value, sdk.List): elif isinstance(value, list) or isinstance(value, sdk.List):