nornir-collection 0.0.13__py3-none-any.whl → 0.0.15__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- nornir_collection/netbox/update_prefixes_ip_addresses.py +6 -6
- nornir_collection/netbox/utils.py +6 -1
- {nornir_collection-0.0.13.dist-info → nornir_collection-0.0.15.dist-info}/METADATA +1 -1
- {nornir_collection-0.0.13.dist-info → nornir_collection-0.0.15.dist-info}/RECORD +7 -7
- {nornir_collection-0.0.13.dist-info → nornir_collection-0.0.15.dist-info}/LICENSE +0 -0
- {nornir_collection-0.0.13.dist-info → nornir_collection-0.0.15.dist-info}/WHEEL +0 -0
- {nornir_collection-0.0.13.dist-info → nornir_collection-0.0.15.dist-info}/top_level.txt +0 -0
@@ -1015,7 +1015,7 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
|
|
1015
1015
|
# Get the NetBox URL (Authentication token will be loaded as nb_token env variable)
|
1016
1016
|
nb_url = nr_config_dict["inventory"]["options"]["nb_url"]
|
1017
1017
|
|
1018
|
-
# Load Active NetBox Prefixes from Tenant 'none', 'oob', 'tier-1' and 'tier-2'
|
1018
|
+
# Load Active NetBox Prefixes from Tenant 'none', 'oob', 'tier-1' and 'tier-2' (except marked utilized)
|
1019
1019
|
# These prefixes will be scanned with nmap and updated
|
1020
1020
|
nb_active_oob_t1_t2_prefixes = load_netbox_data(
|
1021
1021
|
task_text="Load Active OOB/T1/T2 NetBox Prefixes",
|
@@ -1023,12 +1023,12 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
|
|
1023
1023
|
query={"status": "active", "tenant": ["none", "oob", "tier-1", "tier-2"], "mark_utilized": "false"},
|
1024
1024
|
)
|
1025
1025
|
|
1026
|
-
# Load Active
|
1026
|
+
# Load Active and Inventory NetBox Prefixes from all Tenants (except marked utilized)
|
1027
1027
|
# These prefixes will be updated with input from IP-Fabric
|
1028
1028
|
nb_active_inventory_t3_t4_prefixes = load_netbox_data(
|
1029
|
-
task_text="Load Active & Inventory T3/T4 NetBox Prefixes",
|
1029
|
+
task_text="Load Active & Inventory OOB/T1/T2/T3/T4 NetBox Prefixes",
|
1030
1030
|
nb_api_url=f"{nb_url}/api/ipam/prefixes/",
|
1031
|
-
query={"status": ["active", "inventory"], "
|
1031
|
+
query={"status": ["active", "inventory"], "mark_utilized": "false"},
|
1032
1032
|
)
|
1033
1033
|
|
1034
1034
|
# Load NetBox Non-Container Prefixes
|
@@ -1050,7 +1050,7 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
|
|
1050
1050
|
|
1051
1051
|
if nmap_scan:
|
1052
1052
|
# Set the task title
|
1053
|
-
title = "Nmap Scan Active OOB/T1/T2 NetBox Prefixes
|
1053
|
+
title = "Nmap Scan and Update Active OOB/T1/T2 NetBox Prefixes IP-Addresses"
|
1054
1054
|
|
1055
1055
|
# Run the thread pool to update all NetBox IP-Addresses Status and DNS-Name
|
1056
1056
|
# 1. arg is the input type ('nmap' or 'ip-fabric')
|
@@ -1068,7 +1068,7 @@ def main(nr_config: str, nmap_scan: bool = False, overwrite_active: list[str] =
|
|
1068
1068
|
#### IP-Fabric Update Active & Inventory NetBox Prefixes IP-Addresses ###################################
|
1069
1069
|
|
1070
1070
|
# Set the task title
|
1071
|
-
title = "IP-Fabric Update Active & Inventory T3/T4 NetBox Prefixes IP-Addresses"
|
1071
|
+
title = "IP-Fabric Update Active & Inventory OOB/T1/T2/T3/T4 NetBox Prefixes IP-Addresses"
|
1072
1072
|
|
1073
1073
|
# Run the thread pool to update all NetBox IP-Addresses Status and DNS-Name
|
1074
1074
|
# 1. arg is the input type ('nmap' or 'ip-fabric')
|
@@ -159,7 +159,12 @@ def init_args_for_ipam_update() -> str:
|
|
159
159
|
# If argparser.parse_args() is successful -> no argparse error message
|
160
160
|
print(task_info(text=task_text, changed=False))
|
161
161
|
print(f"'{task_text}' -> ArgparseResponse <Success: True>")
|
162
|
-
print(
|
162
|
+
print("-> Arguments:")
|
163
|
+
print(f" - Run on the '{nb_instance}' NetBox instance and Nornir config '{nr_config}'")
|
164
|
+
if args.nmap:
|
165
|
+
print(" - NMAP scan additionally to IP-Fabric is enabled (default: no NMAP scan)")
|
166
|
+
else:
|
167
|
+
print(" - NMAP scan additionally to IP-Fabric is disabled (default: no NMAP scan)")
|
163
168
|
|
164
169
|
return nr_config, args
|
165
170
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.2
|
2
2
|
Name: nornir-collection
|
3
|
-
Version: 0.0.
|
3
|
+
Version: 0.0.15
|
4
4
|
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.
|
5
5
|
Author: Willi Kubny
|
6
6
|
Author-email: willi.kubny@gmail.ch
|
@@ -41,9 +41,9 @@ nornir_collection/netbox/sync_datasource.py,sha256=eEsgwy_arIPbA-ObqqzTNdU9aiP80
|
|
41
41
|
nornir_collection/netbox/update_cisco_inventory_data.py,sha256=Aq4VGvAIiBhOCsSOF-wBUrpYtBXR8HwR3NCWEeM4d0g,6426
|
42
42
|
nornir_collection/netbox/update_cisco_support_plugin_data.py,sha256=H8SfqESad64LrZrsWOaICHKj122sgu96dK9RcbvtzGM,13896
|
43
43
|
nornir_collection/netbox/update_fortinet_inventory_data.py,sha256=ltwkE_bFljRUR4aeOxorChCsHdZciD1TqvoPnWTUIUg,6367
|
44
|
-
nornir_collection/netbox/update_prefixes_ip_addresses.py,sha256=
|
44
|
+
nornir_collection/netbox/update_prefixes_ip_addresses.py,sha256=Dwyl7VYWld0WZReF8iALUiF3gHSk3A0SSlz1ZwXIgLw,46817
|
45
45
|
nornir_collection/netbox/update_purestorage_inventory_data.py,sha256=cGZNMTZWJ0wu1BYdE92EVN-C-oLMJHxaKi_-1cMg0Ow,5368
|
46
|
-
nornir_collection/netbox/utils.py,sha256=
|
46
|
+
nornir_collection/netbox/utils.py,sha256=mCV7QfLeR6kKurZVpMrHucIoru759RiwzE4NGEx91kI,12140
|
47
47
|
nornir_collection/netbox/verify_device_primary_ip.py,sha256=6UCdZaZxhV4v8KqpjSpE9c7jaxIAF2krrknrrRj1AvM,8690
|
48
48
|
nornir_collection/nornir_plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
49
49
|
nornir_collection/nornir_plugins/inventory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -52,8 +52,8 @@ nornir_collection/nornir_plugins/inventory/staggered_yaml.py,sha256=nBvUFq7U5zVT
|
|
52
52
|
nornir_collection/nornir_plugins/inventory/utils.py,sha256=mxIlKK-4PHqCnFKn7Oozu1RW_JB5z1TgEYc-ave70nE,11822
|
53
53
|
nornir_collection/purestorage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
54
54
|
nornir_collection/purestorage/utils.py,sha256=TqU2sKz0ENnmSDEBcSvXPnVkI1DVHOogI68D7l32g7I,1730
|
55
|
-
nornir_collection-0.0.
|
56
|
-
nornir_collection-0.0.
|
57
|
-
nornir_collection-0.0.
|
58
|
-
nornir_collection-0.0.
|
59
|
-
nornir_collection-0.0.
|
55
|
+
nornir_collection-0.0.15.dist-info/LICENSE,sha256=bOPVh1OVNwz2tCjkLaChWT6AoXdtqye3aua5l0tgYJo,1068
|
56
|
+
nornir_collection-0.0.15.dist-info/METADATA,sha256=vm1nJtiBpxcITlHj7mYn44u171M61Q2pbOh9XVU4wYM,7169
|
57
|
+
nornir_collection-0.0.15.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
|
58
|
+
nornir_collection-0.0.15.dist-info/top_level.txt,sha256=OyCzPWABf-D0AOHm9ihrwdk5eq200BnKna6gIDspwsE,18
|
59
|
+
nornir_collection-0.0.15.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|