Skip to content

Commit 1089c02

Browse files
Merge pull request #45 from NilashishC/master
Fix empty handling in facts base Reviewed-by: Nilashish Chakraborty <[email protected]> https://github.com/NilashishC
2 parents ed55214 + e3f468a commit 1089c02

File tree

3 files changed

+3
-3
lines changed
  • rmb_tests/roles/my_role
  • roles/scaffold_rm_facts/templates/module_utils/network_os/facts

3 files changed

+3
-3
lines changed

rmb_tests/roles/my_role/library/myos_facts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
myos.facts.facts import Facts
1515

1616
ANSIBLE_METADATA = {'metadata_version': '1.1',
17-
'status': ['preview'],
17+
'status': [u'preview'],
1818
'supported_by': '<support_group>'}
1919

2020

rmb_tests/roles/my_role/module_utils/network/myos/facts/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def generate_final_config(self, cfg_dict):
111111
child_val = self.generate_final_config(val)
112112
if child_val:
113113
dct = {key: child_val}
114-
elif val is not None:
114+
elif val not in [None, [], {}, (), '']:
115115
dct = {key: val}
116116
if dct:
117117
final_cfg.update(dct)

roles/scaffold_rm_facts/templates/module_utils/network_os/facts/base.py.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class FactsBase(object):
111111
child_val = self.generate_final_config(val)
112112
if child_val:
113113
dct = {key: child_val}
114-
elif val is not None:
114+
elif val not in [None, [], {}, (), '']:
115115
dct = {key: val}
116116
if dct:
117117
final_cfg.update(dct)

0 commit comments

Comments
 (0)