nornir-collection 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

nornir_collection/netbox/update_prefixes_ip_addresses.py

@@ -304,32 +304,40 @@ def nmap_scan_prefix(prefix: dict, result: list) -> tuple:
     return result, prefix
 
 
-def get_ipfabric_data_for_prefix(prefix: dict, result: list) -> tuple:
+def get_ipfabric_data_for_prefix(ipf: IPFClient, prefix: dict, result: list) -> tuple:
     """
     TBD
     """
-    # Connect to IP-Fabric
-    ipf = IPFClient(
-        base_url=os.environ["IPF_URL"], auth=os.environ["IPF_TOKEN"], snapshot_id="$last", verify=False
-    )
-
     # Get the prefix length from the prefix
     prefixlen = ipaddress.ip_network(prefix["prefix"]).prefixlen
     # Get all ip-addresses of the prefix from the IP-Fabric technology arp table
     # Remove duplicate ip-addresses as the arp table can contain multiple entries for the same ip-address
     filters = {"ip": ["cidr", prefix["prefix"]]}
-    all_ips = list(set([x["ip"] for x in ipf.technology.addressing.arp_table.all(filters=filters)]))
+    arp_ip_list = list(set([x["ip"] for x in ipf.technology.addressing.arp_table.all(filters=filters)]))
+    # Get all ip-addresses of the prefix from the IP-Fabric inventory managed ipv4 table
+    managed_ipv4_ip_list = list(
+        set([x["ip"] for x in ipf.technology.addressing.managed_ip_ipv4.all(filters=filters, columns=["ip"])])
+    )
+    # Get all ip-addresses of the prefix from the IP-Fabric inventory interface table
+    filters = {"loginIp": ["cidr", prefix["prefix"]]}
+    interface_ip_list = list(
+        set([x["loginIp"] for x in ipf.inventory.interfaces.all(filters=filters, columns=["loginIp"])])
+    )
     # Get all ip-addresses of the prefix from the IP-Fabric inventory hosts table
     # Set the ip-address as key to access the dict easier later
+    filters = {"ip": ["cidr", prefix["prefix"]]}
     columns = ["ip", "dnsName"]
-    host_ips = {
+    host_ip_dict = {
         x["ip"]: x["dnsName"] or "" for x in ipf.inventory.hosts.all(filters=filters, columns=columns)
     }
+    host_ip_list = list(host_ip_dict.keys())
+    # Combine all ip-addresses lists and remove duplicates
+    all_ips = list(set(arp_ip_list + managed_ipv4_ip_list + interface_ip_list + host_ip_list))
     # Add a list of all ip-addresses and other details to prefix
     prefix["datasource_ips"] = [
         {
             "address": f"{ip}/{prefixlen}",
-            "dns_name": host_ips[ip] if ip in host_ips.keys() else "",
+            "dns_name": host_ip_dict[ip] if ip in host_ip_dict.keys() else "",
             "ports": {},
         }
         for ip in all_ips
@@ -368,8 +376,12 @@ def get_nb_ips_and_external_datasource(nb_url: str, prefix: dict, ds: Literal["n
         # Scan the prefix with nmap
         result, prefix = nmap_scan_prefix(prefix=prefix, result=result)
     elif ds == "ip-fabric":
+        # Connect to IP-Fabric
+        ipf = IPFClient(
+            base_url=os.environ["IPF_URL"], auth=os.environ["IPF_TOKEN"], snapshot_id="$last", verify=False
+        )
         # Get the ip-addresses from the IP-Fabric
-        result, prefix = get_ipfabric_data_for_prefix(prefix=prefix, result=result)
+        result, prefix = get_ipfabric_data_for_prefix(ipf=ipf, prefix=prefix, result=result)
     else:
         # Invalid datasource
         failed = True
@@ -1026,9 +1038,13 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
     # Load Active and Inventory NetBox Prefixes from all Tenants (except marked utilized)
     # These prefixes will be updated with input from IP-Fabric
     nb_active_inventory_t3_t4_prefixes = load_netbox_data(
-        task_text="Load Active & Inventory OOB/T1/T2/T3/T4 NetBox Prefixes",
+        task_text="Load Active OOB/T1/T2/T3/T4 NetBox Prefixes",
         nb_api_url=f"{nb_url}/api/ipam/prefixes/",
-        query={"status": ["active", "inventory"], "mark_utilized": "false"},
+        query={
+            "status": "active",
+            "tenant": ["none", "oob", "tier-1", "tier-2", "tier-3", "tier-4"],
+            "mark_utilized": "false",
+        },
     )
 
     # Load NetBox Non-Container Prefixes
@@ -1068,7 +1084,7 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
     #### IP-Fabric Update Active & Inventory NetBox Prefixes IP-Addresses ###################################
 
     # Set the task title
-    title = "IP-Fabric Update Active & Inventory OOB/T1/T2/T3/T4 NetBox Prefixes IP-Addresses"
+    title = "IP-Fabric Update Active OOB/T1/T2/T3/T4 NetBox Prefixes IP-Addresses"
 
     # Run the thread pool to update all NetBox IP-Addresses Status and DNS-Name
     # 1. arg is the input type ('nmap' or 'ip-fabric')
@@ -1077,7 +1093,7 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
         title=title,
         task=update_netbox_prefix_ip_addresses,
         thread_list=nb_active_inventory_t3_t4_prefixes,
-        max_workers=10,
+        max_workers=5,
         args=("ip-fabric", overwrite_active),
     )
     # Print the thread pool results and exit the script if any task has failed
@@ -1092,7 +1108,7 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
     thread_result = run_thread_pool(
         title=title,
         task=update_all_netbox_ip_addresses,
-        max_workers=100,
+        max_workers=50,
         thread_list=nb_subnet_prefixes,
     )
     # Print the thread pool results and exit the script if any task has failed
@@ -1107,7 +1123,7 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
     thread_result = run_thread_pool(
         title=title,
         task=update_all_netbox_vlans,
-        max_workers=100,
+        max_workers=50,
         thread_list=nb_vlans,
     )
     # Print the thread pool results and exit the script if any task has failed

{nornir_collection-0.0.15.dist-info → nornir_collection-0.0.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nornir-collection
-Version: 0.0.15
+Version: 0.0.17
 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.15.dist-info → nornir_collection-0.0.17.dist-info}/RECORD

@@ -41,7 +41,7 @@ nornir_collection/netbox/sync_datasource.py,sha256=eEsgwy_arIPbA-ObqqzTNdU9aiP80
 nornir_collection/netbox/update_cisco_inventory_data.py,sha256=Aq4VGvAIiBhOCsSOF-wBUrpYtBXR8HwR3NCWEeM4d0g,6426
 nornir_collection/netbox/update_cisco_support_plugin_data.py,sha256=H8SfqESad64LrZrsWOaICHKj122sgu96dK9RcbvtzGM,13896
 nornir_collection/netbox/update_fortinet_inventory_data.py,sha256=ltwkE_bFljRUR4aeOxorChCsHdZciD1TqvoPnWTUIUg,6367
-nornir_collection/netbox/update_prefixes_ip_addresses.py,sha256=Dwyl7VYWld0WZReF8iALUiF3gHSk3A0SSlz1ZwXIgLw,46817
+nornir_collection/netbox/update_prefixes_ip_addresses.py,sha256=Yg4dT1yM6pGG2fJ3Jhs8NbUfx8PrP-Z1fMolMi-n0LE,47712
 nornir_collection/netbox/update_purestorage_inventory_data.py,sha256=cGZNMTZWJ0wu1BYdE92EVN-C-oLMJHxaKi_-1cMg0Ow,5368
 nornir_collection/netbox/utils.py,sha256=mCV7QfLeR6kKurZVpMrHucIoru759RiwzE4NGEx91kI,12140
 nornir_collection/netbox/verify_device_primary_ip.py,sha256=6UCdZaZxhV4v8KqpjSpE9c7jaxIAF2krrknrrRj1AvM,8690
@@ -52,8 +52,8 @@ nornir_collection/nornir_plugins/inventory/staggered_yaml.py,sha256=nBvUFq7U5zVT
 nornir_collection/nornir_plugins/inventory/utils.py,sha256=mxIlKK-4PHqCnFKn7Oozu1RW_JB5z1TgEYc-ave70nE,11822
 nornir_collection/purestorage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nornir_collection/purestorage/utils.py,sha256=TqU2sKz0ENnmSDEBcSvXPnVkI1DVHOogI68D7l32g7I,1730
-nornir_collection-0.0.15.dist-info/LICENSE,sha256=bOPVh1OVNwz2tCjkLaChWT6AoXdtqye3aua5l0tgYJo,1068
-nornir_collection-0.0.15.dist-info/METADATA,sha256=vm1nJtiBpxcITlHj7mYn44u171M61Q2pbOh9XVU4wYM,7169
-nornir_collection-0.0.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nornir_collection-0.0.15.dist-info/top_level.txt,sha256=OyCzPWABf-D0AOHm9ihrwdk5eq200BnKna6gIDspwsE,18
-nornir_collection-0.0.15.dist-info/RECORD,,
+nornir_collection-0.0.17.dist-info/LICENSE,sha256=bOPVh1OVNwz2tCjkLaChWT6AoXdtqye3aua5l0tgYJo,1068
+nornir_collection-0.0.17.dist-info/METADATA,sha256=qEt8mAj-sTHDFo58-xL1YORM_RjS2Stn09R1NuinzF0,7169
+nornir_collection-0.0.17.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+nornir_collection-0.0.17.dist-info/top_level.txt,sha256=OyCzPWABf-D0AOHm9ihrwdk5eq200BnKna6gIDspwsE,18
+nornir_collection-0.0.17.dist-info/RECORD,,