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

ipfabric_netbox/models.py

@@ -44,7 +44,6 @@ from utilities.request import NetBoxFakeRequest
 from .choices import IPFabricRawDataTypeChoices
 from .choices import IPFabricSnapshotStatusModelChoices
 from .choices import IPFabricSourceTypeChoices
-from .choices import IPFabricSyncTypeChoices
 from .choices import IPFabricTransformMapSourceModelChoices
 from .choices import required_transform_map_contenttypes
 from .signals import clear_other_primary_ip
@@ -545,9 +544,7 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
         # post_sync.send(sender=self.__class__, instance=self)
 
 
-class IPFabricSnapshot(models.Model):
-    created = models.DateTimeField(auto_now_add=True)
-    last_updated = models.DateTimeField(editable=False)
+class IPFabricSnapshot(TagsMixin, ChangeLoggedModel):
     source = models.ForeignKey(
         to=IPFabricSource,
         on_delete=models.CASCADE,
@@ -600,11 +597,6 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
         on_delete=models.CASCADE,
         related_name="snapshots",
     )
-    type = models.CharField(
-        max_length=50,
-        choices=IPFabricSyncTypeChoices,
-        default=IPFabricSyncTypeChoices.DCIM,
-    )
     status = models.CharField(
         max_length=50,
         choices=DataSourceStatusChoices,
@@ -613,6 +605,7 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
     )
     parameters = models.JSONField(blank=True, null=True)
     auto_merge = models.BooleanField(default=False)
+    update_custom_fields = models.BooleanField(default=True)
     last_synced = models.DateTimeField(blank=True, null=True, editable=False)
     scheduled = models.DateTimeField(null=True, blank=True)
     interval = models.PositiveIntegerField(
@@ -668,6 +661,10 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
         else:
             return False
 
+    @property
+    def last_ingestion(self):
+        return self.ipfabricingestion_set.last()
+
     @staticmethod
     def get_transform_maps(group_ids=None):
         """
@@ -889,7 +886,10 @@ class IPFabricIngestion(JobsMixin, models.Model):
     def name(self):
         if self.branch:
             return self.branch.name
-        return f"{self.sync.name} (Ingestion {self.pk})"
+        try:
+            return f"{self.sync.name} (Ingestion {self.pk})"
+        except IPFabricIngestion.sync.RelatedObjectDoesNotExist:
+            return f"Ingestion {self.pk} (No Sync)"
 
     def get_absolute_url(self):
         return reverse("plugins:ipfabric_netbox:ipfabricingestion", args=[self.pk])

ipfabric_netbox/tables.py

@@ -142,20 +142,41 @@ class IPFabricSourceTable(NetBoxTable):
         default_columns = ("pk", "name", "status", "description", "snapshot_count")
 
 
-class SyncTable(NetBoxTable):
-    actions = None
+class IPFabricSyncTable(NetBoxTable):
+    name = tables.Column(linkify=True)
     status = columns.ChoiceFieldColumn()
     snapshot_name = tables.Column(
-        verbose_name="Snapshot Name", accessor="snapshot_data"
+        verbose_name="Snapshot Name",
+        accessor="snapshot_data",
+        linkify=True,
+    )
+    last_ingestion = tables.Column(
+        accessor="last_ingestion",
+        verbose_name="Last Ingestion",
+        linkify=True,
     )
 
-    def render_snapshot_name(self, value):
-        return value.get("name", "---")
+    def render_last_ingestion(self, value: IPFabricIngestion):
+        return getattr(value, "name", "---") if value else "---"
+
+    def render_snapshot_name(self, value: IPFabricSnapshot):
+        return getattr(value, "name", "---") if value else "---"
 
     class Meta(NetBoxTable.Meta):
         model = IPFabricSync
-        fields = ("id", "status", "snapshot_name")
-        default_columns = ("id", "status", "snapshot_name")
+        fields = (
+            "auto_merge",
+            "id",
+            "interval",
+            "last_synced",
+            "last_ingestion",
+            "name",
+            "scheduled",
+            "status",
+            "snapshot_name",
+            "user",
+        )
+        default_columns = ("name", "status", "last_ingestion", "snapshot_name")
 
 
 class IPFabricIngestionChangesTable(NetBoxTable):
@@ -241,5 +262,5 @@ class IPFabricDataTable(NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = IPFabricData
-        fields = ("snapshot_data", "type", "JSON")
-        default_columns = ("snapshot_data", "type", "JSON")
+        fields = ("snapshot_data", "JSON")
+        default_columns = ("snapshot_data", "JSON")

ipfabric_netbox/templates/ipfabric_netbox/ipfabricsource.html

@@ -52,7 +52,7 @@
             <td>{{ object.description|placeholder }}</td>
           </tr>
           <tr>
-            <th scope="row">URL</th>
+            <th scope="row">Base URL</th>
             <td>
               <a href="{{ object.url }}">{{ object.url }}</a>
             </td>