Check the type of a record when testing for uniqueness

peteeckel · Oct 17, 2023 · 62c3769 · 62c3769
1 parent 7683646
commit 62c3769
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/netbox_dns/models.py b/netbox_dns/models.py
@@ -969,13 +969,14 @@ def check_unique(self):
         records = Record.objects.filter(
             zone=self.zone,
             name=self.name,
+            type=self.type,
             value=self.value,
             status__in=Record.ACTIVE_STATUS_LIST,
         )
         if len(records):
             raise ValidationError(
                 {
-                    "value": f"There is already an active record for name {self.name} in zone {self.zone} with value {self.value}."
+                    "value": f"There is already an active {self.type} record for name {self.name} in zone {self.zone} with value {self.value}."
                 }
             ) from None
 

diff --git a/netbox_dns/tests/record/test_uniqueness.py b/netbox_dns/tests/record/test_uniqueness.py
@@ -67,6 +67,29 @@ def test_create_duplicate_records_ok(self):
             )
             f_record.save()
 
+    @override_settings(
+        PLUGINS_CONFIG={
+            "netbox_dns": {
+                "enforce_unique_records": True,
+            }
+        }
+    )
+    def test_create_different_type_records_ok(self):
+        f_zone = self.zones[0]
+
+        records = [
+            {"name": "test1", "type": RecordTypeChoices.A, "value": "10.0.1.42"},
+            {"name": "test1", "type": RecordTypeChoices.TXT, "value": "10.0.1.42"},
+        ]
+
+        for record in records:
+            f_record = Record(
+                zone=f_zone,
+                **record,
+                **self.record_data,
+            )
+            f_record.save()
+
     @override_settings(
         PLUGINS_CONFIG={
             "netbox_dns": {