nornir-collection 0.0.25__tar.gz → 0.0.27__tar.gz

{nornir_collection-0.0.25 → nornir_collection-0.0.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nornir-collection
-Version: 0.0.25
+Version: 0.0.27
 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.25 → nornir_collection-0.0.27}/nornir_collection/cisco/configuration_management/utils.py

@@ -234,9 +234,7 @@ def add_interface_data(task: Task, interface: dict) -> dict:
     """
     # If the interface is part of a Port-channel
     if "lag" in interface and interface["lag"] is not None:
-        # Set the int_config_context of the Port-channel to the int_config_context of the interface
         po_interface = [i for i in task.host["interfaces"] if i["name"] == interface["lag"]["name"]]
-        interface["int_config_context"] = po_interface[0]["int_config_context"]
         interface["description"] = po_interface[0]["description"]
         interface["portchannel_number"] = extract_interface_number(interface["lag"]["name"])
 

{nornir_collection-0.0.25 → nornir_collection-0.0.27}/nornir_collection/netbox/inventory.py

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

{nornir_collection-0.0.25 → nornir_collection-0.0.27}/nornir_collection/netbox/update_prefixes_ip_addresses.py

@@ -306,6 +306,24 @@ def nmap_scan_host_ip_or_subnet(hosts: str) -> list:
     return nmap_scan_result
 
 
+def nmap_double_check_ips(ip_list: dict) -> list:
+    """
+    TBD
+    """
+    verified_ips = []
+    # Nmap scan ip-addresses of the maybe_delete_ips list
+    for ip in ip_list:
+        # Scan the prefix with nmap
+        scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
+        # Add the nmap scan result to the inactive_ips list with the ID of the ip-address
+        if scan_result:
+            # As a single ip-address is scanned the scan_result can have only one list item
+            verified_ips.append({"id": ip["id"], **scan_result[0]})
+
+    # Return the verified ip-addresses list
+    return verified_ips
+
+
 def get_ipfabric_data_for_prefix(prefix: dict) -> tuple:
     """
     TBD
@@ -568,18 +586,9 @@ def delete_inactive_auto_discovered_ip_addresses(
     task_text = "Delete Auto-Discovered IP-Addresses"
 
     # Delete the ip-addresses with the status 'auto_discovered' that are not in the datasource list
-    maybe_delete_ips = create_ip_list(
+    delete_ips = create_ip_list(
         loop_list=prefix["discovered_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
-    delete_ips = []
-    if maybe_delete_ips:
-        # Nmap scan ip-addresses of the maybe_delete_ips list
-        for ip in maybe_delete_ips:
-            # Scan the prefix with nmap
-            scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
-            # Add the nmal scan result to the inactive_ips list
-            if scan_result:
-                delete_ips.extend(scan_result)
 
     # If ip-addresses have been found
     if delete_ips:
@@ -659,14 +668,9 @@ def update_inactive_ip_addresses(nb_url: str, prefix: dict, ds: Literal["nmap",
     maybe_active_ips = create_ip_list(
         loop_list=prefix["inactive_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
-    if maybe_active_ips:
-        # Nmap scan ip-addresses of the maybe_inactive_ips list
-        for ip in maybe_active_ips:
-            # Scan the prefix with nmap
-            scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
-            # Add the nmal scan result to the inactive_ips list
-            if scan_result:
-                active_ips.extend(scan_result)
+    # Nmap scan ip-addresses of the maybe_active_ips list
+    nmap_result = nmap_double_check_ips(ip_list=maybe_active_ips)
+    active_ips.extend(nmap_result)
 
     # If ip-addresses have been found
     if active_ips:
@@ -722,23 +726,18 @@ def update_active_ip_addresses(
             resp=resp, nb_type="ip", data=active_ips, ds=ds, task_text=task_text, text=text
         )
         result.extend(sub_result)
-        failed = True if sub_failed else failed
+        if sub_failed:
+            failed = True
+            result.append(f"-> Payload:\n{payload}")
 
     # Update the ip-addresses with the status 'active' that are not part of the datacenter list
     maybe_inactive_ips = create_ip_list(
         loop_list=prefix["active_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
-    inactive_ips = []
-    if maybe_inactive_ips:
-        # Nmap scan ip-addresses of the maybe_inactive_ips list
-        for ip in maybe_inactive_ips:
-            # Scan the prefix with nmap
-            scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
-            # Add the nmal scan result to the inactive_ips list
-            if scan_result:
-                inactive_ips.extend(scan_result)
+    # Nmap scan ip-addresses of the maybe_inactive_ips list
+    nmap_result = nmap_double_check_ips(ip_list=maybe_inactive_ips)
     # Create a new list to exclude the overwrite_active ip-addresses
-    inactive_ips = [ip for ip in inactive_ips if ip["address"] not in overwrite_active]
+    inactive_ips = [ip for ip in nmap_result if ip["address"] not in overwrite_active]
 
     # If ip-addresses have been found
     if inactive_ips:
@@ -756,7 +755,10 @@ def update_active_ip_addresses(
             resp=resp, nb_type="ip", data=inactive_ips, ds=ds, task_text=task_text, text=text
         )
         result.extend(sub_result)
-        failed = True if sub_failed else failed
+        if sub_failed:
+            failed = True
+            result.append(f"-> Data for Payload:\n{inactive_ips}")
+            result.append(f"-> Payload:\n{payload}")
 
     return result, failed
 
@@ -823,7 +825,7 @@ def update_netbox_prefix_ip_addresses(prefix: list, *args) -> tuple:
     result, sub_failed = update_discovered_ip_addresses(nb_url=nb_url, prefix=prefix, ds=ds)
     results, changed, failed = set_results_changed_failed(results, result, changed, sub_failed, failed)
 
-    # Delete inactive 'auto-discovered' ip-addresses (double check with partial nmap scan)
+    # Delete inactive 'auto-discovered' ip-addresses
     result, sub_failed = delete_inactive_auto_discovered_ip_addresses(nb_url=nb_url, prefix=prefix, ds=ds)
     results, changed, failed = set_results_changed_failed(results, result, changed, sub_failed, failed)
 

{nornir_collection-0.0.25 → nornir_collection-0.0.27}/nornir_collection.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nornir-collection
-Version: 0.0.25
+Version: 0.0.27
 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.25 → nornir_collection-0.0.27}/setup.py

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