ipfabric_netbox 4.2.0b6__tar.gz → 4.2.0b7__tar.gz

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ipfabric_netbox
-Version: 4.2.0b6
+Version: 4.2.0b7
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 License: MIT
 Keywords: netbox,ipfabric,plugin,sync

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b7}/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.0b6"
+    version = "4.2.0b7"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b7}/ipfabric_netbox/models.py

@@ -667,6 +667,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):
         """

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b7}/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):

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b7}/ipfabric_netbox/views.py

@@ -37,6 +37,7 @@ from .filtersets import IPFabricIngestionFilterSet
 from .filtersets import IPFabricIngestionIssueFilterSet
 from .filtersets import IPFabricSnapshotFilterSet
 from .filtersets import IPFabricSourceFilterSet
+from .filtersets import IPFabricSyncFilterSet
 from .filtersets import IPFabricTransformMapFilterSet
 from .filtersets import IPFabricTransformMapGroupFilterSet
 from .forms import IPFabricIngestionFilterForm
@@ -69,6 +70,7 @@ from .tables import IPFabricIngestionTable
 from .tables import IPFabricRelationshipFieldTable
 from .tables import IPFabricSnapshotTable
 from .tables import IPFabricSourceTable
+from .tables import IPFabricSyncTable
 from .tables import IPFabricTransformFieldTable
 from .tables import IPFabricTransformMapGroupTable
 from .tables import IPFabricTransformMapTable
@@ -528,14 +530,10 @@ class IPFabricSourceBulkDeleteView(generic.BulkDeleteView):
 
 
 # Sync
-class IPFabricSyncListView(View):
-    def get(self, request):
-        syncs = IPFabricSync.objects.prefetch_related("snapshot_data")
-        return render(
-            request,
-            "ipfabric_netbox/ipfabricsync_list.html",
-            {"model": IPFabricSync, "syncs": syncs},
-        )
+class IPFabricSyncListView(generic.ObjectListView):
+    queryset = IPFabricSync.objects.all()
+    table = IPFabricSyncTable
+    filterset = IPFabricSyncFilterSet
 
 
 @register_model_view(IPFabricSync, "edit")

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ipfabric_netbox"
-version = "4.2.0b6"
+version = "4.2.0b7"
 description = "NetBox plugin to sync IP Fabric data into NetBox"
 authors = ["Solution Architecture <solution.architecture@ipfabric.io>"]
 license = "MIT"

ipfabric_netbox-4.2.0b6/ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync_list.html

@@ -1,71 +0,0 @@
-{% extends 'base/layout.html' %}
-{% load buttons %}
-{% load helpers %}
-{% load perms %}
-
-{% block title %}Ingestion{% endblock %}
-
-{% block tabs %}
-  <ul class="nav nav-tabs px-3">
-    <li class="nav-item" role="presentation">
-      <a class="nav-link active" role="tab">Ingestion</a>
-    </li>
-  </ul>
-{% endblock tabs %}
-
-{% block controls %}
-  <div class="controls">
-    <div class="control-group">
-      {% block extra_controls %}{% endblock %}
-      {% add_button model %}
-    </div>
-  </div>
-{% endblock controls %}
-
-{% block content %}
-  <div class="tab-content">
-    {% for sync in syncs %}
-      <div class="card">
-        <h5 class="card-header d-flex justify-content-between" id="module{{ module.pk }}">
-          <div>
-          <i class="mdi mdi-cloud-sync"></i><i class="mdi mdi-sync"></i> <a href="{% url 'plugins:ipfabric_netbox:ipfabricsync' pk=sync.pk %}">{{ sync.name}}</a>
-          </div>
-          {% if perms.ipfabric_netbox.delete_ipfabricsync %}
-              <a href="{% url 'plugins:ipfabric_netbox:ipfabricsync_delete' pk=sync.pk %}" class="btn btn-danger btn-sm">
-                <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> Delete
-              </a>
-          {% endif %}
-
-        </h5>
-        <div class="card-body">
-          {% include 'inc/sync_warning.html' with object=module %}
-          <table class="table table-hover table-headings reports">
-            <thead>
-              <tr>
-                <th width="200">Source</th>
-                <th width="400">Snapshot</th>
-                <th>Status</th>
-                <th>Last Run</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td><a href="{% url 'plugins:ipfabric_netbox:ipfabricsource' pk=sync.snapshot_data.source.pk %}">{{ sync.snapshot_data.source.name }}</a></td>
-                <td><a href="{% url 'plugins:ipfabric_netbox:ipfabricsnapshot' pk=sync.snapshot_data.pk %}">{{ sync.snapshot_data.name}}</a></td>
-                <td>{% badge sync.get_status_display last_job.get_status_color %}</td>
-                <td>{{sync.last_synced}}</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
-    {% empty %}
-      <div class="alert alert-info" role="alert">
-        <h4 class="alert-heading">Sync Jobs Settings Found</h4>
-        {% if perms.extras.add_reportmodule %}
-          Get started by <a href="{% url 'plugins:ipfabric_netbox:ipfabricsync_add' %}">creating a sync</a> from an IP Fabric source.
-        {% endif %}
-      </div>
-    {% endfor %}
-  </div>
-{% endblock content %}