Skip to content
Merged
Show file tree
Hide file tree
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
6 changes: 5 additions & 1 deletion plugins/inventory/nb_inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,11 @@ def extract_interfaces(self, host):

def extract_custom_fields(self, host):
try:
return host["custom_fields"]
return {
key: value
for key, value in host["custom_fields"].items()
if value is not None
}
except Exception:
return

Expand Down
21 changes: 21 additions & 0 deletions tests/unit/inventory/test_data/extract_custom_fields/data.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[
{
"custom_fields": {
"a_text_value": "value1",
"a_bool_value": false
},
"expected": {
"a_text_value": "value1",
"a_bool_value": false
}
},
{
"custom_fields": {
"an_unset_value": null,
"a_set_value": false
},
"expected": {
"a_set_value": false
}
}
]
11 changes: 11 additions & 0 deletions tests/unit/inventory/test_nb_inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,3 +246,14 @@ def test_new_token(inventory_fixture, templar_fixture):

assert "Authorization" in inventory_fixture.headers
assert inventory_fixture.headers["Authorization"] == "Foo bar"


@pytest.mark.parametrize(
"custom_fields, expected", load_relative_test_data("extract_custom_fields")
)
def test_extract_custom_fields(inventory_fixture, custom_fields, expected):
extracted_custom_fields = inventory_fixture.extract_custom_fields(
{"custom_fields": custom_fields}
)

assert extracted_custom_fields == expected