ipfabric_netbox 4.2.2b2__tar.gz → 4.2.2b4__tar.gz

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipfabric_netbox
-Version: 4.2.2b2
+Version: 4.2.2b4
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 License: MIT
 Keywords: netbox,ipfabric,plugin,sync
@@ -24,7 +24,7 @@ Requires-Dist: ipfabric (>=6.6.4) ; extra != "ipfabric_6_10" and extra != "ipfab
 Requires-Dist: ipfabric (>=7.0.0,<7.1.0) ; extra != "ipfabric_6_10" and extra == "ipfabric_7_0" and extra != "ipfabric_7_2" and extra != "ipfabric_7_3"
 Requires-Dist: ipfabric (>=7.2.0,<7.3.0) ; extra != "ipfabric_6_10" and extra != "ipfabric_7_0" and extra == "ipfabric_7_2" and extra != "ipfabric_7_3"
 Requires-Dist: ipfabric (>=7.3.0,<7.4.0) ; extra != "ipfabric_6_10" and extra != "ipfabric_7_0" and extra != "ipfabric_7_2" and extra == "ipfabric_7_3"
-Requires-Dist: netboxlabs-netbox-branching (>=0.5.5,<0.6.0)
+Requires-Dist: netboxlabs-netbox-branching (==0.7.0)
 Requires-Dist: netutils
 Project-URL: Bug Tracker, https://gitlab.com/ip-fabric/integrations/ipfabric-netbox-sync/-/issues
 Project-URL: Homepage, https://gitlab.com/ip-fabric/integrations/ipfabric-netbox-sync
@@ -65,7 +65,9 @@ These are the required NetBox versions for corresponding plugin version. Any oth
 
 | Netbox Version | Plugin Version |
 |----------------|----------------|
-| 4.3.0 and up   | 4.0.0 and up   |
+| 4.4.0 and up   | 4.3.0 and up   |
+| 4.3.0 - 4.3.7  | 4.2.2          |
+| 4.3.0 - 4.3.6  | 4.0.0 - 4.2.1  |
 | 4.2.4 - 4.2.9  | 3.2.2 - 3.2.4  |
 | 4.2.0 - 4.2.3  | 3.2.0          |
 | 4.1.5 - 4.1.11 | 3.1.1 - 3.1.3  |

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/README.md

@@ -32,7 +32,9 @@ These are the required NetBox versions for corresponding plugin version. Any oth
 
 | Netbox Version | Plugin Version |
 |----------------|----------------|
-| 4.3.0 and up   | 4.0.0 and up   |
+| 4.4.0 and up   | 4.3.0 and up   |
+| 4.3.0 - 4.3.7  | 4.2.2          |
+| 4.3.0 - 4.3.6  | 4.0.0 - 4.2.1  |
 | 4.2.4 - 4.2.9  | 3.2.2 - 3.2.4  |
 | 4.2.0 - 4.2.3  | 3.2.0          |
 | 4.1.5 - 4.1.11 | 3.1.1 - 3.1.3  |

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/__init__.py

@@ -6,9 +6,9 @@ class NetboxIPFabricConfig(PluginConfig):
     name = "ipfabric_netbox"
     verbose_name = "NetBox IP Fabric SoT Plugin"
     description = "Sync IP Fabric into NetBox"
-    version = "4.2.2b2"
+    version = "4.2.2b4"
     base_url = "ipfabric"
-    min_version = "4.2.4"
+    min_version = "4.4.0"
 
     def ready(self):
         super().ready()

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/forms.py

@@ -263,13 +263,13 @@ class IPFabricTransformFieldForm(NetBoxModelForm):
                     )
 
 
-class IPFabricTransformMapGroupForm(forms.ModelForm):
+class IPFabricTransformMapGroupForm(NetBoxModelForm):
     class Meta:
         model = IPFabricTransformMapGroup
         fields = ("name", "description")
 
 
-class IPFabricTransformMapForm(forms.ModelForm):
+class IPFabricTransformMapForm(NetBoxModelForm):
     class Meta:
         model = IPFabricTransformMap
         fields = ("name", "group", "source_model", "target_model")
@@ -531,13 +531,28 @@ class IPFabricSyncForm(NetBoxModelForm):
         widgets = {"source": HTMXSelect()}
 
     def __init__(self, *args, **kwargs):
+        # The initial data for BooleanFields change to list on HTMX requests.
+        # This causes URL to bloat, so we need to sanitize it before it's used.
+        initial = kwargs.get("initial", {}).copy()
+        for name, value in initial.items():
+            if (
+                (
+                    name.startswith("ipf_")
+                    or (
+                        name in self.base_fields
+                        and isinstance(self.base_fields[name], forms.BooleanField)
+                    )
+                )
+                and isinstance(value, list)
+                and len(value) > 1
+            ):
+                initial[name] = value[-1]  # Keep only the last value
+        kwargs["initial"] = initial
         super().__init__(*args, **kwargs)
-        self.source_type = None
-        ingestion_type = get_field_value(self, "source")
+
+        source = get_field_value(self, "source")
 
         if not self.data:
-            if ingestion_type:
-                self.source_type = IPFabricSource.objects.get(pk=ingestion_type).type
             if sites := get_field_value(self, "sites"):
                 sites = list_to_choices(str_to_list(sites))
                 self.fields["sites"].choices = sites
@@ -547,46 +562,82 @@ class IPFabricSyncForm(NetBoxModelForm):
                 snapshot_sites = IPFabricSnapshot.objects.get(pk=snapshot_id).sites
                 choices = list_to_choices(str_to_list(snapshot_sites))
                 self.fields["sites"].choices = choices
+            source = self.data.get("source")
 
+        # These values are not populated by data on instance, so we need to set them manually
         if self.instance and self.instance.pk:
             if not kwargs.get("initial"):
-                self.source_type = self.instance.snapshot_data.source.type
-                self.initial["source"] = self.instance.snapshot_data.source
+                source = self.instance.snapshot_data.source
                 if not self.data:
                     self.fields["sites"].choices = list_to_choices(
                         self.instance.snapshot_data.sites
                     )
-
-                self.initial["sites"] = self.instance.parameters.get("sites", [])
+            else:
+                source = kwargs["initial"].get(
+                    "source", self.instance.snapshot_data.source
+                )
+            self.initial["source"] = source
+            if "groups" not in self.initial:
                 self.initial["groups"] = self.instance.parameters.get("groups", [])
 
+            # Handle sites field initialization
+            if "sites" not in self.initial:
+                selected_sites = self.instance.parameters.get("sites", [])
+                self.initial["sites"] = selected_sites
+
+                # Ensure the field has the selected sites as both choices and initial values
+                if not self.data and selected_sites:
+                    # Get current choices and ensure selected sites are included
+                    current_choices = (
+                        list(self.fields["sites"].choices)
+                        if hasattr(self.fields["sites"], "choices")
+                        else []
+                    )
+                    current_choice_values = [choice[0] for choice in current_choices]
+
+                    # Add any missing selected sites to choices
+                    for site in str_to_list(selected_sites):
+                        if site not in current_choice_values:
+                            current_choices.append((site, site))
+
+                    self.fields["sites"].choices = current_choices
+                self.fields["sites"].initial = selected_sites
+            else:
+                self.fields["sites"].initial = self.initial["sites"]
+
         now = local_now().strftime("%Y-%m-%d %H:%M:%S")
         self.fields["scheduled"].help_text += f" (current time: <strong>{now}</strong>)"
 
         # Add backend-specific form fields
         self.backend_fields = {}
 
+        # Prepare buttons for each target Model
         for k, v in sync_parameters.items():
             self.backend_fields[k] = []
             for name, form_field in v.items():
                 field_name = f"ipf_{name}"
                 self.backend_fields[k].append(field_name)
-                self.fields[field_name] = copy.copy(form_field)
+                self.fields[field_name] = copy.deepcopy(form_field)
                 if self.instance and self.instance.parameters:
-                    self.fields[field_name].initial = self.instance.parameters.get(name)
+                    value = self.instance.parameters.get(name)
+                    self.fields[field_name].initial = value
 
         # Set fieldsets dynamically based and backend_fields
         fieldsets = [
             FieldSet("name", "source", "groups", name=_("IP Fabric Source")),
         ]
-        if self.source_type == "local":
-            fieldsets.append(
-                FieldSet("snapshot_data", "sites", name=_("Snapshot Information")),
-            )
-        else:
-            fieldsets.append(
-                FieldSet("snapshot_data", name=_("Snapshot Information")),
-            )
+        # Only show snapshot and sites if source is selected
+        if source:
+            if isinstance(source, str) or isinstance(source, int):
+                source = IPFabricSource.objects.get(pk=source)
+            if source.type == "local":
+                fieldsets.append(
+                    FieldSet("snapshot_data", "sites", name=_("Snapshot Information")),
+                )
+            else:
+                fieldsets.append(
+                    FieldSet("snapshot_data", name=_("Snapshot Information")),
+                )
         for k, v in self.backend_fields.items():
             fieldsets.append(FieldSet(*v, name=f"{k.upper()} Parameters"))
         fieldsets.append(
@@ -602,10 +653,22 @@ class IPFabricSyncForm(NetBoxModelForm):
     def clean(self):
         super().clean()
 
+        source = self.cleaned_data.get("source")
+        snapshot = self.cleaned_data.get("snapshot_data")
+
+        if (
+            source
+            and snapshot
+            and IPFabricSource.objects.get(pk=source.pk)
+            != IPFabricSnapshot.objects.get(pk=snapshot.pk).source
+        ):
+            raise ValidationError(
+                {"snapshot_data": _("Snapshot does not belong to the selected source.")}
+            )
+
         sites = self.data.get("sites")
         self.fields["sites"].choices = list_to_choices(str_to_list(sites))
         if sites and "snapshot_data" in self.cleaned_data:
-            snapshot = self.cleaned_data["snapshot_data"]
             # Check if all sites are valid - fail if any site is not found in snapshot.sites
             if not all(
                 any(site in snapshot_site for snapshot_site in snapshot.sites)

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/migrations/0001_initial_squashed_0013_switch_to_branching_plugin.py

@@ -29,6 +29,7 @@ if TYPE_CHECKING:
 
 def create_custom_field(
     apps: "apps_type",
+    db_alias: str,
     field_name: str,
     label: str,
     target_models: list,
@@ -37,6 +38,7 @@ def create_custom_field(
 ):
     """Create a single custom field and link it to required models."""
     ObjectType = apps.get_model("core", "ObjectType")
+    ContentType = apps.get_model("contenttypes", "ContentType")
 
     defaults = {
         "label": label,
@@ -47,23 +49,29 @@ def create_custom_field(
         "ui_editable": getattr(CustomFieldUIEditableChoices, "NO"),
     }
 
-    custom_field, _ = apps.get_model("extras", "CustomField").objects.update_or_create(
-        type=getattr(CustomFieldTypeChoices, cf_type.upper()),
-        name=field_name,
-        defaults=defaults,
+    custom_field, _ = (
+        apps.get_model("extras", "CustomField")
+        .objects.using(db_alias)
+        .update_or_create(
+            type=getattr(CustomFieldTypeChoices, cf_type.upper()),
+            name=field_name,
+            defaults=defaults,
+        )
     )
 
     for model in target_models:
-        custom_field.object_types.add(ObjectType.objects.get_for_model(model))
+        custom_field.object_types.add(ContentType.objects.get_for_model(model))
 
 
 def prepare_custom_fields(apps: "apps_type", schema_editor: "BaseDatabaseSchemaEditor"):
     """Forward migration to prepare ipfabric_netbox custom fields and links."""
+    db_alias = schema_editor.connection.alias
     Device = apps.get_model("dcim", "Device")
     Site = apps.get_model("dcim", "Site")
 
     create_custom_field(
         apps,
+        db_alias,
         "ipfabric_source",
         "IP Fabric Source",
         [Device, Site],
@@ -72,31 +80,41 @@ def prepare_custom_fields(apps: "apps_type", schema_editor: "BaseDatabaseSchemaE
     )
     create_custom_field(
         apps,
+        db_alias,
         "ipfabric_ingestion",
         "IP Fabric Last Ingestion",
         [Device, Site],
         cf_type="type_object",
         object_type=apps.get_model("ipfabric_netbox", "IPFabricIngestion"),
     )
-    cl, _ = apps.get_model("extras", "CustomLink").objects.update_or_create(
-        defaults={
-            "link_text": "{% if object.custom_field_data.ipfabric_source is defined %}{% set SOURCE_ID = object.custom_field_data.ipfabric_source %}{% if SOURCE_ID %}IP Fabric{% endif %}{% endif %}",
-            "link_url": '{% if object.custom_field_data.ipfabric_source is defined %}{% set SOURCE_ID = object.custom_field_data.ipfabric_source %}{% if SOURCE_ID %}{% set BASE_URL = object.custom_fields.filter(related_object_type__model="ipfabricsource").first().related_object_type.model_class().objects.get(pk=SOURCE_ID).url %}{{ BASE_URL }}/inventory/devices?options={"filters":{"sn": ["like","{{ object.serial }}"]}}{% endif %}{%endif%}',
-            "new_window": True,
-            "button_class": CustomLinkButtonClassChoices.BLUE,
-        },
-        name="ipfabric",
+    cl, _ = (
+        apps.get_model("extras", "CustomLink")
+        .objects.using(db_alias)
+        .update_or_create(
+            defaults={
+                "link_text": "{% if object.custom_field_data.ipfabric_source is defined %}{% set SOURCE_ID = object.custom_field_data.ipfabric_source %}{% if SOURCE_ID %}IP Fabric{% endif %}{% endif %}",
+                "link_url": '{% if object.custom_field_data.ipfabric_source is defined %}{% set SOURCE_ID = object.custom_field_data.ipfabric_source %}{% if SOURCE_ID %}{% set BASE_URL = object.custom_fields.filter(related_object_type__model="ipfabricsource").first().related_object_type.model_class().objects.get(pk=SOURCE_ID).url %}{{ BASE_URL }}/inventory/devices?options={"filters":{"sn": ["like","{{ object.serial }}"]}}{% endif %}{%endif%}',
+                "new_window": True,
+                "button_class": CustomLinkButtonClassChoices.BLUE,
+            },
+            name="ipfabric",
+        )
     )
     cl.object_types.add(
-        apps.get_model("core", "ObjectType").objects.get_for_model(Device)
+        apps.get_model("contenttypes", "ContentType")
+        .objects.db_manager(db_alias)
+        .get_for_model(Device)
     )
 
 
 def cleanup_custom_fields(apps: "apps_type", schema_editor: "BaseDatabaseSchemaEditor"):
     """Reverse migration to prepare ipfabric_netbox custom fields and links."""
+    db_alias = schema_editor.connection.alias
     for field_name in ["ipfabric_source", "ipfabric_ingestion"]:
-        custom_field = apps.get_model("extras", "CustomField").objects.get(
-            name=field_name
+        custom_field = (
+            apps.get_model("extras", "CustomField")
+            .objects.using(db_alias)
+            .get(name=field_name)
         )
         for model in custom_field.object_types.all()[:]:
             custom_field.object_types.remove(model)
@@ -109,7 +127,9 @@ def prepare_transform_maps(
     """Create transform maps if they do not exist yet.
     They used to be created during plugin.ready() so they might be present on older DBs.
     """
-    build_transform_maps(data=get_transform_map(), apps=apps)
+    build_transform_maps(
+        data=get_transform_map(), apps=apps, db_alias=schema_editor.connection.alias
+    )
 
 
 class Migration(migrations.Migration):

ipfabric_netbox-4.2.2b4/ipfabric_netbox/migrations/0019_alter_ipfabrictransformmap_options_and_more.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.5 on 2025-09-22 07:43
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("ipfabric_netbox", "0018_remove_type_field"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="ipfabrictransformmap",
+            options={"ordering": ("pk",)},
+        ),
+        migrations.AlterModelOptions(
+            name="ipfabrictransformmapgroup",
+            options={"ordering": ("pk",)},
+        ),
+    ]

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/models.py

@@ -1,4 +1,5 @@
 import ast
+import functools
 import json
 import logging
 import traceback
@@ -12,6 +13,7 @@ from core.models import Job
 from core.models import ObjectType
 from core.signals import pre_sync
 from dcim.models import Device
+from dcim.models import Site
 from dcim.models import VirtualChassis
 from dcim.signals import assign_virtualchassis_master
 from django.apps import apps
@@ -34,10 +36,10 @@ from netbox.models import NetBoxModel
 from netbox.models import PrimaryModel
 from netbox.models.features import JobsMixin
 from netbox.models.features import TagsMixin
-from netbox.registry import registry
 from netbox_branching.choices import BranchStatusChoices
 from netbox_branching.contextvars import active_branch
 from netbox_branching.models import Branch
+from netbox_branching.utilities import supports_branching
 from utilities.querysets import RestrictedQuerySet
 from utilities.request import NetBoxFakeRequest
 
@@ -100,6 +102,7 @@ class IPFabricTransformMapGroup(NetBoxModel):
     description = models.TextField(blank=True, null=True)
 
     class Meta:
+        ordering = ("pk",)
         verbose_name = "IP Fabric Transform Map Group"
         verbose_name_plural = "IP Fabric Transform Map Groups"
 
@@ -136,6 +139,7 @@ class IPFabricTransformMap(NetBoxModel):
     )
 
     class Meta:
+        ordering = ("pk",)
         verbose_name = "IP Fabric Transform Map"
         verbose_name_plural = "IP Fabric Transform Maps"
 
@@ -173,13 +177,17 @@ class IPFabricTransformMap(NetBoxModel):
             )
         return cleaned_data
 
+    @functools.cache
     def get_models(self):
         _context = dict()
 
-        for app, model_names in registry["model_features"]["custom_fields"].items():
+        for app, app_models in apps.all_models.items():
             _context.setdefault(app, {})
-            for model_name in model_names:
-                model = apps.get_registered_model(app, model_name)
+            for model in app_models:
+                if isinstance(model, str):
+                    model = apps.get_registered_model(app, model)
+                if not supports_branching(model):
+                    continue
                 _context[app][model.__name__] = model
         _context["contenttypes"] = {}
         _context["contenttypes"]["ContentType"] = ContentType
@@ -246,10 +254,16 @@ class IPFabricTransformMap(NetBoxModel):
                 # See NetBox docs Customization -> Custom Scripts -> Change Logging
                 instance = queryset.get(**context)
                 instance.snapshot()
+                changed = False
                 for attr, value in defaults.items():
+                    # Only run data validation and save if something has changed
+                    if getattr(instance, attr) == value:
+                        continue
+                    changed = True
                     setattr(instance, attr, value)
-                instance.full_clean()
-                instance.save(using=connection_name)
+                if changed:
+                    instance.full_clean()
+                    instance.save(using=connection_name)
             except target_class.DoesNotExist:
                 for field in list(context.keys()):
                     # When assigning we need to replace `field__isnull=True` with `field=None`
@@ -543,6 +557,13 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
         # Emit the post_sync signal
         # post_sync.send(sender=self.__class__, instance=self)
 
+    @classmethod
+    def get_for_site(cls, site: Site):
+        """Get all snapshots containing the given site."""
+        return cls.objects.filter(
+            Q(snapshots__data__sites__contains=[site.name])
+        ).distinct()
+
 
 class IPFabricSnapshot(TagsMixin, ChangeLoggedModel):
     source = models.ForeignKey(
@@ -1004,3 +1025,6 @@ class IPFabricData(models.Model):
         choices=IPFabricRawDataTypeChoices,
     )
     objects = RestrictedQuerySet.as_manager()
+
+    def get_absolute_url(self):
+        return reverse("plugins:ipfabric_netbox:ipfabricdata_data", args=[self.pk])

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/template_content.py

@@ -1,23 +1,26 @@
 import logging
 
+from dcim.models import Site
 from netbox.plugins import PluginTemplateExtension
 
-from ipfabric_netbox.models import IPFabricSnapshot
+from ipfabric_netbox.models import IPFabricSource
 
 logger = logging.getLogger("ipfabric_netbox.template_content")
 
 
 class SiteTopologyButtons(PluginTemplateExtension):
-    model = "dcim.site"
+    models = ["dcim.site"]
 
     def buttons(self):
         try:
             site = self.context.get("object")
             source = None
-            for snapshot in IPFabricSnapshot.objects.all():
-                # `Site.name` is unique in DB, so we can use it to match against IPF snapshots
-                if site.name in snapshot.sites:
-                    source = snapshot.source
+            if isinstance(site, Site) and (
+                source_id := site.custom_field_data.get("ipfabric_source")
+            ):
+                source = IPFabricSource.objects.filter(id=source_id).first()
+            # `source_id` saved in CF might be obsolete, so always fall back to search by site
+            source = source or IPFabricSource.get_for_site(site).first()
             return self.render(
                 "ipfabric_netbox/inc/site_topology_button.html",
                 extra_context={"source": source},

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/templates/ipfabric_netbox/inc/site_topology_button.html

@@ -1,4 +1,3 @@
-{% if object.custom_field_data.ipfabric_source %}
 <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
   <div class="btn-group" role="group">
     <button id="btnGroupDrop1" type="button" class="btn btn-sm btn-success dropdown-toggle" data-bs-toggle="dropdown"
@@ -48,7 +47,6 @@
     </div>
   </div>
 </div>
-{% endif %}
 
 {% block javascript %}
 <script>

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/templates/ipfabric_netbox/ipfabric_table.html

@@ -47,7 +47,7 @@
   <div class="row px-3">
     <div class="card">
       <div class="card-body">
-        Device does not have a IP Fabric source configured in the custom fields. The source is used to match devices between NetBox and IP Fabric instance.
+        Could not find an IP Fabric Source that could have synced this Device. The source is used to match devices between NetBox and IP Fabric instance.
       </div>
     </div>
   </div>

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync.html

@@ -3,6 +3,7 @@
 {% load helpers %}
 {% load plugins %}
 {% load render_table from django_tables2 %}
+{% load perms %}
 {% load ipfabric_netbox_helpers %}
 
 {% block extra_controls %}
@@ -22,7 +23,7 @@
       </span>
     {% endif %}
   {% endif %}
-{% endblock %}
+{% endblock extra_controls %}
 
 {% block content %}
 <div class="row mb-3">

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap_restore.html

@@ -9,7 +9,7 @@
   <div class="modal-body">
     <p>
       {% blocktrans trimmed %}
-        Are you sure you want to <strong class="text-danger">restore</strong> the Transform Maps? This restores from GitLab and will overwrite any changes made in NetBox.
+        Are you sure you want to <strong class="text-danger">restore</strong> the Transform Maps? This restores will overwrite any changes made in NetBox to Transform Maps without a group.
       {% endblocktrans %}
     </p>
     {% if dependent_objects %}

{ipfabric_netbox-4.2.2b2 → ipfabric_netbox-4.2.2b4}/ipfabric_netbox/tests/api/test_api.py

@@ -620,7 +620,7 @@ class IPFabricSyncTest(APIViewTestCases.APIViewTestCase):
             name="Sync Test E",
             snapshot_data=snapshots[1],
             parameters={"device": True, "interface": True},
-            auto_merge=True,
+            auto_merge=False,
         )
         IPFabricSync.objects.create(
             name="Sync Test F",