mirror of
https://github.com/netbox-community/netbox.git
synced 2026-01-22 11:38:45 -06:00
Fixes #21214: Clean up AutoSyncRecord when detaching from DataSource (#21219)
Some checks failed
CI / build (20.x, 3.12) (push) Waiting to run
CI / build (20.x, 3.13) (push) Waiting to run
CI / build (20.x, 3.14) (push) Waiting to run
CodeQL / Analyze (actions) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Some checks failed
CI / build (20.x, 3.12) (push) Waiting to run
CI / build (20.x, 3.13) (push) Waiting to run
CI / build (20.x, 3.14) (push) Waiting to run
CodeQL / Analyze (actions) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Co-authored-by: adionit7 <adionit7@users.noreply.github.com>
This commit is contained in:
@@ -6,7 +6,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
|
|||||||
from django.forms import ValidationError
|
from django.forms import ValidationError
|
||||||
from django.test import tag, TestCase
|
from django.test import tag, TestCase
|
||||||
|
|
||||||
from core.models import DataSource, ObjectType
|
from core.models import AutoSyncRecord, DataSource, ObjectType
|
||||||
from dcim.models import Device, DeviceRole, DeviceType, Location, Manufacturer, Platform, Region, Site, SiteGroup
|
from dcim.models import Device, DeviceRole, DeviceType, Location, Manufacturer, Platform, Region, Site, SiteGroup
|
||||||
from extras.models import ConfigContext, ConfigContextProfile, ConfigTemplate, ImageAttachment, Tag, TaggedItem
|
from extras.models import ConfigContext, ConfigContextProfile, ConfigTemplate, ImageAttachment, Tag, TaggedItem
|
||||||
from tenancy.models import Tenant, TenantGroup
|
from tenancy.models import Tenant, TenantGroup
|
||||||
@@ -754,3 +754,53 @@ class ConfigTemplateTest(TestCase):
|
|||||||
@tag('regression')
|
@tag('regression')
|
||||||
def test_config_template_with_data_source_nested_templates(self):
|
def test_config_template_with_data_source_nested_templates(self):
|
||||||
self.assertEqual(self.BASE_TEMPLATE, self.main_config_template.render({}))
|
self.assertEqual(self.BASE_TEMPLATE, self.main_config_template.render({}))
|
||||||
|
|
||||||
|
@tag('regression')
|
||||||
|
def test_autosyncrecord_cleanup_on_detach(self):
|
||||||
|
"""Test that AutoSyncRecord is deleted when detaching from DataSource."""
|
||||||
|
with tempfile.TemporaryDirectory() as temp_dir:
|
||||||
|
templates_dir = Path(temp_dir) / "templates"
|
||||||
|
templates_dir.mkdir(parents=True, exist_ok=True)
|
||||||
|
|
||||||
|
self._create_template_file(templates_dir, 'test.j2', 'Test content')
|
||||||
|
|
||||||
|
data_source = DataSource(
|
||||||
|
name="Test DataSource for Detach",
|
||||||
|
type="local",
|
||||||
|
source_url=str(templates_dir),
|
||||||
|
)
|
||||||
|
data_source.save()
|
||||||
|
data_source.sync()
|
||||||
|
|
||||||
|
data_file = data_source.datafiles.filter(path__endswith='test.j2').first()
|
||||||
|
|
||||||
|
# Create a ConfigTemplate with data_file and auto_sync_enabled
|
||||||
|
config_template = ConfigTemplate(
|
||||||
|
name="TestTemplateForDetach",
|
||||||
|
data_file=data_file,
|
||||||
|
auto_sync_enabled=True
|
||||||
|
)
|
||||||
|
config_template.clean()
|
||||||
|
config_template.save()
|
||||||
|
|
||||||
|
# Verify AutoSyncRecord was created
|
||||||
|
object_type = ObjectType.objects.get_for_model(ConfigTemplate)
|
||||||
|
autosync_records = AutoSyncRecord.objects.filter(
|
||||||
|
object_type=object_type,
|
||||||
|
object_id=config_template.pk
|
||||||
|
)
|
||||||
|
self.assertEqual(autosync_records.count(), 1, "AutoSyncRecord should be created")
|
||||||
|
|
||||||
|
# Detach from DataSource
|
||||||
|
config_template.data_file = None
|
||||||
|
config_template.data_source = None
|
||||||
|
config_template.auto_sync_enabled = False
|
||||||
|
config_template.clean()
|
||||||
|
config_template.save()
|
||||||
|
|
||||||
|
# Verify AutoSyncRecord was deleted
|
||||||
|
autosync_records = AutoSyncRecord.objects.filter(
|
||||||
|
object_type=object_type,
|
||||||
|
object_id=config_template.pk
|
||||||
|
)
|
||||||
|
self.assertEqual(autosync_records.count(), 0, "AutoSyncRecord should be deleted after detaching")
|
||||||
|
|||||||
@@ -569,7 +569,6 @@ class SyncedDataMixin(models.Model):
|
|||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
AutoSyncRecord.objects.filter(
|
AutoSyncRecord.objects.filter(
|
||||||
datafile=self.data_file,
|
|
||||||
object_type=object_type,
|
object_type=object_type,
|
||||||
object_id=self.pk
|
object_id=self.pk
|
||||||
).delete()
|
).delete()
|
||||||
@@ -582,7 +581,6 @@ class SyncedDataMixin(models.Model):
|
|||||||
# Delete AutoSyncRecord
|
# Delete AutoSyncRecord
|
||||||
object_type = ObjectType.objects.get_for_model(self)
|
object_type = ObjectType.objects.get_for_model(self)
|
||||||
AutoSyncRecord.objects.filter(
|
AutoSyncRecord.objects.filter(
|
||||||
datafile=self.data_file,
|
|
||||||
object_type=object_type,
|
object_type=object_type,
|
||||||
object_id=self.pk
|
object_id=self.pk
|
||||||
).delete()
|
).delete()
|
||||||
|
|||||||
Reference in New Issue
Block a user