Merge pull request #40 from wvandeun/fix_nornir_defaults

Fix nornir inventory defaults

nornir_nautobot/plugins/inventory/nautobot.py

@@ -24,7 +24,8 @@
 logger = logging.getLogger(__name__)
 
 
-def _set_host(data: Dict[str, Any], name: str, groups, host, host_platform) -> Host:
+def _set_host(data: Dict[str, Any], name: str, groups, host, defaults: Defaults) -> Host:
+    host_platform = getattr(data["pynautobot_object"].platform, "slug", None)
     connection_option = {}
     for key, value in data.get("connection_options", {}).items():
         connection_option[key] = ConnectionOptions(
@@ -44,6 +45,7 @@ def _set_host(data: Dict[str, Any], name: str, groups, host, host_platform) -> H
         platform=host_platform,
         data=data,
         groups=groups,
+        defaults=defaults,
         connection_options=connection_option,
     )
 
@@ -160,7 +162,7 @@ def load(self) -> Inventory:
                 name=host["name"],
                 groups=host["groups"],
                 host=host,
-                host_platform=getattr(device.platform, "slug", None),
+                defaults=defaults,
             )
 
         return Inventory(hosts=hosts, groups=groups, defaults=defaults)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nornir-nautobot"
-version = "2.1.1"
+version = "2.1.2"
 description = "Nornir Nautobot"
 authors = ["Network to Code, LLC <[email protected]>"]
 readme = "README.md"

tests/unit/test_nautobot_inventory.py

@@ -186,6 +186,30 @@ def test_nornir_nautobot_device_count():
     assert len(test_nornir.inventory.hosts) == 3
 
 
+def test_nornir_nautobot_with_defaults():
+    """
+    Tests that nornir defaults are getting applied to NautobotInventory hosts
+    """
+    with Mocker() as mock:
+        load_api_calls(mock)
+        nr_obj = InitNornir(
+            inventory={
+                "plugin": "NautobotInventory",
+                "options": {
+                    "nautobot_url": "http://mock.example.com",
+                    "nautobot_token": "0123456789abcdef01234567890",
+                    "pynautobot_dict": False,
+                },
+            },
+            logging={"enabled": False},
+        )
+        nr_obj.inventory.defaults.username = "username"
+        nr_obj.inventory.defaults.password = "password"
+
+        assert nr_obj.inventory.hosts["den-dist01"].username == nr_obj.inventory.defaults.username
+        assert nr_obj.inventory.hosts["den-dist02"].password == nr_obj.inventory.defaults.password
+
+
 @pytest.mark.parametrize(
     "device, expected_platform", [("den-dist01", None), ("den-wan01", "ios"), ("den-dist02", "ios")]
 )