nornir-collection 0.0.7__tar.gz → 0.0.9__tar.gz

{nornir_collection-0.0.7 → nornir_collection-0.0.9}/PKG-INFO

@@ -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 → nornir_collection-0.0.9}/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-0.0.7 → nornir_collection-0.0.9}/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-0.0.7 → nornir_collection-0.0.9}/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-0.0.7 → nornir_collection-0.0.9}/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 → nornir_collection-0.0.9}/nornir_collection.egg-info/PKG-INFO

@@ -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 → nornir_collection-0.0.9}/setup.py

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