ipfabric_netbox 4.2.2b2__py3-none-any.whl → 4.2.2b3__py3-none-any.whl

ipfabric_netbox/__init__.py

@@ -6,7 +6,7 @@ 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.2b3"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

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")

ipfabric_netbox/models.py

@@ -12,6 +12,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
@@ -100,6 +101,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 +138,7 @@ class IPFabricTransformMap(NetBoxModel):
     )
 
     class Meta:
+        ordering = ("pk",)
         verbose_name = "IP Fabric Transform Map"
         verbose_name_plural = "IP Fabric Transform Maps"
 
@@ -543,6 +546,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 +1014,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/template_content.py

@@ -1,8 +1,9 @@
 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")
 
@@ -14,10 +15,12 @@ class SiteTopologyButtons(PluginTemplateExtension):
         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/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/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 %}