Dont extract null values from custom fields (nb_inventory) (#1184)

Author: mulmat

plugins/inventory/nb_inventory.py

@@ -899,7 +899,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
 

tests/unit/inventory/test_data/extract_custom_fields/data.json

@@ -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
+        }
+    }
+]

tests/unit/inventory/test_nb_inventory.py

@@ -249,3 +249,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