ipfabric_netbox 4.2.0b6__py3-none-any.whl → 4.2.0b7__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.0b6"
+    version = "4.2.0b7"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

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/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/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.dist-info → ipfabric_netbox-4.2.0b7.dist-info}/METADATA

@@ -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.dist-info → ipfabric_netbox-4.2.0b7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ipfabric_netbox/__init__.py,sha256=E5BKH5-wfz4YUPlNookiC6kVSmlN7ZR5mc7rN9YeHCY,674
+ipfabric_netbox/__init__.py,sha256=GYju0tg0eaMQXudqlau7AFn4csVDg1NA4mdly9R8Ivg,674
 ipfabric_netbox/api/__init__.py,sha256=XRclTGWVR0ZhAAwgYul5Wm_loug5_hUjEumbLQEwKYM,47
 ipfabric_netbox/api/serializers.py,sha256=RV1tmkbRF_Est3x1w_bfk63qwgEQc97Bm4mk89tv2FU,6502
 ipfabric_netbox/api/urls.py,sha256=1fXXVTxNY5E64Nfz6b7zXD9bZI3FcefuxAWKMe0w_QU,1240
@@ -33,10 +33,10 @@ ipfabric_netbox/migrations/0015_ipfabricingestionissue.py,sha256=AjAkyboa4BSXsN5
 ipfabric_netbox/migrations/0016_tags_and_changelog_for_snapshots.py,sha256=XqftTQ4GFnoCoGSHPa2WL_bjSVCGxdP2MFXCUa6LN1k,929
 ipfabric_netbox/migrations/0017_ipfabricsync_update_custom_fields.py,sha256=IVbAL2WdigYT40sXN0A8K3HweJ_O4QqyzjB06TbkG5E,447
 ipfabric_netbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/models.py,sha256=U9_ooh8juhtXwwcj0ay_6KZ-FlBt2SYrR7YCScAYa9k,36168
+ipfabric_netbox/models.py,sha256=5vsvqe7-lJjn2E-0YHJeiZm3cnglBPcKWXLSetRu1Kc,36262
 ipfabric_netbox/navigation.py,sha256=2dEJ_wKHb52Tl0FOV1TH3JbxRe8YZ56ewrTsBFGKpCg,2210
 ipfabric_netbox/signals.py,sha256=cGa5PVD2i24pGXiVNfbu6ruIDqPVdwKQHTSWe9Ura84,1838
-ipfabric_netbox/tables.py,sha256=pHKv6Bosjnc-7aApak3nLhzxqBiA30olPdaMO8F1PQg,8262
+ipfabric_netbox/tables.py,sha256=XT2cD0yGMaVxxpZwH6iMXP65OGE8G8OdDEtPjicAajE,8870
 ipfabric_netbox/template_content.py,sha256=bP2nUf5MM-GUbtQxJ8QoYVNXhrDCrkb8wZnbeqa07EA,315
 ipfabric_netbox/templates/ipfabric_netbox/inc/clone_form.html,sha256=K-2TTDaS1F4wUIR8FFFPqex4KJbySXtHiz5V-OEwelY,967
 ipfabric_netbox/templates/ipfabric_netbox/inc/diff.html,sha256=xOiIrvRIBtqDD65u6xcLo2xdwDKNpAylDmzznaJRGCw,3281
@@ -53,7 +53,6 @@ ipfabric_netbox/templates/ipfabric_netbox/ipfabricingestion.html,sha256=fm_X2FLn
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsnapshot.html,sha256=hj8ORs_4mM_xTjmw3McHN-da5seC8nbbkzobn0f1TSc,3482
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsource.html,sha256=koR_t6Mf2FhWlPZHchWsTOQDSLB7AWrqtY0TRnIzrrM,3864
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync.html,sha256=BicVS7mCP85fFZJEt46GUm5xppi1Jw3byw1el9BB2WE,4448
-ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync_list.html,sha256=b6uE317N69oeknOOqnJo5I-qm44QezDlBTRqslbEO8I,2593
 ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap.html,sha256=qFo_Ku5oksx5co4HVtVq0xAVFI6CLWs-iBrwYzGsEGA,1460
 ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap_list.html,sha256=p8zqn0-B6mawSUM3zQrus6dsKUM5SRBTO0X94pLboX8,452
 ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap_restore.html,sha256=cuvOBKnlMudMI-CX77W3vTpwhtc4CBcc6j6Ye-IBBMQ,2562
@@ -78,7 +77,7 @@ ipfabric_netbox/utilities/ipfutils.py,sha256=wFmL5oriuF-is1ZlrIcLmoeYUY5ih-CA9we
 ipfabric_netbox/utilities/logging.py,sha256=GYknjocMN6LQ2873_az3y0RKm29TCXaWviUIIneH-x0,3445
 ipfabric_netbox/utilities/nbutils.py,sha256=kFBEiJOGvr_49hJWCS2duXojx2-A9kVk0Xp_vj0ohfs,2641
 ipfabric_netbox/utilities/transform_map.py,sha256=QotbGc2TksINJrb62STgAigpC5Nsgi5umYHu_0rZd8k,2204
-ipfabric_netbox/views.py,sha256=nGWO-PlTyKviBzGEdmE3C_1I-xFjZMldqOWGx12wdbg,36855
-ipfabric_netbox-4.2.0b6.dist-info/METADATA,sha256=UKZI463uPse64h8bR0yCQQvkYUbqTuWwZlDMtG5fpFY,4638
-ipfabric_netbox-4.2.0b6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-ipfabric_netbox-4.2.0b6.dist-info/RECORD,,
+ipfabric_netbox/views.py,sha256=W7By73eiopwX-Q10S4kcFVL-lkz0WG0pwe2doNpvYg0,36807
+ipfabric_netbox-4.2.0b7.dist-info/METADATA,sha256=uuj3z6XFfZ08QxhrhI7fiAU9XxbWthsqxvN9IFBAd3Q,4638
+ipfabric_netbox-4.2.0b7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+ipfabric_netbox-4.2.0b7.dist-info/RECORD,,

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 %}