Merge pull request #364 from nautobot/release/v2.1.2

Release v2.1.2

Author: gsnider2195

changes/323.housekeeping

@@ -1,6 +1,6 @@
 
 {% if render_title %}
-## [v{{ versiondata.version }} ({{ versiondata.date }})]({{ cookiecutter.repo_url }}/releases/tag/v{{ versiondata.version}})
+## [v{{ versiondata.version }} ({{ versiondata.date }})](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/releases/tag/v{{ versiondata.version}})
 
 {% endif %}
 {% for section, _ in sections.items() %}
@@ -27,4 +27,3 @@ No significant changes.
 
 {% endif %}
 {% endfor %}
-

development/towncrier_template.j2

@@ -2,11 +2,12 @@
 
 | Device Lifecycle Management Version | Nautobot First Support Version | Nautobot Last Support Version |
 | ------------- | -------------------- | ------------- |
-| 2.1.X         | 2.0.0                | 2.99.99       |
-| 2.0.X         | 2.0.0                | 2.99.99       |
+| 2.1.2-2.1.X   | 2.0.0                | 2.99.99       |
+| 2.1.0-2.1.1   | 2.0.0                | 2.2.99        |
+| 2.0.X         | 2.0.0                | 2.2.99        |
 | 1.6.X         | 1.4.0                | 1.6.X         |
 | 1.3.X         | 1.4.0                | 1.X.X         |
 | 1.2.X         | 1.4.0                | 1.X.X         |
-| 1.1.X         | 1.2.0               | 1.5.9         |
-| 1.0.X         | 1.1.6               | 1.5.9         |
-| 0.4.X         | 1.1.6               | 1.4.0         |
+| 1.1.X         | 1.2.0                | 1.5.9         |
+| 1.0.X         | 1.1.6                | 1.5.9         |
+| 0.4.X         | 1.1.6                | 1.4.0         |

docs/admin/compatibility_matrix.md

@@ -6,6 +6,24 @@ This document describes all new features and changes in the release `2.1`. The f
 
 This release adds support for various improvements, bug fixes, and performance improvements.
 
+<!-- towncrier release notes start -->
+## [v2.1.2 (2024-08-08)](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/releases/tag/v2.1.2)
+
+### Added
+
+- [#344](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/issues/344) - Added number field to Contract retrieve template.
+- [#348](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/issues/348) - Updated Device Software Validation Reports Bar Graph x-axis label modification.
+- [#360](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/issues/360) - Added support for Django 4.
+
+### Changed
+
+- [#328](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/issues/328) - Updated the max character length on majority of text fields.
+
+### Fixed
+
+- [#346](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/issues/346) - Fixed documentation view missing.
+- [#360](https://github.com/nautobot/nautobot-app-device-lifecycle-mgmt/issues/360) - Fixed Nautobot v2.3 incompatibility.
+
 ## [v2.1.1] - 2024-04-08
 
 ### Fixed

docs/admin/release_notes/version_2.1.md

@@ -27,6 +27,7 @@ class NautobotDeviceLifecycleManagementConfig(NautobotAppConfig):
         "barchart_height": 5,
     }
     caching_config = {}
+    docs_view_name = "plugins:nautobot_device_lifecycle_mgmt:docs"
 
     def ready(self):
         """Register custom signals."""

nautobot_device_lifecycle_mgmt/__init__.py

@@ -0,0 +1,112 @@
+# Generated by Django 3.2.21 on 2024-04-27 19:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("nautobot_device_lifecycle_mgmt", "0020_alter_created_tags"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contactlcm",
+            name="address",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="contactlcm",
+            name="name",
+            field=models.CharField(max_length=255, null=True),
+        ),
+        migrations.AlterField(
+            model_name="contactlcm",
+            name="phone",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="contactlcm",
+            name="type",
+            field=models.CharField(default="Unassigned", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="contractlcm",
+            name="contract_type",
+            field=models.CharField(blank=True, default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="contractlcm",
+            name="name",
+            field=models.CharField(max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="contractlcm",
+            name="number",
+            field=models.CharField(blank=True, default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="contractlcm",
+            name="support_level",
+            field=models.CharField(blank=True, default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="cvelcm",
+            name="name",
+            field=models.CharField(max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="cvelcm",
+            name="severity",
+            field=models.CharField(default="None", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="devicesoftwarevalidationresult",
+            name="run_type",
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="inventoryitemsoftwarevalidationresult",
+            name="run_type",
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="providerlcm",
+            name="description",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="providerlcm",
+            name="name",
+            field=models.CharField(max_length=255, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="providerlcm",
+            name="phone",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="providerlcm",
+            name="physical_address",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="softwareimagelcm",
+            name="hashing_algorithm",
+            field=models.CharField(blank=True, default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="softwareimagelcm",
+            name="image_file_name",
+            field=models.CharField(max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="softwarelcm",
+            name="alias",
+            field=models.CharField(blank=True, default="", max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="softwarelcm",
+            name="version",
+            field=models.CharField(max_length=255),
+        ),
+    ]

nautobot_device_lifecycle_mgmt/migrations/0021_update_max_char_length.py

@@ -0,0 +1,47 @@
+# Generated by Django 4.2.14 on 2024-08-05 22:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("nautobot_device_lifecycle_mgmt", "0021_update_max_char_length"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="softwareimagelcm",
+            name="inventory_items",
+            field=models.ManyToManyField(blank=True, related_name="+", to="dcim.inventoryitem"),
+        ),
+        migrations.AlterField(
+            model_name="softwareimagelcm",
+            name="object_tags",
+            field=models.ManyToManyField(blank=True, related_name="+", to="extras.tag"),
+        ),
+        migrations.AlterField(
+            model_name="validatedsoftwarelcm",
+            name="device_roles",
+            field=models.ManyToManyField(blank=True, related_name="+", to="extras.role"),
+        ),
+        migrations.AlterField(
+            model_name="validatedsoftwarelcm",
+            name="device_types",
+            field=models.ManyToManyField(blank=True, related_name="+", to="dcim.devicetype"),
+        ),
+        migrations.AlterField(
+            model_name="validatedsoftwarelcm",
+            name="devices",
+            field=models.ManyToManyField(blank=True, related_name="+", to="dcim.device"),
+        ),
+        migrations.AlterField(
+            model_name="validatedsoftwarelcm",
+            name="inventory_items",
+            field=models.ManyToManyField(blank=True, related_name="+", to="dcim.inventoryitem"),
+        ),
+        migrations.AlterField(
+            model_name="validatedsoftwarelcm",
+            name="object_tags",
+            field=models.ManyToManyField(blank=True, related_name="+", to="extras.tag"),
+        ),
+    ]

nautobot_device_lifecycle_mgmt/migrations/0022_alter_softwareimagelcm_inventory_items_and_more.py

@@ -7,6 +7,12 @@
 # from django.urls import reverse
 from django.core.exceptions import ValidationError
 from django.db import models
+
+try:
+    from nautobot.apps.constants import CHARFIELD_MAX_LENGTH
+except ImportError:
+    CHARFIELD_MAX_LENGTH = 255
+
 from nautobot.core.models.generics import OrganizationalModel, PrimaryModel
 from nautobot.core.models.querysets import RestrictedQuerySet
 from nautobot.dcim.models import Device, DeviceType, InventoryItem
@@ -45,7 +51,7 @@ class HardwareLCM(PrimaryModel):
         null=True,
     )
     inventory_item = models.CharField(  # pylint: disable=nb-string-field-blank-null
-        verbose_name="Inventory Item Part", max_length=255, blank=True, null=True
+        verbose_name="Inventory Item Part", max_length=CHARFIELD_MAX_LENGTH, blank=True, null=True
     )
     release_date = models.DateField(null=True, blank=True, verbose_name="Release Date")
     end_of_sale = models.DateField(null=True, blank=True, verbose_name="End of Sale")
@@ -157,8 +163,8 @@ class SoftwareLCM(PrimaryModel):
     """Software Life-Cycle Management model."""
 
     device_platform = models.ForeignKey(to="dcim.Platform", on_delete=models.CASCADE, verbose_name="Device Platform")
-    version = models.CharField(max_length=50)
-    alias = models.CharField(max_length=50, blank=True, default="")
+    version = models.CharField(max_length=CHARFIELD_MAX_LENGTH)
+    alias = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True, default="")
     release_date = models.DateField(null=True, blank=True, verbose_name="Release Date")
     end_of_support = models.DateField(null=True, blank=True, verbose_name="End of Software Support")
     documentation_url = models.URLField(blank=True, verbose_name="Documentation URL")
@@ -212,7 +218,7 @@ def get_for_object(self, obj):
 class SoftwareImageLCM(PrimaryModel):
     """SoftwareImageLCM model."""
 
-    image_file_name = models.CharField(blank=False, max_length=100, verbose_name="Image File Name")
+    image_file_name = models.CharField(blank=False, max_length=CHARFIELD_MAX_LENGTH, verbose_name="Image File Name")
     software = models.ForeignKey(
         to="SoftwareLCM", on_delete=models.CASCADE, related_name="software_images", verbose_name="Software Version"
     )
@@ -221,7 +227,9 @@ class SoftwareImageLCM(PrimaryModel):
     object_tags = models.ManyToManyField(to="extras.Tag", related_name="+", blank=True)
     download_url = models.URLField(blank=True, verbose_name="Download URL")
     image_file_checksum = models.CharField(blank=True, max_length=256, verbose_name="Image File Checksum")
-    hashing_algorithm = models.CharField(default="", blank=True, max_length=32, verbose_name="Hashing Algorithm")
+    hashing_algorithm = models.CharField(
+        default="", blank=True, max_length=CHARFIELD_MAX_LENGTH, verbose_name="Hashing Algorithm"
+    )
     default_image = models.BooleanField(verbose_name="Default Image", default=False)
 
     class Meta:
@@ -341,7 +349,7 @@ class DeviceSoftwareValidationResult(PrimaryModel):
     )
     is_validated = models.BooleanField(null=True, blank=True)
     last_run = models.DateTimeField(null=True, blank=True)
-    run_type = models.CharField(max_length=50, choices=choices.ReportRunTypeChoices)
+    run_type = models.CharField(max_length=CHARFIELD_MAX_LENGTH, choices=choices.ReportRunTypeChoices)
     valid_software = models.ManyToManyField(
         to="ValidatedSoftwareLCM", related_name="device_software_validation_results"
     )
@@ -378,7 +386,7 @@ class InventoryItemSoftwareValidationResult(PrimaryModel):
     )
     is_validated = models.BooleanField(null=True, blank=True)
     last_run = models.DateTimeField(null=True, blank=True)
-    run_type = models.CharField(max_length=50, choices=choices.ReportRunTypeChoices)
+    run_type = models.CharField(max_length=CHARFIELD_MAX_LENGTH, choices=choices.ReportRunTypeChoices)
     valid_software = models.ManyToManyField(
         to="ValidatedSoftwareLCM", related_name="inventory_item_software_validation_results"
     )
@@ -421,14 +429,18 @@ class ContractLCM(PrimaryModel):
         blank=True,
         null=True,
     )
-    name = models.CharField(max_length=100, unique=True)
-    number = models.CharField(max_length=100, blank=True, default="")
+    name = models.CharField(max_length=CHARFIELD_MAX_LENGTH, unique=True)
+    number = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True, default="")
     start = models.DateField(null=True, blank=True, verbose_name="Contract Start Date")
     end = models.DateField(null=True, blank=True, verbose_name="Contract End Date")
     cost = models.DecimalField(null=True, blank=True, decimal_places=2, max_digits=15, verbose_name="Contract Cost")
-    support_level = models.CharField(verbose_name="Support Level", max_length=64, blank=True, default="")
+    support_level = models.CharField(
+        verbose_name="Support Level", max_length=CHARFIELD_MAX_LENGTH, blank=True, default=""
+    )
     currency = models.CharField(verbose_name="Currency", max_length=4, blank=True, default="")
-    contract_type = models.CharField(verbose_name="Contract Type", max_length=32, blank=True, default="")
+    contract_type = models.CharField(
+        verbose_name="Contract Type", max_length=CHARFIELD_MAX_LENGTH, blank=True, default=""
+    )
     devices = models.ManyToManyField(to="dcim.Device", related_name="device_contracts", blank=True)
     comments = models.TextField(blank=True, default="")
 
@@ -477,11 +489,11 @@ class ProviderLCM(OrganizationalModel):
     """ProviderLCM model for app."""
 
     # Set model columns
-    name = models.CharField(max_length=100, unique=True)
-    description = models.CharField(max_length=200, blank=True)
-    physical_address = models.CharField(max_length=200, blank=True)
+    name = models.CharField(max_length=CHARFIELD_MAX_LENGTH, unique=True)
+    description = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True)
+    physical_address = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True)
     country = models.CharField(max_length=3, blank=True)
-    phone = models.CharField(max_length=20, blank=True)
+    phone = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True)
     email = models.EmailField(blank=True, verbose_name="E-mail")
     portal_url = models.URLField(blank=True, verbose_name="Portal URL")
     comments = models.TextField(blank=True, default="")
@@ -515,13 +527,13 @@ def save(self, *args, **kwargs):
 class ContactLCM(PrimaryModel):
     """ContactLCM is a model representation of a contact used in Contracts."""
 
-    name = models.CharField(max_length=80, null=True)
-    address = models.CharField(max_length=200, blank=True)
-    phone = models.CharField(max_length=20, blank=True)
+    name = models.CharField(max_length=CHARFIELD_MAX_LENGTH, null=True)
+    address = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True)
+    phone = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True)
     email = models.EmailField(blank=True, verbose_name="Contact E-mail")
     comments = models.TextField(blank=True, default="")
     priority = models.PositiveIntegerField(default=100)
-    type = models.CharField(max_length=50, default=choices.PoCTypeChoices.UNASSIGNED)
+    type = models.CharField(max_length=CHARFIELD_MAX_LENGTH, default=choices.PoCTypeChoices.UNASSIGNED)
     contract = models.ForeignKey(
         to="nautobot_device_lifecycle_mgmt.ContractLCM", on_delete=models.CASCADE, verbose_name="Contract", null=True
     )
@@ -566,7 +578,7 @@ def __str__(self):
 class CVELCM(PrimaryModel):
     """CVELCM is a model representation of a cve vulnerability record."""
 
-    name = models.CharField(max_length=16, blank=False, unique=True)
+    name = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=False, unique=True)
     published_date = models.DateField(verbose_name="Published Date")
     link = models.URLField()
     status = StatusField(
@@ -575,9 +587,9 @@ class CVELCM(PrimaryModel):
         on_delete=models.PROTECT,
         to="extras.status",
     )
-    description = models.CharField(max_length=255, blank=True, default="")
+    description = models.CharField(max_length=CHARFIELD_MAX_LENGTH, blank=True, default="")
     severity = models.CharField(
-        max_length=50, choices=choices.CVESeverityChoices, default=choices.CVESeverityChoices.NONE
+        max_length=CHARFIELD_MAX_LENGTH, choices=choices.CVESeverityChoices, default=choices.CVESeverityChoices.NONE
     )
     cvss = models.FloatField(blank=True, null=True, verbose_name="CVSS Base Score")
     cvss_v2 = models.FloatField(blank=True, null=True, verbose_name="CVSSv2 Score")