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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nornir-collection
-Version: 0.0.26
+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.26 → nornir_collection-0.0.27}/nornir_collection/netbox/update_prefixes_ip_addresses.py

@@ -586,11 +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
     )
-    # Nmap scan ip-addresses of the maybe_delete_ips list
-    delete_ips = nmap_double_check_ips(ip_list=maybe_delete_ips)
 
     # If ip-addresses have been found
     if delete_ips:
@@ -671,7 +669,8 @@ def update_inactive_ip_addresses(nb_url: str, prefix: dict, ds: Literal["nmap",
         loop_list=prefix["inactive_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
     # Nmap scan ip-addresses of the maybe_active_ips list
-    active_ips = nmap_double_check_ips(ip_list=maybe_active_ips)
+    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:
@@ -736,9 +735,9 @@ def update_active_ip_addresses(
         loop_list=prefix["active_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
     # Nmap scan ip-addresses of the maybe_inactive_ips list
-    inactive_ips = nmap_double_check_ips(ip_list=maybe_inactive_ips)
+    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:
@@ -826,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.26 → 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.26
+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.26 → 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.26",
+    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 \