Merge pull request #174 from nautobot/jlw-migration-patch

Jlw migration patch
nautobot · Oct 4, 2023 · ef3de94 · ef3de94
2 parents a824336 + 2963b4e
commit ef3de94
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git 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/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
 

diff --git 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
@@ -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
@@ -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
@@ -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 <[email protected]>"]
 license = "Apache-2.0"