nornir-collection 0.0.22__tar.gz → 0.0.24__tar.gz

{nornir_collection-0.0.22 → nornir_collection-0.0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nornir-collection
-Version: 0.0.22
+Version: 0.0.24
 Summary: Nornir-Collection contains network automation functions and complete IaC workflows with         Nornir and other python libraries. It contains Nornir tasks and general functions in Nornir style.
 Author: Willi Kubny
 Author-email: willi.kubny@gmail.ch

{nornir_collection-0.0.22 → nornir_collection-0.0.24}/nornir_collection/cisco/configuration_management/netconf/config_tasks.py

@@ -413,6 +413,7 @@ def nc_edit_tpl_int_config(task: Task, tpl_startswith: str, verbose: bool = Fals
 
     #### Configure each interface with the Jinja2 rendered template #########################################
 
+    j2_task_text = "Render Jinja2 NETCONF interface payload template"
     # Track if the overall task has failed
     task_failed = False
     # The custom_result list will be filled with the result of each interface
@@ -426,33 +427,44 @@ def nc_edit_tpl_int_config(task: Task, tpl_startswith: str, verbose: bool = Fals
     for interface in interfaces:
         # Set the interface template name
         tpl_name = interface["int_template"]
-        tpl_path = task.host[tpl_name]
-
-        # Add additional interface data for Jinja2 **kwargs
-        interface = add_interface_data(task=task, interface=interface)
-        # Extract the interface name and the interface number into a variable and add the current
-        # interface details for the Jinja2 **kwargs
-        j2_kwargs = {
-            "interface": {
-                "interface_name": extract_interface_name(interface["name"]),
-                "interface_number": extract_interface_number(interface["name"]),
-                **interface,
+        # Check if the interface template name is in the host inventory
+        if tpl_name in task.host:
+            # Set the interface template path
+            tpl_path = task.host[tpl_name]
+
+            # Add additional interface data for Jinja2 **kwargs
+            interface = add_interface_data(task=task, interface=interface)
+            # Extract the interface name and the interface number into a variable and add the current
+            # interface details for the Jinja2 **kwargs
+            j2_kwargs = {
+                "interface": {
+                    "interface_name": extract_interface_name(interface["name"]),
+                    "interface_number": extract_interface_number(interface["name"]),
+                    **interface,
+                }
             }
-        }
 
-        # Render the Jinja2 payload template and configure the NETCONF candidate datastore
-        custom_result, task_failed = netconf_configure_jinja2_rendered_payload_template(
-            task=task,
-            j2_task_text="Render Jinja2 NETCONF interface payload template",
-            j2_tpl_path=tpl_path,
-            custom_result=custom_result,
-            task_failed=task_failed,
-            info_msg=tpl_path,
-            verbose=verbose,
-            int_name=interface["name"],
-            j2_tpl_name=tpl_name,
-            j2_kwargs=j2_kwargs,
-        )
+            # Render the Jinja2 payload template and configure the NETCONF candidate datastore
+            custom_result, task_failed = netconf_configure_jinja2_rendered_payload_template(
+                task=task,
+                j2_task_text=j2_task_text,
+                j2_tpl_path=tpl_path,
+                custom_result=custom_result,
+                task_failed=task_failed,
+                info_msg=tpl_path,
+                verbose=verbose,
+                int_name=interface["name"],
+                j2_tpl_name=tpl_name,
+                j2_kwargs=j2_kwargs,
+            )
+        # Else the interface template name is not in the host inventory
+        else:
+            custom_result.append(
+                f"{task_result(text=j2_task_text, changed=False, level_name='ERROR', failed=True)}\n"
+                f"'{interface['name']} ({tpl_name})' -> NornirResponse <Success: False>\n"
+                f"-> Interface template '{tpl_name}' not found in the host inventory"
+            )
+            task_failed = True
 
     # Return the Nornir NETCONF result
     return Result(host=task.host, custom_result=custom_result, failed=task_failed)

{nornir_collection-0.0.22 → nornir_collection-0.0.24}/nornir_collection/netbox/inventory.py

@@ -91,8 +91,8 @@ def _load_interface_data(task: Task, all_interfaces: List[Dict], enrich_vlan_dat
     # Dict keys for comprehension to include only some key-value pairs
     # fmt: off
     include_keys = [
-        "name", "int_template", "description", "type", "lag", "count_ipaddresses",
-        "count_fhrp_groups", "int_peer_device", "int_config_context", "enabled",
+        "name", "int_template", "description", "type", "lag", "mode", "untagged_vlan", "tagged_vlans",
+        "count_ipaddresses", "count_fhrp_groups", "int_peer_device", "int_config_context", "enabled",
     ]
     # fmt: on
     # Make some normalization to the device interfaces data with the interface_filter list and others

{nornir_collection-0.0.22 → nornir_collection-0.0.24}/nornir_collection.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nornir-collection
-Version: 0.0.22
+Version: 0.0.24
 Summary: Nornir-Collection contains network automation functions and complete IaC workflows with         Nornir and other python libraries. It contains Nornir tasks and general functions in Nornir style.
 Author: Willi Kubny
 Author-email: willi.kubny@gmail.ch

{nornir_collection-0.0.22 → nornir_collection-0.0.24}/setup.py

@@ -11,7 +11,7 @@ with open("requirements.txt", encoding="utf-8") as f:
 
 setuptools.setup(
     name="nornir-collection",
-    version="0.0.22",
+    version="0.0.24",
     author="Willi Kubny",
     author_email="willi.kubny@gmail.ch",
     description="Nornir-Collection contains network automation functions and complete IaC workflows with \