From 26bc43606d15736f26a8c738b6d47f9a36a1b6eb Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:17:00 -0600 Subject: [PATCH 1/4] build: Bump version to 3.3.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b2887d73..63ff2d39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nautobot-ssot" -version = "3.2.1a0" +version = "3.3.0" description = "Nautobot Single Source of Truth" authors = ["Network to Code, LLC "] license = "Apache-2.0" From c1729e554d8b1516a0d586daf8913e3b4103cde3 Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:23:09 -0600 Subject: [PATCH 2/4] =?UTF-8?q?docs:=20=F0=9F=93=9D=20Add=20release=20note?= =?UTF-8?q?s=20for=203.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changes/310.added | 1 - changes/411.fixed | 1 - changes/449.added | 1 - changes/449.fixed | 1 - changes/467.fixed | 1 - changes/582.fixed | 1 - changes/585.documentation | 1 - changes/585.fixed | 1 - changes/585.housekeeping | 1 - changes/587.housekeeping | 1 - changes/588.added | 1 - changes/588.fixed | 1 - changes/588.removed | 1 - changes/590.changed | 1 - changes/593.added | 2 - changes/593.fixed | 5 -- changes/593.housekeeping | 1 - changes/599.added | 1 - changes/599.fixed | 1 - changes/599.housekeeping | 1 - changes/600.added | 1 - changes/605.documentation | 1 - changes/605.housekeeping | 1 - changes/607.fixed | 1 - changes/607.housekeeping | 1 - changes/610.fixed | 1 - changes/612.fixed | 1 - changes/614.fixed | 2 - changes/616.fixed | 1 - docs/admin/release_notes/version_3.3.md | 67 +++++++++++++++++++++++++ mkdocs.yml | 1 + 31 files changed, 68 insertions(+), 35 deletions(-) delete mode 100644 changes/310.added delete mode 100644 changes/411.fixed delete mode 100644 changes/449.added delete mode 100644 changes/449.fixed delete mode 100644 changes/467.fixed delete mode 100644 changes/582.fixed delete mode 100644 changes/585.documentation delete mode 100644 changes/585.fixed delete mode 100644 changes/585.housekeeping delete mode 100644 changes/587.housekeeping delete mode 100644 changes/588.added delete mode 100644 changes/588.fixed delete mode 100644 changes/588.removed delete mode 100644 changes/590.changed delete mode 100644 changes/593.added delete mode 100644 changes/593.fixed delete mode 100644 changes/593.housekeeping delete mode 100644 changes/599.added delete mode 100644 changes/599.fixed delete mode 100644 changes/599.housekeeping delete mode 100644 changes/600.added delete mode 100644 changes/605.documentation delete mode 100644 changes/605.housekeeping delete mode 100644 changes/607.fixed delete mode 100644 changes/607.housekeeping delete mode 100644 changes/610.fixed delete mode 100644 changes/612.fixed delete mode 100644 changes/614.fixed delete mode 100644 changes/616.fixed create mode 100644 docs/admin/release_notes/version_3.3.md diff --git a/changes/310.added b/changes/310.added deleted file mode 100644 index eb8eb917..00000000 --- a/changes/310.added +++ /dev/null @@ -1 +0,0 @@ -Added common TypedDicts for Contrib SSoT. \ No newline at end of file diff --git a/changes/411.fixed b/changes/411.fixed deleted file mode 100644 index 57faa9b2..00000000 --- a/changes/411.fixed +++ /dev/null @@ -1 +0,0 @@ -Fixed imports in CustomFields migration that was causing installation issues. \ No newline at end of file diff --git a/changes/449.added b/changes/449.added deleted file mode 100644 index fa41a93b..00000000 --- a/changes/449.added +++ /dev/null @@ -1 +0,0 @@ -Add `delete_records` flag to the ServiceNow DataTarget job \ No newline at end of file diff --git a/changes/449.fixed b/changes/449.fixed deleted file mode 100644 index b4be9627..00000000 --- a/changes/449.fixed +++ /dev/null @@ -1 +0,0 @@ -Fix logic used for loading location records to make ServiceNow SSoT Nautobot 2.x compatible \ No newline at end of file diff --git a/changes/467.fixed b/changes/467.fixed deleted file mode 100644 index b24d50d8..00000000 --- a/changes/467.fixed +++ /dev/null @@ -1 +0,0 @@ -Fix get_tags_by_type() to handle possible RpcError Exception being thrown. \ No newline at end of file diff --git a/changes/582.fixed b/changes/582.fixed deleted file mode 100644 index 11657b0c..00000000 --- a/changes/582.fixed +++ /dev/null @@ -1 +0,0 @@ -Fixed erroneous print statement in sync logs. diff --git a/changes/585.documentation b/changes/585.documentation deleted file mode 100644 index 437fa718..00000000 --- a/changes/585.documentation +++ /dev/null @@ -1 +0,0 @@ -Fix documentation for Bootstrap installation. \ No newline at end of file diff --git a/changes/585.fixed b/changes/585.fixed deleted file mode 100644 index 477430e0..00000000 --- a/changes/585.fixed +++ /dev/null @@ -1 +0,0 @@ -Fixed use of DLM classes with Bootstrap integration. \ No newline at end of file diff --git a/changes/585.housekeeping b/changes/585.housekeeping deleted file mode 100644 index 04a4dccb..00000000 --- a/changes/585.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Disabled the BootstrapDataTarget Job as it's not usable at this time. \ No newline at end of file diff --git a/changes/587.housekeeping b/changes/587.housekeeping deleted file mode 100644 index eb854f12..00000000 --- a/changes/587.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Changed model_class_name in .cookiecutter.json to a valid model to help with drift management. diff --git a/changes/588.added b/changes/588.added deleted file mode 100644 index ea8174b8..00000000 --- a/changes/588.added +++ /dev/null @@ -1 +0,0 @@ -Added support for Software Version object in DNA Center integration. \ No newline at end of file diff --git a/changes/588.fixed b/changes/588.fixed deleted file mode 100644 index 7dd13224..00000000 --- a/changes/588.fixed +++ /dev/null @@ -1 +0,0 @@ -Fixed hostname mapping functionality in DNA Center integration. It is now available in the Job form. \ No newline at end of file diff --git a/changes/588.removed b/changes/588.removed deleted file mode 100644 index 6cf4e85e..00000000 --- a/changes/588.removed +++ /dev/null @@ -1 +0,0 @@ -Removed use of OS Version CustomField in DNA Center integration. Now uses Software Version from Nautobot 2.2 and/or Device Lifecycle Management SoftwareLCM object if found. \ No newline at end of file diff --git a/changes/590.changed b/changes/590.changed deleted file mode 100644 index 213bb79f..00000000 --- a/changes/590.changed +++ /dev/null @@ -1 +0,0 @@ -Improved error message for validated save in contrib model. \ No newline at end of file diff --git a/changes/593.added b/changes/593.added deleted file mode 100644 index 1f618692..00000000 --- a/changes/593.added +++ /dev/null @@ -1,2 +0,0 @@ -Added ability to rename Network in Meraki and Datacenter in DNA Center integrations using location_map. -Added support for SoftwareVersion in Bootstrap integration. \ No newline at end of file diff --git a/changes/593.fixed b/changes/593.fixed deleted file mode 100644 index cd090d18..00000000 --- a/changes/593.fixed +++ /dev/null @@ -1,5 +0,0 @@ -Fixed Meraki loading of Nautobot Prefixes that have multiple Locations assigned. -Fixed DNA Center loading incorrect location names for Devices. -Fixed KeyError being thrown when port is missing from uplink_settings dict in Meraki integration. -Fixed error in Bootstrap integration in loading ValidatedSoftwareLCM when SoftwareLCM doesn't exist. -Fixed DoesNotExist thrown when attempting to load ContentType that doesn't exist in Bootstrap integration. \ No newline at end of file diff --git a/changes/593.housekeeping b/changes/593.housekeeping deleted file mode 100644 index 64cded5e..00000000 --- a/changes/593.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Add code owners for DNA Center, Meraki, and Itential integrations. \ No newline at end of file diff --git a/changes/599.added b/changes/599.added deleted file mode 100644 index c497bf5e..00000000 --- a/changes/599.added +++ /dev/null @@ -1 +0,0 @@ -Added Citrix ADM integration. \ No newline at end of file diff --git a/changes/599.fixed b/changes/599.fixed deleted file mode 100644 index 235edad4..00000000 --- a/changes/599.fixed +++ /dev/null @@ -1 +0,0 @@ -Fixed Bootstrap signals that are using create_or_update_custom_field() to pass apps. This was done to correct bug causing Nautobot to crash during startup. \ No newline at end of file diff --git a/changes/599.housekeeping b/changes/599.housekeeping deleted file mode 100644 index 545b24b0..00000000 --- a/changes/599.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Consolidated repeat function, parse_hostname_for_role(), from DNA Center and Citrix integrations as SSoT utility function. \ No newline at end of file diff --git a/changes/600.added b/changes/600.added deleted file mode 100644 index 66af0d5c..00000000 --- a/changes/600.added +++ /dev/null @@ -1 +0,0 @@ -Added integration with Slurpit. \ No newline at end of file diff --git a/changes/605.documentation b/changes/605.documentation deleted file mode 100644 index e40c40d8..00000000 --- a/changes/605.documentation +++ /dev/null @@ -1 +0,0 @@ -Add missing acknowledgements for a few integrations. \ No newline at end of file diff --git a/changes/605.housekeeping b/changes/605.housekeeping deleted file mode 100644 index cba8f8e2..00000000 --- a/changes/605.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Add code owner for Citrix ADM integration. \ No newline at end of file diff --git a/changes/607.fixed b/changes/607.fixed deleted file mode 100644 index e77637ae..00000000 --- a/changes/607.fixed +++ /dev/null @@ -1 +0,0 @@ -Fix hostname_mapping functionailty in Citrix ADM integration. \ No newline at end of file diff --git a/changes/607.housekeeping b/changes/607.housekeeping deleted file mode 100644 index dc6054ac..00000000 --- a/changes/607.housekeeping +++ /dev/null @@ -1 +0,0 @@ -Remove redundant parse_hostname_for_role() function in Meraki integration that was missed in 599. \ No newline at end of file diff --git a/changes/610.fixed b/changes/610.fixed deleted file mode 100644 index 276bc48a..00000000 --- a/changes/610.fixed +++ /dev/null @@ -1 +0,0 @@ -Fix delete function for NautobotValidatedSoftware so UUID is used to find object instead of querying for Platform and Software object. \ No newline at end of file diff --git a/changes/612.fixed b/changes/612.fixed deleted file mode 100644 index 67967ed7..00000000 --- a/changes/612.fixed +++ /dev/null @@ -1 +0,0 @@ -Fixed AttributeError on attempting to load Platforms with no Manufacturer assigned. \ No newline at end of file diff --git a/changes/614.fixed b/changes/614.fixed deleted file mode 100644 index a8f04e78..00000000 --- a/changes/614.fixed +++ /dev/null @@ -1,2 +0,0 @@ -Fixed creating platforms with no Manufacturer assigned. -Fixed time_zone attribute normalization on Location objects. \ No newline at end of file diff --git a/changes/616.fixed b/changes/616.fixed deleted file mode 100644 index 4b5dff0f..00000000 --- a/changes/616.fixed +++ /dev/null @@ -1 +0,0 @@ -Ensure Devices missing Platform are not loaded from DNA Center. \ No newline at end of file diff --git a/docs/admin/release_notes/version_3.3.md b/docs/admin/release_notes/version_3.3.md new file mode 100644 index 00000000..ba03c32b --- /dev/null +++ b/docs/admin/release_notes/version_3.3.md @@ -0,0 +1,67 @@ +# v3.3 Release Notes + +This document describes all new features and changes in the release. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## Release Overview + +There have been two new integrations added to the project! + + 1. Citrix ADM: This integration allows you to pull in the inventory of your Application Delivery Controllers from Citrix ADM into Nautobot. + 2. Slurp`It: This integration enables users to import data from Slurp`It that's a bit more flexible than their custom Nautobot App. + +- Additionally, support for the SoftwareVersion model has been added to the DNA Center and Bootstrap integrations. + +## [v3.3.0 (2024-12-06)](https://github.com/nautobot/nautobot-app-ssot/releases/tag/v3.3.0) + +### Added + +- [#310](https://github.com/nautobot/nautobot-app-ssot/issues/310) - Added common TypedDicts for Contrib SSoT. +- [#449](https://github.com/nautobot/nautobot-app-ssot/issues/449) - Add `delete_records` flag to the ServiceNow DataTarget job +- [#588](https://github.com/nautobot/nautobot-app-ssot/issues/588) - Added support for Software Version object in DNA Center integration. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Added ability to rename Network in Meraki and Datacenter in DNA Center integrations using location_map. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Added support for SoftwareVersion in Bootstrap integration. +- [#599](https://github.com/nautobot/nautobot-app-ssot/issues/599) - Added Citrix ADM integration. +- [#600](https://github.com/nautobot/nautobot-app-ssot/issues/600) - Added integration with Slurpit. + +### Changed + +- [#590](https://github.com/nautobot/nautobot-app-ssot/issues/590) - Improved error message for validated save in contrib model. + +### Removed + +- [#588](https://github.com/nautobot/nautobot-app-ssot/issues/588) - Removed use of OS Version CustomField in DNA Center integration. Now uses Software Version from Nautobot 2.2 and/or Device Lifecycle Management SoftwareLCM object if found. + +### Fixed + +- [#411](https://github.com/nautobot/nautobot-app-ssot/issues/411) - Fixed imports in CustomFields migration that was causing installation issues. +- [#449](https://github.com/nautobot/nautobot-app-ssot/issues/449) - Fix logic used for loading location records to make ServiceNow SSoT Nautobot 2.x compatible +- [#467](https://github.com/nautobot/nautobot-app-ssot/issues/467) - Fix get_tags_by_type() to handle possible RpcError Exception being thrown. +- [#582](https://github.com/nautobot/nautobot-app-ssot/issues/582) - Fixed erroneous print statement in sync logs. +- [#585](https://github.com/nautobot/nautobot-app-ssot/issues/585) - Fixed use of DLM classes with Bootstrap integration. +- [#588](https://github.com/nautobot/nautobot-app-ssot/issues/588) - Fixed hostname mapping functionality in DNA Center integration. It is now available in the Job form. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Fixed Meraki loading of Nautobot Prefixes that have multiple Locations assigned. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Fixed DNA Center loading incorrect location names for Devices. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Fixed KeyError being thrown when port is missing from uplink_settings dict in Meraki integration. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Fixed error in Bootstrap integration in loading ValidatedSoftwareLCM when SoftwareLCM doesn't exist. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Fixed DoesNotExist thrown when attempting to load ContentType that doesn't exist in Bootstrap integration. +- [#599](https://github.com/nautobot/nautobot-app-ssot/issues/599) - Fixed Bootstrap signals that are using create_or_update_custom_field() to pass apps. This was done to correct bug causing Nautobot to crash during startup. +- [#607](https://github.com/nautobot/nautobot-app-ssot/issues/607) - Fix hostname_mapping functionailty in Citrix ADM integration. +- [#610](https://github.com/nautobot/nautobot-app-ssot/issues/610) - Fix delete function for NautobotValidatedSoftware so UUID is used to find object instead of querying for Platform and Software object. +- [#612](https://github.com/nautobot/nautobot-app-ssot/issues/612) - Fixed AttributeError on attempting to load Platforms with no Manufacturer assigned. +- [#614](https://github.com/nautobot/nautobot-app-ssot/issues/614) - Fixed creating platforms with no Manufacturer assigned. +- [#614](https://github.com/nautobot/nautobot-app-ssot/issues/614) - Fixed time_zone attribute normalization on Location objects. +- [#616](https://github.com/nautobot/nautobot-app-ssot/issues/616) - Ensure Devices missing Platform are not loaded from DNA Center. + +### Documentation + +- [#585](https://github.com/nautobot/nautobot-app-ssot/issues/585) - Fix documentation for Bootstrap installation. +- [#605](https://github.com/nautobot/nautobot-app-ssot/issues/605) - Add missing acknowledgements for a few integrations. + +### Housekeeping + +- [#585](https://github.com/nautobot/nautobot-app-ssot/issues/585) - Disabled the BootstrapDataTarget Job as it's not usable at this time. +- [#587](https://github.com/nautobot/nautobot-app-ssot/issues/587) - Changed model_class_name in .cookiecutter.json to a valid model to help with drift management. +- [#593](https://github.com/nautobot/nautobot-app-ssot/issues/593) - Add code owners for DNA Center, Meraki, and Itential integrations. +- [#599](https://github.com/nautobot/nautobot-app-ssot/issues/599) - Consolidated repeat function, parse_hostname_for_role(), from DNA Center and Citrix integrations as SSoT utility function. +- [#605](https://github.com/nautobot/nautobot-app-ssot/issues/605) - Add code owner for Citrix ADM integration. +- [#607](https://github.com/nautobot/nautobot-app-ssot/issues/607) - Remove redundant parse_hostname_for_role() function in Meraki integration that was missed in 599. diff --git a/mkdocs.yml b/mkdocs.yml index 05397487..9394f231 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -145,6 +145,7 @@ nav: - Compatibility Matrix: "admin/compatibility_matrix.md" - Release Notes: - "admin/release_notes/index.md" + - v3.3: "admin/release_notes/version_3.3.md" - v3.2: "admin/release_notes/version_3.2.md" - v3.1: "admin/release_notes/version_3.1.md" - v3.0: "admin/release_notes/version_3.0.md" From ec6000c94a9b88e338a2c31d52a8e8eff5e6972d Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 6 Dec 2024 12:23:36 -0600 Subject: [PATCH 3/4] =?UTF-8?q?docs:=20=F0=9F=93=9D=20Update=20compatibili?= =?UTF-8?q?ty=20matrix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/admin/compatibility_matrix.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/admin/compatibility_matrix.md b/docs/admin/compatibility_matrix.md index cce8d22b..1ab142b3 100644 --- a/docs/admin/compatibility_matrix.md +++ b/docs/admin/compatibility_matrix.md @@ -29,3 +29,4 @@ While that last supported version will not be strictly enforced--via the max_ver | 3.0.1 | 2.1.0 | 2.99.99 | | 3.1.0 | 2.1.0 | 2.99.99 | | 3.2.0 | 2.1.0 | 2.99.99 | +| 3.3.0 | 2.1.0 | 2.99.99 | From 2c88ac2aed4ec52b317046161747b079abc6953d Mon Sep 17 00:00:00 2001 From: Justin Drew <2396364+jdrew82@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:03:05 -0600 Subject: [PATCH 4/4] build: Bump prepatch --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 63ff2d39..16dec565 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nautobot-ssot" -version = "3.3.0" +version = "3.3.1a0" description = "Nautobot Single Source of Truth" authors = ["Network to Code, LLC "] license = "Apache-2.0"