nornir-collection 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

nornir_collection/cisco/configuration_management/netconf/config_workflow.py

@@ -93,8 +93,8 @@ def _nc_commit_confirm_testing(nr: Task) -> bool:
     print(task_name(text=task_text))
     print(task_result(text=task_text, changed=False, level_name="INFO"))
     print(f"'{task_text}' -> PythonResponse <Success: True>")
-    print("-> Sleep 15s seconds before run the Nornir TestsProcessor ...")
-    time.sleep(15)
+    print("-> Sleep 60s seconds before run the Nornir TestsProcessor ...")
+    time.sleep(60)
 
     # Run Nornir TestsProcessor for Unit, Integration, and System tests. All tests files with the inventory
     # key starting with the prefix "cfgtp_{name}_" and are loaded from the inventory.
@@ -226,10 +226,8 @@ def nc_cfg_iosxe_netconf_config(
     ########################################### WORKAROUND ##################################################
     # If its a commit-confirm and the cfg_status is True
     if not disable_commit_confirm and cfg_status:
-        # Calculate the revert-timer in minutes from the confirm-timeout in seconds
-        revert_timer = confirm_timeout // 60
         # Replace the config with a revert-timer right before the commit
-        cfg_status = rc_replace_config(nr=nr, rebuild=rebuild, verbose=verbose, revert_timer=revert_timer)
+        cfg_status = rc_replace_config(nr=nr, rebuild=rebuild, verbose=verbose, revert_timer=confirm_timeout)
     #########################################################################################################
 
     # Start a timer to check how long the commit takes.

nornir_collection/cisco/configuration_management/restconf/config_workflow.py

@@ -37,6 +37,8 @@ def rc_replace_config(
 
     # Set rollback_config to day0-config if rebuild is True, else set it to golden-config
     rollback_config = "day0-config" if rebuild else "golden-config"
+    # Calculate the revert-timer in minutes from the input revert-timer in seconds
+    revert_timer = revert_timer // 60 if revert_timer else None
 
     # Print the task title if revert_timer is not set
     if not revert_timer:

nornir_collection/cisco/configuration_management/utils.py

@@ -356,8 +356,8 @@ def init_args_for_netconf_cm() -> argparse.Namespace:
         "--confirm-timeout",
         type=int,
         metavar="<INT>",
-        default=60,
-        help="set NETCONF commit-confirm timeout in seconds (default: 60s)",
+        default=120,
+        help="set NETCONF commit-confirm timeout in seconds (default: 120s)",
     )
 
     # Add the optional rebuild argument

nornir_collection/netbox/inventory.py

@@ -170,6 +170,7 @@ def _load_vlan_data(task: Task, all_vlans: List[Dict]) -> Result:
             vlans = []
             for role in roles:
                 # Update the VLANs to match all VLANs that match also the role
+                # The following list comprehensions fails of the 'group' or the 'role' is None
                 data = [x for x in all_vlans if (x["group"]["name"] == group and x["role"]["name"] == role)]
                 vlans.extend(data)
                 # Return if the data list is empty
@@ -306,6 +307,9 @@ def load_additional_netbox_data(nr: Nornir, add_netbox_data: dict[str:bool]) ->
     if add_netbox_data.get("load_vlan_data"):
         # Get all vlans from NetBox
         all_vlans = get_nb_resources(url=f"{nb_url}/api/ipam/vlans/?limit=1000?")
+        # The task _load_vlan_data can only load VLANs that are part of a group and have a role. All VLANs
+        # in the DSC Azure Tenant are not part of a group and needs to be excluded the the all_vlans list.
+        all_vlans = [x for x in all_vlans if x["role"]["name"] != "AZURE"]
         # Run the custom Nornir task _load_vlan_data
         result = nr.run(
             name=task_text,

{nornir_collection-0.0.7.dist-info → nornir_collection-0.0.9.dist-info}/METADATA

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

@@ -8,19 +8,19 @@ nornir_collection/cisco/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 nornir_collection/cisco/configuration_management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nornir_collection/cisco/configuration_management/processor.py,sha256=KjhilyyDDiYL7wFemGEWSP16OLeM4dENmrtb20LRssY,6443
 nornir_collection/cisco/configuration_management/pyats.py,sha256=j9XzG3ttURR0wtu2Se9QQEpG5o2kq9mqDkReNCdWKpk,8932
-nornir_collection/cisco/configuration_management/utils.py,sha256=oLrl-sjB7Uvfmo1vxSkL_Z_DZTS2I5WbQfrGGLZeP2k,18639
+nornir_collection/cisco/configuration_management/utils.py,sha256=0o1ZktYNIrmBpQDJ9o7f2j4sYmK__LDBb0JC4cR5iJo,18641
 nornir_collection/cisco/configuration_management/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nornir_collection/cisco/configuration_management/cli/config_tasks.py,sha256=mWXysgUm6ymNLQjomB1T05QT9A-fdV1aEKFzzDrfCUw,22147
 nornir_collection/cisco/configuration_management/cli/config_workflow.py,sha256=GIka5SPLZ7M2zCFv8Jadl73QC-InnGopzI8xQt36MfM,3459
 nornir_collection/cisco/configuration_management/cli/show_tasks.py,sha256=w9p2Iks33-pE4-YztH6vj-eI0MuPI7YD6gZhRcpQF7M,27971
 nornir_collection/cisco/configuration_management/netconf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nornir_collection/cisco/configuration_management/netconf/config_tasks.py,sha256=Sig1FNmjcXXWK0zIUp_-sCxZzYjnYjR_HuYguLlIlsA,22120
-nornir_collection/cisco/configuration_management/netconf/config_workflow.py,sha256=HRYFBq4kwwdIfgWmcoRgV3zjsOy_8-k0CkinZ1whA5c,14683
+nornir_collection/cisco/configuration_management/netconf/config_workflow.py,sha256=qxB4DolQL2WJO9JRATzANhIwYPNuKyuN0hI9-ABzJq8,14557
 nornir_collection/cisco/configuration_management/netconf/nr_cfg_iosxe_netconf.py,sha256=ciG2TkOC1qEtxOIKX0CjAOV3aAt3JOR7VaDvstDDy_s,8614
 nornir_collection/cisco/configuration_management/netconf/ops_tasks.py,sha256=cj7cpJNvY2bytv9VOqwg_7qOekL-cIL0EjML2KT4TQM,10659
 nornir_collection/cisco/configuration_management/restconf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nornir_collection/cisco/configuration_management/restconf/cisco_rpc.py,sha256=tIccCcWegIuTRREz9wd47is4vP0bvvjH2ljB4GaOUKY,18569
-nornir_collection/cisco/configuration_management/restconf/config_workflow.py,sha256=Q0xoOqyjyWkHWzVX62wOYOvn4CRIW8Bc16atXJo-qVU,3362
+nornir_collection/cisco/configuration_management/restconf/config_workflow.py,sha256=4UV85L8Cnb62_IJwx5w0NNB7Ohfk-LoR-D-FfEuSEJA,3509
 nornir_collection/cisco/configuration_management/restconf/tasks.py,sha256=2x5ecw8PE4CZ2lf2q7NZlEQGYRjLJxYzC2udhNmqnGA,12221
 nornir_collection/cisco/software_upgrade/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nornir_collection/cisco/software_upgrade/cisco_software_upgrade.py,sha256=KX9PKTPsEVAf4DLSDCm4gP_hDUnIxlxXgG5925CYPSo,13138
@@ -35,7 +35,7 @@ nornir_collection/fortinet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 nornir_collection/fortinet/utils.py,sha256=xkvxdJy3-aD39WK_9Gc0rY9r-OxfHnPVNMspy3KZbcE,1174
 nornir_collection/netbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nornir_collection/netbox/custom_script.py,sha256=yU1lbv_25b3qAWA6GRsVYpEuh0KUPTVo47U5s_lksjo,4050
-nornir_collection/netbox/inventory.py,sha256=YYmnFgsOiYiu6tueH8Nu6o5SXOJbfWDMyyFM3A6Yqek,15104
+nornir_collection/netbox/inventory.py,sha256=2db5GogMsY5bZgc4mXIhlmH9pcvyQ7AE55dL0EiqxDI,15488
 nornir_collection/netbox/scan_prefixes_and_update_ip_addresses.py,sha256=IGaE-HR_eManlENJzx7odn6yuMgpUV85NZfhpfaxpA0,41376
 nornir_collection/netbox/set_device_status.py,sha256=vtn0KcR-91Z2aLjbEpZRef1Jip8eM9GWbKRiAJuEjLY,2437
 nornir_collection/netbox/sync_datasource.py,sha256=eEsgwy_arIPbA-ObqqzTNdU9aiP80s7LCzAKA6hCXYQ,4703
@@ -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.7.dist-info/LICENSE,sha256=bOPVh1OVNwz2tCjkLaChWT6AoXdtqye3aua5l0tgYJo,1068
-nornir_collection-0.0.7.dist-info/METADATA,sha256=Ai1JvjfaWBLU4XZAgcO8N-6u7sBs3JpLD1LkxPMqmbE,7137
-nornir_collection-0.0.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nornir_collection-0.0.7.dist-info/top_level.txt,sha256=OyCzPWABf-D0AOHm9ihrwdk5eq200BnKna6gIDspwsE,18
-nornir_collection-0.0.7.dist-info/RECORD,,
+nornir_collection-0.0.9.dist-info/LICENSE,sha256=bOPVh1OVNwz2tCjkLaChWT6AoXdtqye3aua5l0tgYJo,1068
+nornir_collection-0.0.9.dist-info/METADATA,sha256=3i-2daEZ2nlcCFvtLqTjzVyUL7M0Dv0gdzY1XuvpVCE,7137
+nornir_collection-0.0.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+nornir_collection-0.0.9.dist-info/top_level.txt,sha256=OyCzPWABf-D0AOHm9ihrwdk5eq200BnKna6gIDspwsE,18
+nornir_collection-0.0.9.dist-info/RECORD,,