Merge pull request #134 from nautobot/release-v2.0.1

Release v2.0.1
nautobot · May 26, 2023 · 8841977 · 8841977
2 parents 4b35929 + deaa712
commit 8841977
Show file tree

Hide file tree

Showing 12 changed files with 2,193 additions and 639 deletions.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -1,3 +1,11 @@
+## v2.0.1 - 2023-05-26
+
+### Fixed
+
+- #128 - Refresh client to ensure latest snapshots are loaded.
+- #129 - Use new IP Fabric logo on the SSoT dashboard.
+- #133 - Fix device interface import for interfaces with no description.
+
 ## v2.0.0 - 2023-01-27
 
 ### Added

diff --git a/development/Dockerfile b/development/Dockerfile
@@ -2,6 +2,14 @@ ARG PYTHON_VER=3.8
 ARG NAUTOBOT_VER="1.2.4"
 FROM ghcr.io/nautobot/nautobot-dev:${NAUTOBOT_VER}-py${PYTHON_VER}
 
+# Install Poetry manually via its installer script;
+# We might be using an older version of Nautobot that includes an older version of Poetry
+# and CI and local development may have a newer version of Poetry
+# Since this is only used for development and we don't ship this container, pinning Poetry back is not expressly necessary
+# We also don't need virtual environments in container
+RUN curl -sSL https://install.python-poetry.org | python3 - && \
+  poetry config virtualenvs.create false
+
 WORKDIR /source
 
 # Copy in only pyproject.toml/poetry.lock to help with caching this layer if no updates to dependencies

diff --git a/docs/images/site_diagram.png b/docs/images/site_diagram.png
diff --git a/docs/plugin.md b/docs/plugin.md
@@ -173,10 +173,6 @@ You can then views the details of each object.
 
 ![Sync Details](./images/sync_details.png)
 
-Site objects include a site diagram from IPFabric, which is using the new custom field to render the appropriate site-id. Navigate to any site that's been synced by SSoT IPFabric and take a look!
-
-![Site Diagram](./images/site_diagram.png)
-
 ## DiffSync Models
 
 ### IPFabric Site

diff --git a/nautobot_ssot_ipfabric/diffsync/adapter_ipfabric.py b/nautobot_ssot_ipfabric/diffsync/adapter_ipfabric.py
@@ -59,7 +59,7 @@ def load_device_interfaces(self, device_model, interfaces, device_primary_ip):
                     diffsync=self,
                     name=iface.get("intName"),
                     device_name=iface.get("hostname"),
-                    description=iface.get("dscr"),
+                    description=iface.get("dscr", ""),
                     enabled=True,
                     mac_address=mac_to_format(iface.get("mac"), "MAC_COLON_TWO").upper()
                     if iface.get("mac")

diff --git a/nautobot_ssot_ipfabric/diffsync/adapter_nautobot.py b/nautobot_ssot_ipfabric/diffsync/adapter_nautobot.py
@@ -94,7 +94,7 @@ def load_interfaces(self, device_record: Device, diffsync_device):
                 status=device_record.status.name,
                 name=interface_record.name,
                 device_name=device_record.name,
-                description=interface_record.description if interface_record.description else None,
+                description=interface_record.description if interface_record.description else "",
                 enabled=True,
                 mac_address=mac_to_format(str(interface_record.mac_address), "MAC_COLON_TWO").upper()
                 if interface_record.mac_address

diff --git a/nautobot_ssot_ipfabric/jobs.py b/nautobot_ssot_ipfabric/jobs.py
@@ -50,6 +50,7 @@ def get_formatted_snapshots(client):
     formatted_snapshots = {}
     snapshot_refs = []
     if client:
+        client.update()
         for snapshot_ref, snapshot in client.snapshots.items():
             description = ""
             if snapshot_ref in [LAST, PREV, LAST_LOCKED]:

diff --git a/nautobot_ssot_ipfabric/static/nautobot_ssot_ipfabric/ipfabric.png b/nautobot_ssot_ipfabric/static/nautobot_ssot_ipfabric/ipfabric.png
diff --git a/nautobot_ssot_ipfabric/static/nautobot_ssot_ipfabric/ipfabric_logo.png b/nautobot_ssot_ipfabric/static/nautobot_ssot_ipfabric/ipfabric_logo.png
diff --git a/nautobot_ssot_ipfabric/utilities/nbutils.py b/nautobot_ssot_ipfabric/utilities/nbutils.py
@@ -163,7 +163,7 @@ def create_interface(device_obj, interface_details):
         interface_obj, _ = device_obj.interfaces.get_or_create(**fields)
     except IntegrityError:
         interface_obj, _ = device_obj.interfaces.get_or_create(name=fields["name"])
-        interface_obj.description = fields.get("description")
+        interface_obj.description = fields.get("description", "")
         interface_obj.enabled = fields.get("enabled")
         interface_obj.mac_address = fields.get("mac_address")
         interface_obj.mtu = fields.get("mtu")

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nautobot-ssot-ipfabric"
-version = "2.0.0"
+version = "2.0.1"
 description = "Nautobot SSoT IPFabric"
 authors = ["Network to Code, LLC <info@networktocode.com>"]
 license = "Apache-2.0"