Merge pull request #440 from nautobot/release-v2.6.1

Release 2.6.1

.github/workflows/ci.yml

@@ -106,7 +106,7 @@ jobs:
       fail-fast: true
       matrix:
         python-version: ["3.11"]
-        nautobot-version: ["2.1.0"]
+        nautobot-version: ["2.2.1"]
     env:
       INVOKE_NAUTOBOT_SSOT_PYTHON_VER: "${{ matrix.python-version }}"
       INVOKE_NAUTOBOT_SSOT_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"
@@ -152,7 +152,7 @@ jobs:
         include:
           - python-version: "3.11"
             db-backend: "postgresql"
-            nautobot-version: "2.1.0"
+            nautobot-version: "2.2.1"
           - python-version: "3.11"
             db-backend: "mysql"
             nautobot-version: "stable"

development/app_config_schema.py

@@ -1,4 +1,5 @@
 """App Config Schema Generator and Validator."""
+
 import json
 from importlib import import_module
 from os import getenv

development/nautobot_config.py

@@ -1,4 +1,5 @@
 """Nautobot development configuration file."""
+
 import os
 import sys
 

docs/admin/release_notes/version_2.6.md

@@ -23,3 +23,26 @@
 
 - [#418](https://github.com/nautobot/nautobot-app-ssot/issues/418) - Unpins multiple dependencies.
 - [#421](https://github.com/nautobot/nautobot-app-ssot/issues/421) - Opened prometheus-client dependency range and removed direct drf-spectacular dependency.
+
+## [v2.6.1 (2024-04-29)](https://github.com/nautobot/nautobot-app-ssot/releases/tag/v2.6.1)
+
+### Added
+
+- [#436](https://github.com/nautobot/nautobot-app-ssot/issues/436) - Added additional unit tests for Device42 integration.
+
+### Changed
+
+- [#437](https://github.com/nautobot/nautobot-app-ssot/issues/437) - Improved performance of the Infoblox client by using `requests.Session` for API calls instead of `requests.request`.
+
+### Fixed
+
+- [#435](https://github.com/nautobot/nautobot-app-ssot/issues/435) - Fixed handling of DLM App installed but not enabled throwing RuntimeError.
+- [#436](https://github.com/nautobot/nautobot-app-ssot/issues/436) - Fixed IPAddress attribute to be ip_version.
+- [#436](https://github.com/nautobot/nautobot-app-ssot/issues/436) - Fixed IPAddress Status incorrectly being set to Reserved when the status in Device42 showed as "available".
+- [#436](https://github.com/nautobot/nautobot-app-ssot/issues/436) - Fixed multiple bugs when assigning IPAddresses to Interfaces.
+- [#436](https://github.com/nautobot/nautobot-app-ssot/issues/436) - Fixed check for Building definiton when creating a VLAN.
+- [#436](https://github.com/nautobot/nautobot-app-ssot/issues/436) - Fixed VLAN to use location instead of location_id in create().
+
+### Housekeeping
+
+- [#431](https://github.com/nautobot/nautobot-app-ssot/issues/431) - Updated note on nautobot_ssot/integrations/ipfabric/diffsync/adapter_ipfabric.py IPFabricDiffSync from Nautobot to IPFabric.

nautobot_ssot/__init__.py

@@ -1,4 +1,5 @@
 """App declaration for nautobot_ssot."""
+
 import os
 from importlib import metadata
 

nautobot_ssot/contrib/__init__.py

@@ -1,4 +1,5 @@
 """SSoT Contrib."""
+
 from nautobot_ssot.contrib.adapter import NautobotAdapter
 from nautobot_ssot.contrib.model import NautobotModel
 from nautobot_ssot.contrib.types import (

nautobot_ssot/contrib/types.py

@@ -1,4 +1,5 @@
 """Contrib type classes for interfacing with Nautobot in SSoT."""
+
 # pylint: disable=protected-access
 # Diffsync relies on underscore-prefixed attributes quite heavily, which is why we disable this here.
 

nautobot_ssot/integrations/aci/constant.py

@@ -1,4 +1,5 @@
 """Constants for use with the ACI SSoT app."""
+
 from django.conf import settings
 
 

nautobot_ssot/integrations/aci/diffsync/adapters/aci.py

@@ -1,4 +1,5 @@
 """DiffSync Adapter for Cisco ACI."""  # pylint: disable=too-many-lines, too-many-instance-attributes, too-many-arguments
+
 # pylint: disable=duplicate-code
 
 

nautobot_ssot/integrations/aci/diffsync/adapters/nautobot.py

@@ -1,4 +1,5 @@
 """DiffSync Adapter for Nautobot."""
+
 # pylint: disable=duplicate-code
 
 import logging

nautobot_ssot/integrations/aci/diffsync/client.py

@@ -1,4 +1,5 @@
 """All interactions with ACI."""  # pylint: disable=too-many-lines, too-many-instance-attributes, too-many-arguments
+
 # pylint: disable=invalid-name
 
 import sys

nautobot_ssot/integrations/aci/diffsync/models/__init__.py

@@ -1,4 +1,5 @@
 """Initialize models for Nautobot and ACI."""
+
 from .nautobot import (
     NautobotTenant,
     NautobotVrf,

nautobot_ssot/integrations/aci/diffsync/models/base.py

@@ -1,4 +1,5 @@
 """Base Shared Models for Cisco ACI integration with SSoT app."""
+
 from typing import List, Optional
 from diffsync import DiffSyncModel
 

nautobot_ssot/integrations/aci/diffsync/utils.py

@@ -1,4 +1,5 @@
 """ACI Utilities."""
+
 # pylint: disable=invalid-name
 import logging
 import re

nautobot_ssot/integrations/aci/jobs.py

@@ -1,4 +1,5 @@
 """Jobs for ACI SSoT app."""
+
 from django.templatetags.static import static
 from django.urls import reverse
 from diffsync import DiffSyncFlags

nautobot_ssot/integrations/aci/signals.py

@@ -1,4 +1,5 @@
 """Signals for ACI integration."""
+
 # pylint: disable=logging-fstring-interpolation, invalid-name
 import logging
 import random

nautobot_ssot/integrations/aristacv/diffsync/adapters/cloudvision.py

@@ -1,4 +1,5 @@
 """DiffSync adapter for Arista CloudVision."""
+
 import distutils
 import ipaddress
 import re

nautobot_ssot/integrations/aristacv/diffsync/adapters/nautobot.py

@@ -1,4 +1,5 @@
 """DiffSync adapter for Nautobot."""
+
 from collections import defaultdict
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import ProtectedError

nautobot_ssot/integrations/aristacv/diffsync/models/base.py

@@ -1,4 +1,5 @@
 """DiffSyncModel subclasses for Nautobot-to-AristaCV data sync."""
+
 from uuid import UUID
 from diffsync import DiffSyncModel
 from typing import List, Optional

nautobot_ssot/integrations/aristacv/diffsync/models/cloudvision.py

@@ -1,4 +1,5 @@
 """CloudVision DiffSync models for AristaCV SSoT."""
+
 from nautobot_ssot.integrations.aristacv.diffsync.models.base import (
     Device,
     CustomField,

nautobot_ssot/integrations/aristacv/diffsync/models/nautobot.py

@@ -1,4 +1,6 @@
 """Nautobot DiffSync models for AristaCV SSoT."""
+
+import logging
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from nautobot.core.settings_funcs import is_truthy
@@ -31,12 +33,19 @@
 from nautobot_ssot.integrations.aristacv.types import CloudVisionAppConfig
 from nautobot_ssot.integrations.aristacv.utils import nautobot
 
+logger = logging.getLogger(__name__)
+
 try:
-    from nautobot_device_lifecycle_mgmt.models import SoftwareLCM
+    from nautobot_device_lifecycle_mgmt.models import SoftwareLCM  # noqa: F401 # pylint: disable=unused-import
 
     LIFECYCLE_MGMT = True
 except ImportError:
-    print("Device Lifecycle app isn't installed so will revert to CustomField for OS version.")
+    logger.info("Device Lifecycle app isn't installed so will revert to CustomField for OS version.")
+    LIFECYCLE_MGMT = False
+except RuntimeError:
+    logger.warning(
+        "nautobot-device-lifecycle-mgmt is installed but not enabled. Did you forget to add it to your settings.PLUGINS?"
+    )
     LIFECYCLE_MGMT = False
 
 MISSING_CUSTOM_FIELDS = []

nautobot_ssot/integrations/aristacv/utils/cloudvision.py

@@ -665,9 +665,11 @@ def get_ip_interfaces(client: CloudvisionApi, dId: str):
                 ip_intfs.append(
                     {
                         "interface": results["intfId"],
-                        "address": results["addrWithMask"]
-                        if results["addrWithMask"] != "0.0.0.0/0"
-                        else results.get("virtualAddrWithMask"),
+                        "address": (
+                            results["addrWithMask"]
+                            if results["addrWithMask"] != "0.0.0.0/0"
+                            else results.get("virtualAddrWithMask")
+                        ),
                     }
                 )
     return ip_intfs

nautobot_ssot/integrations/aristacv/utils/nautobot.py

@@ -28,16 +28,20 @@
 from nautobot_ssot.integrations.aristacv import constants
 from nautobot_ssot.integrations.aristacv.types import CloudVisionAppConfig
 
+logger = logging.getLogger(__name__)
+
 try:
     from nautobot_device_lifecycle_mgmt.models import SoftwareLCM  # noqa: F401 # pylint: disable=unused-import
 
     LIFECYCLE_MGMT = True
 except ImportError:
-    print("Device Lifecycle app isn't installed so will revert to CustomField for OS version.")
+    logger.info("Device Lifecycle app isn't installed so will revert to CustomField for OS version.")
+    LIFECYCLE_MGMT = False
+except RuntimeError:
+    logger.warning(
+        "nautobot-device-lifecycle-mgmt is installed but not enabled. Did you forget to add it to your settings.PLUGINS?"
+    )
     LIFECYCLE_MGMT = False
-
-
-logger = logging.getLogger(__name__)
 
 
 def _get_or_create_integration(integration_name: str, config: dict) -> ExternalIntegration:

nautobot_ssot/integrations/device42/diffsync/adapters/device42.py

@@ -468,18 +468,26 @@ def load_vendor_and_model(self, hwmodel_name: str, manuf: str):
             hwmodel = self.hardware(
                 name=hwmodel_name,
                 manufacturer=manuf,
-                size=float(round(self.d42_hardware_map[hwmodel_name]["size"]))
-                if self.d42_hardware_map.get(hwmodel_name) and self.d42_hardware_map[hwmodel_name].get("size")
-                else 1.0,
-                depth=self.d42_hardware_map[hwmodel_name]["depth"]
-                if self.d42_hardware_map.get(hwmodel_name) and self.d42_hardware_map[hwmodel_name].get("depth")
-                else "Half Depth",
-                part_number=self.d42_hardware_map[hwmodel_name]["part_no"]
-                if self.d42_hardware_map.get(hwmodel_name) and self.d42_hardware_map[hwmodel_name].get("part_no")
-                else "",
-                custom_fields=get_custom_field_dict(self.d42_hardware_map[hwmodel_name]["custom_fields"])
-                if self.d42_hardware_map.get(hwmodel_name)
-                else {},
+                size=(
+                    float(round(self.d42_hardware_map[hwmodel_name]["size"]))
+                    if self.d42_hardware_map.get(hwmodel_name) and self.d42_hardware_map[hwmodel_name].get("size")
+                    else 1.0
+                ),
+                depth=(
+                    self.d42_hardware_map[hwmodel_name]["depth"]
+                    if self.d42_hardware_map.get(hwmodel_name) and self.d42_hardware_map[hwmodel_name].get("depth")
+                    else "Half Depth"
+                ),
+                part_number=(
+                    self.d42_hardware_map[hwmodel_name]["part_no"]
+                    if self.d42_hardware_map.get(hwmodel_name) and self.d42_hardware_map[hwmodel_name].get("part_no")
+                    else ""
+                ),
+                custom_fields=(
+                    get_custom_field_dict(self.d42_hardware_map[hwmodel_name]["custom_fields"])
+                    if self.d42_hardware_map.get(hwmodel_name)
+                    else {}
+                ),
                 uuid=None,
             )
             self.add(hwmodel)
@@ -762,9 +770,11 @@ def load_connections(self):
                 continue
             try:
                 new_conn = self.conn(
-                    src_device=self.d42_device_map[_conn["second_src_device"]]["name"]
-                    if _conn.get("second_src_device")
-                    else self.d42_device_map[_conn["src_device"]]["name"],
+                    src_device=(
+                        self.d42_device_map[_conn["second_src_device"]]["name"]
+                        if _conn.get("second_src_device")
+                        else self.d42_device_map[_conn["src_device"]]["name"]
+                    ),
                     src_port=self.d42_port_map[_conn["src_port"]]["port"],
                     src_port_mac=self.d42_port_map[_conn["src_port"]]["hwaddress"],
                     src_type="interface",
@@ -839,9 +849,11 @@ def load_providers_and_circuits(self):
                 a_side_conn = self.conn(
                     src_device=origin_dev,
                     src_port=origin_int,
-                    src_port_mac=self.d42_port_map[_tc["origin_netport_fk"]]["hwaddress"]
-                    if _tc["origin_type"] == "Device"
-                    else None,
+                    src_port_mac=(
+                        self.d42_port_map[_tc["origin_netport_fk"]]["hwaddress"]
+                        if _tc["origin_type"] == "Device"
+                        else None
+                    ),
                     src_type="interface" if _tc["origin_type"] == "Device Port" else "patch panel",
                     dst_device=_tc["circuit_id"],
                     dst_port=_tc["circuit_id"],
@@ -859,9 +871,11 @@ def load_providers_and_circuits(self):
                     src_type="circuit",
                     dst_device=endpoint_dev,
                     dst_port=endpoint_int,
-                    dst_port_mac=self.d42_port_map[_tc["end_point_netport_fk"]]["hwaddress"]
-                    if _tc["end_point_type"] == "Device"
-                    else None,
+                    dst_port_mac=(
+                        self.d42_port_map[_tc["end_point_netport_fk"]]["hwaddress"]
+                        if _tc["end_point_type"] == "Device"
+                        else None
+                    ),
                     dst_type="interface" if _tc["end_point_type"] == "Device Port" else "patch panel",
                     src_port_mac=None,
                     tags=None,

nautobot_ssot/integrations/device42/diffsync/adapters/nautobot.py

@@ -1,6 +1,7 @@
 """DiffSync adapter class for Nautobot as source-of-truth."""
-from collections import defaultdict
 
+from collections import defaultdict
+import logging
 from diffsync import DiffSync
 from diffsync.exceptions import ObjectAlreadyExists, ObjectNotFound
 from django.db.models import ProtectedError
@@ -28,12 +29,19 @@
 from nautobot_ssot.integrations.device42.diffsync.models.nautobot import assets, circuits, dcim, ipam
 from nautobot_ssot.integrations.device42.utils import nautobot
 
+logger = logging.getLogger(__name__)
+
 try:
-    import nautobot_device_lifecycle_mgmt  # noqa: F401
+    from nautobot_device_lifecycle_mgmt.models import SoftwareLCM  # noqa: F401 # pylint: disable=unused-import
 
     LIFECYCLE_MGMT = True
 except ImportError:
-    print("Device Lifecycle app isn't installed so will revert to CustomField for OS version.")
+    logger.info("Device Lifecycle app isn't installed so will revert to CustomField for OS version.")
+    LIFECYCLE_MGMT = False
+except RuntimeError:
+    logger.warning(
+        "nautobot-device-lifecycle-mgmt is installed but not enabled. Did you forget to add it to your settings.PLUGINS?"
+    )
     LIFECYCLE_MGMT = False
 
 

nautobot_ssot/integrations/device42/diffsync/models/nautobot/assets.py

@@ -76,7 +76,7 @@ def create(cls, diffsync, ids, attrs):
             try:
                 patch_panel.validated_save()
                 diffsync.device_map[ids["name"]] = patch_panel.id
-                return super().create(ids=ids, diffsync=diffsync, attrs=attrs)
+                return super().create(diffsync, ids=ids, attrs=attrs)
             except ValidationError as err:
                 if diffsync.job.debug:
                     diffsync.job.logger.warning(f"Unable to create {ids['name']} patch panel. {err}")
@@ -165,7 +165,7 @@ def create(cls, diffsync, ids, attrs):
                 if ids["patchpanel"] not in diffsync.rp_map:
                     diffsync.rp_map[ids["patchpanel"]] = {}
                 diffsync.rp_map[ids["patchpanel"]][ids["name"]] = rear_port.id
-                return super().create(ids=ids, diffsync=diffsync, attrs=attrs)
+                return super().create(diffsync, ids=ids, attrs=attrs)
             except ValidationError as err:
                 if diffsync.job.debug:
                     diffsync.job.logger.debug(f"Unable to create patch panel {ids['name']}. {err}")
@@ -216,7 +216,7 @@ def create(cls, diffsync, ids, attrs):
                 if ids["patchpanel"] not in diffsync.fp_map:
                     diffsync.fp_map[ids["patchpanel"]] = {}
                 diffsync.fp_map[ids["patchpanel"]][ids["name"]] = front_port.id
-                return super().create(ids=ids, diffsync=diffsync, attrs=attrs)
+                return super().create(diffsync, ids=ids, attrs=attrs)
             except ValidationError as err:
                 diffsync.job.logger.debug(f"Unable to create patch panel front port {ids['name']}. {err}")
                 return None

nautobot_ssot/integrations/device42/diffsync/models/nautobot/circuits.py

@@ -37,7 +37,7 @@ def create(cls, diffsync, ids, attrs):
             try:
                 _provider.validated_save()
                 diffsync.provider_map[ids["name"]] = _provider.id
-                return super().create(ids=ids, diffsync=diffsync, attrs=attrs)
+                return super().create(diffsync, ids=ids, attrs=attrs)
             except ValidationError as err:
                 if diffsync.job.debug:
                     diffsync.job.logger.warning(f"Unable to create {ids['name']} provider. {err}")
@@ -122,7 +122,7 @@ def create(cls, diffsync, ids, attrs):
                     term_side="Z",
                     circuit=_circuit,
                 )
-        return super().create(ids=ids, diffsync=diffsync, attrs=attrs)
+        return super().create(diffsync, ids=ids, attrs=attrs)
 
     def update(self, attrs):
         """Update Circuit object in Nautobot."""