Merge pull request #44 from nautobot/develop

Bump Version to 2.2.0

.github/workflows/ci.yml

@@ -14,7 +14,7 @@ jobs:
       - name: "Set up Python"
         uses: "actions/setup-python@v2"
         with:
-          python-version: "3.9"
+          python-version: "3.9.7"
       - name: "Install Python Packages for Linting"
         run: "pip install --upgrade pip wheel invoke toml black"
       - name: "Linting: Black"

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v2.2.0
+
+- (#41) Added jinja2 filter pass to generate config
+- (#42) Added Cisco ASA mapping to default mapping
+
+## v2.1.2
+
+- (#40) Fix nornir inventory defaults
+
 ## v2.1.1
 
 - (#31) Migrate from Travis-CI to GitHub Actions for CI

nornir_nautobot/plugins/tasks/dispatcher/__init__.py

@@ -12,6 +12,7 @@
 _DEFAULT_DRIVERS_MAPPING = {
     "default": "nornir_nautobot.plugins.tasks.dispatcher.default.NautobotNornirDriver",
     "default_netmiko": "nornir_nautobot.plugins.tasks.dispatcher.default.NetmikoNautobotNornirDriver",
+    "cisco_asa": "nornir_nautobot.plugins.tasks.dispatcher.cisco_asa.NautobotNornirDriver",
     "cisco_nxos": "nornir_nautobot.plugins.tasks.dispatcher.cisco_nxos.NautobotNornirDriver",
     "cisco_ios": "nornir_nautobot.plugins.tasks.dispatcher.cisco_ios.NautobotNornirDriver",
     "cisco_xr": "nornir_nautobot.plugins.tasks.dispatcher.cisco_xr.NautobotNornirDriver",

nornir_nautobot/plugins/tasks/dispatcher/cisco_asa.py

@@ -0,0 +1,7 @@
+"""network_importer driver for cisco_asa."""
+
+from .default import NetmikoNautobotNornirDriver as DefaultNautobotNornirDriver
+
+
+class NautobotNornirDriver(DefaultNautobotNornirDriver):
+    """Driver for Cisco ASA."""

nornir_nautobot/plugins/tasks/dispatcher/default.py

@@ -3,6 +3,7 @@
 
 import os
 import socket
+from typing import Optional
 import jinja2
 
 from netmiko.ssh_exception import NetmikoAuthenticationException, NetmikoTimeoutException
@@ -147,7 +148,13 @@ def compliance_config(
 
     @staticmethod
     def generate_config(
-        task: Task, logger, obj, jinja_template: str, jinja_root_path: str, output_file_location: str
+        task: Task,
+        logger,
+        obj,
+        jinja_template: str,
+        jinja_root_path: str,
+        output_file_location: str,
+        jinja_filters: Optional[dict] = None,
     ) -> Result:
         """A small wrapper around template_file Nornir task.
 
@@ -157,6 +164,7 @@ def generate_config(
             obj (Device): A Nautobot Device Django ORM object instance.
             jinja_template (str): The file location of the actual Jinja template.
             jinja_root_path (str): The file folder where the file will be saved to.
+            jinja_filters (dict): The filters which will be added to the jinja2 environment.
             output_file_location (str): The filename where the file will be saved to.
 
         Returns:
@@ -168,6 +176,7 @@ def generate_config(
                 task=template_file,
                 template=jinja_template,
                 path=jinja_root_path,
+                jinja_filters=jinja_filters,
             )[0].result
         except NornirSubTaskError as exc:
             if isinstance(exc.result.exception, jinja2.exceptions.UndefinedError):  # pylint: disable=no-else-raise

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nornir-nautobot"
-version = "2.1.2"
+version = "2.2.0"
 description = "Nornir Nautobot"
 authors = ["Network to Code, LLC <[email protected]>"]
 readme = "README.md"