nornir-collection 0.0.24__tar.gz → 0.0.26__tar.gz

{nornir_collection-0.0.24 → nornir_collection-0.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nornir-collection
-Version: 0.0.24
+Version: 0.0.26
 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
@@ -47,6 +47,7 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{nornir_collection-0.0.24 → nornir_collection-0.0.26}/nornir_collection/cisco/configuration_management/netconf/config_tasks.py

@@ -360,6 +360,71 @@ def nc_edit_cleanup_svi(task: Task, verbose: bool = False) -> Result:
     return Result(host=task.host, custom_result=custom_result, failed=task_failed)
 
 
+def nc_edit_cleanup_vlan(task: Task, verbose: bool = False) -> Result:
+    """
+    TBD
+    """
+    # The custom_result list will be filled with the results
+    custom_result = []
+
+    #### Get all current configured VLANs with RESTCONF #####################################################
+
+    task_text = "RESTCONF GET VLANs"
+
+    # Set the RESTCONF port, yang query and url to get all configured SVIs
+    yang_query = "Cisco-IOS-XE-native:native/vlan/Cisco-IOS-XE-vlan:vlan-list"
+    url = f"https://{task.host.hostname}:443/restconf/data/{yang_query}"
+
+    # RESTCONF HTTP Get for all SVIs
+    response = rc_cisco_get(url=url, auth=(task.host.username, task.host.password), verify=False)
+
+    # Set the RESTCONF result and return the Nornir result if the RESTCONF response status_code is not 200
+    custom_result = set_restconf_result(
+        task=Task,
+        task_text=task_text,
+        yang_query=yang_query,
+        response=response,
+        custom_result=custom_result,
+        verbose=verbose,
+    )
+
+    # Create a list with all current configured VLANs except the default VLAN 1
+    current_vlans = [x for x in response["json"]["Cisco-IOS-XE-vlan:vlan-list"] if x["id"] != 1]
+
+    #### Render NETCONF payload to remove VLANs with Jinja2 #################################################
+
+    task_text = "Render Jinja2 NETCONF payload"
+    # Create a list with all configured VLANs which are not part of the inventory
+    remove_vlans = [x for x in current_vlans if x["id"] not in [x["vid"] for x in task.host["cfg_vlans"]]]
+
+    # If there are no VLANs to remove, return the Nornir result
+    if not remove_vlans:
+        custom_result.append(
+            f"{task_result(text=task_text, changed=False, level_name='INFO', failed=False)}\n"
+            + f"'{task_text}' -> NornirResponse <Success: True>\n"
+            + "-> No VLANs to remove"
+        )
+        return Result(host=task.host, custom_result=custom_result, failed=False)
+
+    # Set the info message for the Nornir result
+    info_msg = f"VLANs to remove: {len(remove_vlans)}"
+
+    # Render the Jinja2 payload template and configure the NETCONF candidate datastore
+    custom_result, task_failed = netconf_configure_jinja2_rendered_payload_template(
+        task=task,
+        j2_task_text=task_text,
+        j2_tpl_path="iosxe_netconf/tpl_sys/cleanup/cleanup_vlan.j2",
+        custom_result=custom_result,
+        task_failed=False,
+        info_msg=info_msg,
+        verbose=verbose,
+        j2_kwargs={"remove_vlans": remove_vlans},
+    )
+
+    # Return the Nornir NETCONF result
+    return Result(host=task.host, custom_result=custom_result, failed=task_failed)
+
+
 def nc_edit_tpl_config(task: Task, tpl_startswith: str, verbose: bool = False) -> Result:
     """
     TBD
@@ -477,7 +542,6 @@ def nc_cfg_cleanup(nr: Nornir, cfg_status: bool = True, verbose: bool = False) -
     """
     TBD
     """
-
     # Return False if cfg_status argument is False
     if not cfg_status:
         return False
@@ -485,6 +549,7 @@ def nc_cfg_cleanup(nr: Nornir, cfg_status: bool = True, verbose: bool = False) -
     tasks = {
         nc_edit_cleanup_portchannel: "NETCONF portchannel cleanup",
         nc_edit_cleanup_svi: "NETCONF vlan interface cleanup",
+        nc_edit_cleanup_vlan: "NETCONF vlan cleanup",
     }
 
     # Run each task from the Nornir tasks list

{nornir_collection-0.0.24 → nornir_collection-0.0.26}/nornir_collection/cisco/configuration_management/utils.py

@@ -234,9 +234,7 @@ def add_interface_data(task: Task, interface: dict) -> dict:
     """
     # If the interface is part of a Port-channel
     if "lag" in interface and interface["lag"] is not None:
-        # Set the int_config_context of the Port-channel to the int_config_context of the interface
         po_interface = [i for i in task.host["interfaces"] if i["name"] == interface["lag"]["name"]]
-        interface["int_config_context"] = po_interface[0]["int_config_context"]
         interface["description"] = po_interface[0]["description"]
         interface["portchannel_number"] = extract_interface_number(interface["lag"]["name"])
 

{nornir_collection-0.0.24 → nornir_collection-0.0.26}/nornir_collection/netbox/inventory.py

@@ -92,7 +92,7 @@ def _load_interface_data(task: Task, all_interfaces: List[Dict], enrich_vlan_dat
     # fmt: off
     include_keys = [
         "name", "int_template", "description", "type", "lag", "mode", "untagged_vlan", "tagged_vlans",
-        "count_ipaddresses", "count_fhrp_groups", "int_peer_device", "int_config_context", "enabled",
+        "count_ipaddresses", "count_fhrp_groups", "int_peer_device", "enabled",
     ]
     # fmt: on
     # Make some normalization to the device interfaces data with the interface_filter list and others

{nornir_collection-0.0.24 → nornir_collection-0.0.26}/nornir_collection/netbox/update_prefixes_ip_addresses.py

@@ -306,6 +306,24 @@ def nmap_scan_host_ip_or_subnet(hosts: str) -> list:
     return nmap_scan_result
 
 
+def nmap_double_check_ips(ip_list: dict) -> list:
+    """
+    TBD
+    """
+    verified_ips = []
+    # Nmap scan ip-addresses of the maybe_delete_ips list
+    for ip in ip_list:
+        # Scan the prefix with nmap
+        scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
+        # Add the nmap scan result to the inactive_ips list with the ID of the ip-address
+        if scan_result:
+            # As a single ip-address is scanned the scan_result can have only one list item
+            verified_ips.append({"id": ip["id"], **scan_result[0]})
+
+    # Return the verified ip-addresses list
+    return verified_ips
+
+
 def get_ipfabric_data_for_prefix(prefix: dict) -> tuple:
     """
     TBD
@@ -571,15 +589,8 @@ def delete_inactive_auto_discovered_ip_addresses(
     maybe_delete_ips = create_ip_list(
         loop_list=prefix["discovered_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
-    delete_ips = []
-    if maybe_delete_ips:
-        # Nmap scan ip-addresses of the maybe_delete_ips list
-        for ip in maybe_delete_ips:
-            # Scan the prefix with nmap
-            scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
-            # Add the nmal scan result to the inactive_ips list
-            if scan_result:
-                delete_ips.extend(scan_result)
+    # Nmap scan ip-addresses of the maybe_delete_ips list
+    delete_ips = nmap_double_check_ips(ip_list=maybe_delete_ips)
 
     # If ip-addresses have been found
     if delete_ips:
@@ -659,14 +670,8 @@ def update_inactive_ip_addresses(nb_url: str, prefix: dict, ds: Literal["nmap",
     maybe_active_ips = create_ip_list(
         loop_list=prefix["inactive_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
-    if maybe_active_ips:
-        # Nmap scan ip-addresses of the maybe_inactive_ips list
-        for ip in maybe_active_ips:
-            # Scan the prefix with nmap
-            scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
-            # Add the nmal scan result to the inactive_ips list
-            if scan_result:
-                active_ips.extend(scan_result)
+    # Nmap scan ip-addresses of the maybe_active_ips list
+    active_ips = nmap_double_check_ips(ip_list=maybe_active_ips)
 
     # If ip-addresses have been found
     if active_ips:
@@ -722,21 +727,16 @@ def update_active_ip_addresses(
             resp=resp, nb_type="ip", data=active_ips, ds=ds, task_text=task_text, text=text
         )
         result.extend(sub_result)
-        failed = True if sub_failed else failed
+        if sub_failed:
+            failed = True
+            result.append(f"-> Payload:\n{payload}")
 
     # Update the ip-addresses with the status 'active' that are not part of the datacenter list
     maybe_inactive_ips = create_ip_list(
         loop_list=prefix["active_ips"], check_list=prefix["datasource_ips"], is_in_both=False
     )
-    inactive_ips = []
-    if maybe_inactive_ips:
-        # Nmap scan ip-addresses of the maybe_inactive_ips list
-        for ip in maybe_inactive_ips:
-            # Scan the prefix with nmap
-            scan_result = nmap_scan_host_ip_or_subnet(hosts=ip["address"])
-            # Add the nmal scan result to the inactive_ips list
-            if scan_result:
-                inactive_ips.extend(scan_result)
+    # Nmap scan ip-addresses of the maybe_inactive_ips list
+    inactive_ips = nmap_double_check_ips(ip_list=maybe_inactive_ips)
     # Create a new list to exclude the overwrite_active ip-addresses
     inactive_ips = [ip for ip in inactive_ips if ip["address"] not in overwrite_active]
 
@@ -756,7 +756,10 @@ def update_active_ip_addresses(
             resp=resp, nb_type="ip", data=inactive_ips, ds=ds, task_text=task_text, text=text
         )
         result.extend(sub_result)
-        failed = True if sub_failed else failed
+        if sub_failed:
+            failed = True
+            result.append(f"-> Data for Payload:\n{inactive_ips}")
+            result.append(f"-> Payload:\n{payload}")
 
     return result, failed
 

{nornir_collection-0.0.24 → nornir_collection-0.0.26}/nornir_collection.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: nornir-collection
-Version: 0.0.24
+Version: 0.0.26
 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
@@ -47,6 +47,7 @@ Dynamic: author-email
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{nornir_collection-0.0.24 → nornir_collection-0.0.26}/setup.py

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