From 9d1674498b3b1774db3ee07b043505dd6be768f7 Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Wed, 4 Oct 2023 08:12:51 -0500 Subject: [PATCH 1/2] resolve issues with migrations --- .github/workflows/ci.yml | 2 +- mkdocs.yml | 1 + .../migrations/0017_resolve_issues_through_tables_part1.py | 4 ++-- .../migrations/0018_resolve_issues_through_tables_part2.py | 2 +- pyproject.toml | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fed96087..c4638c5b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -128,7 +128,7 @@ jobs: nautobot-version: "stable" # - python-version: "3.11" # db-backend: "mysql" - # nautobot-version: "2.0.0-rc.4" + # nautobot-version: "2.0.0" runs-on: "ubuntu-20.04" env: INVOKE_NAUTOBOT_FIREWALL_MODELS_PYTHON_VER: "${{ matrix.python-version }}" diff --git a/mkdocs.yml b/mkdocs.yml index 27043602..7fdc3178 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -109,6 +109,7 @@ nav: - Compatibility Matrix: "admin/compatibility_matrix.md" - Release Notes: - "admin/release_notes/index.md" + - v2.0: "admin/release_notes/version_2.0.md" - v1.2: "admin/release_notes/version_1.2.md" - v1.1: "admin/release_notes/version_1.1.md" - v1.0: "admin/release_notes/version_1.0.md" diff --git a/nautobot_firewall_models/migrations/0017_resolve_issues_through_tables_part1.py b/nautobot_firewall_models/migrations/0017_resolve_issues_through_tables_part1.py index a23ad559..d46171b2 100644 --- a/nautobot_firewall_models/migrations/0017_resolve_issues_through_tables_part1.py +++ b/nautobot_firewall_models/migrations/0017_resolve_issues_through_tables_part1.py @@ -32,12 +32,12 @@ class Migration(migrations.Migration): migrations.AddField( model_name="zone", name="new_interfaces", - field=models.ManyToManyField(blank=True, related_name="zones", to="nautobot_firewall_models.UserObject"), + field=models.ManyToManyField(blank=True, related_name="zones", to="dcim.Interface"), ), migrations.AddField( model_name="zone", name="new_vrfs", - field=models.ManyToManyField(blank=True, related_name="zones", to="nautobot_firewall_models.UserObject"), + field=models.ManyToManyField(blank=True, related_name="zones", to="ipam.VRF"), ), migrations.AddField( model_name="serviceobjectgroup", diff --git a/nautobot_firewall_models/migrations/0018_resolve_issues_through_tables_part2.py b/nautobot_firewall_models/migrations/0018_resolve_issues_through_tables_part2.py index 56600305..fed205b9 100644 --- a/nautobot_firewall_models/migrations/0018_resolve_issues_through_tables_part2.py +++ b/nautobot_firewall_models/migrations/0018_resolve_issues_through_tables_part2.py @@ -38,7 +38,7 @@ { "model": "nautobot_firewall_models.PolicyRule", "old": "destination_address_groups", - "new": "new_destination_addresse_groups", + "new": "new_destination_address_groups", }, {"model": "nautobot_firewall_models.PolicyRule", "old": "destination_services", "new": "new_destination_services"}, { diff --git a/pyproject.toml b/pyproject.toml index a66a73bf..1802fa85 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nautobot-firewall-models" -version = "2.0.0" +version = "2.0.1" description = "Nautobot plugin to model firewall objects." authors = ["Network to Code, LLC "] license = "Apache-2.0" From 2963b4e214fb8aa5ae8a28b35202b75ed665f381 Mon Sep 17 00:00:00 2001 From: Jeremy White Date: Wed, 4 Oct 2023 08:50:15 -0500 Subject: [PATCH 2/2] release note --- docs/admin/release_notes/version_2.0.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/admin/release_notes/version_2.0.md b/docs/admin/release_notes/version_2.0.md index 0f6e278b..af21f3f9 100644 --- a/docs/admin/release_notes/version_2.0.md +++ b/docs/admin/release_notes/version_2.0.md @@ -2,7 +2,13 @@ This document describes all new features and changes in the release `2.0`. 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). -## v2.0.0 - 2023-05-03 +## v2.0.1 - 2023-10-04 + +### Fixed + +- [#173](https://github.com/nautobot/nautobot-plugin-firewall-models/issues/173) Resolve issues with v2 migrations + +## v2.0.0 - 2023-09-29 ### Changed