nornir-collection 0.0.8__tar.gz → 0.0.10__tar.gz

{nornir_collection-0.0.8 → nornir_collection-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nornir-collection
-Version: 0.0.8
+Version: 0.0.10
 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.8 → nornir_collection-0.0.10}/nornir_collection/cisco/configuration_management/netconf/nr_cfg_iosxe_netconf.py

@@ -95,8 +95,8 @@ def main(nr_config: str, args: argparse.Namespace) -> None:
 
     #### Run Nornir Tasks to Verify the config State ########################################################
 
-    # First do a pre-config check to ensure the current config is in a clean state
-    if not args.rebuild and not args.skip_pre_check:
+    # If the pre-check arg is True, do a pre-config check to ensure the current config is in a clean state
+    if not args.rebuild and args.pre_check:
         cfg_status = nr_pre_config_check(nr=nr)
         # Exit the script if the config status is not clean
         if not cfg_status:

{nornir_collection-0.0.8 → nornir_collection-0.0.10}/nornir_collection/cisco/configuration_management/utils.py

@@ -370,7 +370,7 @@ def init_args_for_netconf_cm() -> argparse.Namespace:
 
     # Add the optional rebuild argument
     argparser.add_argument(
-        "--skip-pre-check",
+        "--pre-check",
         action="store_true",
         default=False,
         help="disable the pre-configuration check (default: False)",
@@ -397,10 +397,10 @@ def init_args_for_netconf_cm() -> argparse.Namespace:
 
     print("-> Configuration-MGMT arguments:")
     print(f"  - Run on the '{nb_instance}' NetBox instance and Nornir config '{nr_config}'")
-    if args.skip_pre_check:
-        print("  - Skip the pre-configuration check (diff running-config/golden-config)")
+    if args.pre_check:
+        print("  - Pre-configuration check is enabled (diff running-config/golden-config)")
     else:
-        print("  - Perform the pre-configuration check (diff running-config/golden-config)")
+        print("  - Pre-configuration check is disabled (diff running-config/golden-config)")
     if args.dryrun:
         print("  - NETCONF dry-run is enabled")
     else:

{nornir_collection-0.0.8 → nornir_collection-0.0.10}/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.8 → nornir_collection-0.0.10}/nornir_collection/utils.py

@@ -376,7 +376,7 @@ def nr_filter_by_role_and_tag(
             text="ALERT: NO HOST WITH ROLE AND/OR TAGS IN NORNIR INVENTORY",
             msg=[
                 "-> Analyse the Nornir inventory and filter for a role and/or tags assigned to hosts",
-                f"-> {provided_filters}",
+                f"{provided_filters}",
             ],
         )
 

{nornir_collection-0.0.8 → nornir_collection-0.0.10}/nornir_collection.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nornir-collection
-Version: 0.0.8
+Version: 0.0.10
 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.8 → nornir_collection-0.0.10}/setup.py

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