ipfabric_netbox 4.2.0b6__tar.gz → 4.2.0b8__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ipfabric_netbox
-Version: 4.2.0b6
+Version: 4.2.0b8
 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.0b8}/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.0b8"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/api/serializers.py

@@ -183,7 +183,6 @@ class IPFabricSyncSerializer(NestedGroupModelSerializer):
             "id",
             "name",
             "snapshot_data",
-            "type",
             "status",
             "parameters",
             "auto_merge",

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/api/views.py

@@ -83,9 +83,7 @@ class IPFabricSnapshotViewSet(NetBoxReadOnlyModelViewSet):
             with transaction.atomic():
                 IPFabricData.objects.bulk_create(
                     [
-                        IPFabricData(
-                            snapshot_data=snapshot, data=item["data"], type=item["type"]
-                        )
+                        IPFabricData(snapshot_data=snapshot, data=item["data"])
                         for item in request.data["data"]
                     ],
                     batch_size=5000,

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/choices.py

@@ -198,18 +198,6 @@ class IPFabricSnapshotStatusModelChoices(ChoiceSet):
     ]
 
 
-class IPFabricSyncTypeChoices(ChoiceSet):
-    ALL = "all"
-    DCIM = "dcim"
-    IPAM = "ipam"
-
-    CHOICES = (
-        (ALL, _("All"), "gray"),
-        (DCIM, _("DCIM"), "blue"),
-        (IPAM, _("IPAM"), "blue"),
-    )
-
-
 class IPFabricSourceTypeChoices(ChoiceSet):
     LOCAL = "local"
     REMOTE = "remote"

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/filtersets.py

@@ -74,14 +74,12 @@ class IPFabricDataFilterSet(BaseFilterSet):
 
     class Meta:
         model = IPFabricData
-        fields = ["snapshot_data", "type"]
+        fields = ["snapshot_data"]
 
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset
-        return queryset.filter(
-            Q(snapshot_data__icontains=value) | Q(type__icontains=value)
-        )
+        return queryset.filter(Q(snapshot_data__icontains=value))
 
 
 class IPFabricSnapshotFilterSet(ChangeLoggedModelFilterSet):
@@ -245,7 +243,6 @@ class IPFabricSyncFilterSet(ChangeLoggedModelFilterSet):
             "name",
             "snapshot_data",
             "snapshot_data_id",
-            "type",
             "status",
             "auto_merge",
             "last_synced",

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/forms.py

@@ -488,6 +488,7 @@ class IPFabricSyncForm(NetBoxModelForm):
     sites = forms.MultipleChoiceField(
         required=False,
         label=_("Sites"),
+        help_text=_("Defaults to all sites if none selected."),
         widget=APISelectMultiple(
             api_url="/api/plugins/ipfabric/snapshot/{{snapshot_data}}/sites/",
         ),
@@ -527,15 +528,11 @@ class IPFabricSyncForm(NetBoxModelForm):
             "auto_merge",
             "update_custom_fields",
             "sites",
-            "type",
             "tags",
             "scheduled",
             "interval",
         )
-        widgets = {
-            "source": HTMXSelect(),
-            "type": HTMXSelect(),
-        }
+        widgets = {"source": HTMXSelect()}
 
     @property
     def fieldsets(self):
@@ -550,7 +547,6 @@ class IPFabricSyncForm(NetBoxModelForm):
             fieldsets.append(
                 FieldSet("snapshot_data", name=_("Snapshot Information")),
             )
-        fieldsets.append(FieldSet("type", name=_("Ingestion Type")))
         if self.backend_fields:
             for k, v in self.backend_fields.items():
                 fieldsets.append(FieldSet(*v, name=f"{k.upper()} Parameters"))
@@ -594,12 +590,7 @@ class IPFabricSyncForm(NetBoxModelForm):
                 self.initial["sites"] = self.instance.parameters.get("sites", [])
                 self.initial["groups"] = self.instance.parameters.get("groups", [])
 
-        backend_type = get_field_value(self, "type")
-        backend = {}
-        if backend_type == "all":
-            backend = sync_parameters
-        else:
-            backend[backend_type] = sync_parameters.get(backend_type)
+        backend = sync_parameters
 
         now = local_now().strftime("%Y-%m-%d %H:%M:%S")
         self.fields["scheduled"].help_text += f" (current time: <strong>{now}</strong>)"

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/graphql/enums.py

@@ -6,7 +6,6 @@ from netbox_branching.choices import BranchStatusChoices
 from ipfabric_netbox.choices import IPFabricRawDataTypeChoices
 from ipfabric_netbox.choices import IPFabricSnapshotStatusModelChoices
 from ipfabric_netbox.choices import IPFabricSourceTypeChoices
-from ipfabric_netbox.choices import IPFabricSyncTypeChoices
 from ipfabric_netbox.choices import IPFabricTransformMapSourceModelChoices
 
 __all__ = (
@@ -14,7 +13,6 @@ __all__ = (
     "IPFabricTransformMapSourceModelEnum",
     "IPFabricSourceTypeEnum",
     "IPFabricSnapshotStatusModelEnum",
-    "IPFabricSyncTypeEnum",
     "IPFabricRawDataTypeEnum",
     "BranchStatusEnum",
     "JobStatusEnum",
@@ -30,7 +28,6 @@ IPFabricSourceTypeEnum = strawberry.enum(
 IPFabricSnapshotStatusModelEnum = strawberry.enum(
     IPFabricSnapshotStatusModelChoices.as_enum(prefix="type")
 )
-IPFabricSyncTypeEnum = strawberry.enum(IPFabricSyncTypeChoices.as_enum(prefix="type"))
 IPFabricRawDataTypeEnum = strawberry.enum(
     IPFabricRawDataTypeChoices.as_enum(prefix="type")
 )

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/graphql/filters.py

@@ -25,7 +25,6 @@ from ipfabric_netbox.graphql.enums import DataSourceStatusEnum
 from ipfabric_netbox.graphql.enums import IPFabricRawDataTypeEnum
 from ipfabric_netbox.graphql.enums import IPFabricSnapshotStatusModelEnum
 from ipfabric_netbox.graphql.enums import IPFabricSourceTypeEnum
-from ipfabric_netbox.graphql.enums import IPFabricSyncTypeEnum
 from ipfabric_netbox.graphql.enums import IPFabricTransformMapSourceModelEnum
 from ipfabric_netbox.graphql.enums import JobStatusEnum
 
@@ -56,46 +55,62 @@ class IPFabricTransformMapGroupFilter(NetBoxModelFilterMixin):
 class IPFabricTransformMapFilter(NetBoxModelFilterMixin):
     id: ID | None = strawberry_django.filter_field()
     name: FilterLookup[str] | None = strawberry_django.filter_field()
-    source_model: Annotated[
-        "IPFabricTransformMapSourceModelEnum",
-        strawberry.lazy("ipfabric_netbox.graphql.enums"),
-    ] | None = strawberry_django.filter_field()
-    target_model: Annotated[
-        "ContentTypeFilter", strawberry.lazy("core.graphql.filters")
-    ] | None = strawberry_django.filter_field()
-    group: Annotated[
-        "IPFabricTransformMapGroupFilter",
-        strawberry.lazy("ipfabric_netbox.graphql.filters"),
-    ] | None = strawberry_django.filter_field()
+    source_model: (
+        Annotated[
+            "IPFabricTransformMapSourceModelEnum",
+            strawberry.lazy("ipfabric_netbox.graphql.enums"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    target_model: (
+        Annotated["ContentTypeFilter", strawberry.lazy("core.graphql.filters")] | None
+    ) = strawberry_django.filter_field()
+    group: (
+        Annotated[
+            "IPFabricTransformMapGroupFilter",
+            strawberry.lazy("ipfabric_netbox.graphql.filters"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.IPFabricTransformField, lookups=True)
 class IPFabricTransformFieldFilter(BaseFilterMixin):
     id: ID | None = strawberry_django.filter_field()
-    transform_map: Annotated[
-        "IPFabricTransformMapFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
+    transform_map: (
+        Annotated[
+            "IPFabricTransformMapFilter",
+            strawberry.lazy("ipfabric_netbox.graphql.filters"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
     source_field: FilterLookup[str] | None = strawberry_django.filter_field()
     target_field: FilterLookup[str] | None = strawberry_django.filter_field()
-    coalesce: Annotated[
-        "IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    coalesce: (
+        Annotated["IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")]
+        | None
+    ) = strawberry_django.filter_field()
     template: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.IPFabricRelationshipField, lookups=True)
 class IPFabricRelationshipFieldFilter(BaseFilterMixin):
     id: ID | None = strawberry_django.filter_field()
-    transform_map: Annotated[
-        "IPFabricTransformMapFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
-    source_model: Annotated[
-        "ContentTypeFilter", strawberry.lazy("core.graphql.filters")
-    ] | None = strawberry_django.filter_field()
+    transform_map: (
+        Annotated[
+            "IPFabricTransformMapFilter",
+            strawberry.lazy("ipfabric_netbox.graphql.filters"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    source_model: (
+        Annotated["ContentTypeFilter", strawberry.lazy("core.graphql.filters")] | None
+    ) = strawberry_django.filter_field()
     target_field: FilterLookup[str] | None = strawberry_django.filter_field()
-    coalesce: Annotated[
-        "IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    coalesce: (
+        Annotated["IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")]
+        | None
+    ) = strawberry_django.filter_field()
     template: FilterLookup[str] | None = strawberry_django.filter_field()
 
 
@@ -103,16 +118,22 @@ class IPFabricRelationshipFieldFilter(BaseFilterMixin):
 class IPFabricSourceFilter(PrimaryModelFilterMixin):
     id: ID | None = strawberry_django.filter_field()
     name: FilterLookup[str] | None = strawberry_django.filter_field()
-    type: Annotated[
-        "IPFabricSourceTypeEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
-    ] | None = strawberry_django.filter_field()
+    type: (
+        Annotated[
+            "IPFabricSourceTypeEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
     url: FilterLookup[str] | None = strawberry_django.filter_field()
-    status: Annotated[
-        "DataSourceStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
-    ] | None = strawberry_django.filter_field()
-    parameters: Annotated[
-        "JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    status: (
+        Annotated[
+            "DataSourceStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    parameters: (
+        Annotated["JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")] | None
+    ) = strawberry_django.filter_field()
     last_synced: DatetimeFilterLookup[
         datetime
     ] | None = strawberry_django.filter_field()
@@ -125,45 +146,55 @@ class IPFabricSnapshotFilter(TagsFilterMixin, ChangeLogFilterMixin, BaseFilterMi
     last_updated: DatetimeFilterLookup[
         datetime
     ] | None = strawberry_django.filter_field()
-    source: Annotated[
-        "IPFabricSourceFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
+    source: (
+        Annotated[
+            "IPFabricSourceFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
     name: FilterLookup[str] | None = strawberry_django.filter_field()
     snapshot_id: FilterLookup[str] | None = strawberry_django.filter_field()
-    data: Annotated[
-        "JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    data: (
+        Annotated["JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")] | None
+    ) = strawberry_django.filter_field()
     date: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
-    status: Annotated[
-        "IPFabricSnapshotStatusModelEnum",
-        strawberry.lazy("ipfabric_netbox.graphql.enums"),
-    ] | None = strawberry_django.filter_field()
+    status: (
+        Annotated[
+            "IPFabricSnapshotStatusModelEnum",
+            strawberry.lazy("ipfabric_netbox.graphql.enums"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.IPFabricSync, lookups=True)
 class IPFabricSyncFilter(TagsFilterMixin, ChangeLogFilterMixin, BaseFilterMixin):
     id: ID | None = strawberry_django.filter_field()
     name: FilterLookup[str] | None = strawberry_django.filter_field()
-    snapshot_data: Annotated[
-        "IPFabricSnapshotFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
-    type: Annotated[
-        "IPFabricSyncTypeEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
-    ] | None = strawberry_django.filter_field()
-    status: Annotated[
-        "DataSourceStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
-    ] | None = strawberry_django.filter_field()
-    parameters: Annotated[
-        "JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    snapshot_data: (
+        Annotated[
+            "IPFabricSnapshotFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    status: (
+        Annotated[
+            "DataSourceStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    parameters: (
+        Annotated["JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")] | None
+    ) = strawberry_django.filter_field()
     auto_merge: FilterLookup[bool] | None = strawberry_django.filter_field()
     last_synced: DatetimeFilterLookup[
         datetime
     ] | None = strawberry_django.filter_field()
     scheduled: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
-    interval: Annotated[
-        "IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    interval: (
+        Annotated["IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")]
+        | None
+    ) = strawberry_django.filter_field()
     user: Annotated[
         "UserFilter", strawberry.lazy("users.graphql.filters")
     ] | None = strawberry_django.filter_field()
@@ -172,23 +203,32 @@ class IPFabricSyncFilter(TagsFilterMixin, ChangeLogFilterMixin, BaseFilterMixin)
 @strawberry_django.filter(models.IPFabricIngestion, lookups=True)
 class IPFabricIngestionFilter(BaseFilterMixin):
     id: ID | None = strawberry_django.filter_field()
-    sync: Annotated[
-        "IPFabricSyncFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
-    job: Annotated[
-        "JobFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
-    branch: Annotated[
-        "BranchFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
+    sync: (
+        Annotated[
+            "IPFabricSyncFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    job: (
+        Annotated["JobFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")]
+        | None
+    ) = strawberry_django.filter_field()
+    branch: (
+        Annotated["BranchFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")]
+        | None
+    ) = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(models.IPFabricIngestionIssue, lookups=True)
 class IPFabricIngestionIssueFilter(BaseFilterMixin):
     id: ID | None = strawberry_django.filter_field()
-    ingestion: Annotated[
-        "IPFabricIngestionFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
+    ingestion: (
+        Annotated[
+            "IPFabricIngestionFilter",
+            strawberry.lazy("ipfabric_netbox.graphql.filters"),
+        ]
+        | None
+    ) = strawberry_django.filter_field()
     timestamp: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
     model: FilterLookup[str] | None = strawberry_django.filter_field()
     message: FilterLookup[str] | None = strawberry_django.filter_field()
@@ -201,15 +241,21 @@ class IPFabricIngestionIssueFilter(BaseFilterMixin):
 @strawberry_django.filter(models.IPFabricData, lookups=True)
 class IPFabricDataFilter(BaseFilterMixin):
     id: ID | None = strawberry_django.filter_field()
-    snapshot_data: Annotated[
-        "IPFabricSnapshotFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
-    ] | None = strawberry_django.filter_field()
-    data: Annotated[
-        "JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
-    type: Annotated[
-        "IPFabricRawDataTypeEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
-    ] | None = strawberry_django.filter_field()
+    snapshot_data: (
+        Annotated[
+            "IPFabricSnapshotFilter", strawberry.lazy("ipfabric_netbox.graphql.filters")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
+    data: (
+        Annotated["JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")] | None
+    ) = strawberry_django.filter_field()
+    type: (
+        Annotated[
+            "IPFabricRawDataTypeEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
+        ]
+        | None
+    ) = strawberry_django.filter_field()
 
 
 # These filters are not defined in the libs, so need to define them here
@@ -221,46 +267,51 @@ class BranchFilter(PrimaryModelFilterMixin):
         "UserFilter", strawberry.lazy("users.graphql.filters")
     ] | None = strawberry_django.filter_field()
     schema_id: FilterLookup[str] | None = strawberry_django.filter_field()
-    status: Annotated[
-        "BranchStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
-    ] | None = strawberry_django.filter_field()
-    applied_migrations: Annotated[
-        "StringArrayLookup", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    status: (
+        Annotated["BranchStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")]
+        | None
+    ) = strawberry_django.filter_field()
+    applied_migrations: (
+        Annotated["StringArrayLookup", strawberry.lazy("netbox.graphql.filter_lookups")]
+        | None
+    ) = strawberry_django.filter_field()
     last_sync: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
     merged_time: DatetimeFilterLookup[
         datetime
     ] | None = strawberry_django.filter_field()
-    merged_by: Annotated[
-        "UserFilter", strawberry.lazy("users.graphql.filters")
-    ] | None = strawberry_django.filter_field()
+    merged_by: (
+        Annotated["UserFilter", strawberry.lazy("users.graphql.filters")] | None
+    ) = strawberry_django.filter_field()
 
 
 @strawberry_django.filter(Job, lookups=True)
 class JobFilter(BaseFilterMixin):
     id: ID | None = strawberry_django.filter_field()
-    object_type: Annotated[
-        "ContentTypeFilter", strawberry.lazy("core.graphql.filters")
-    ] | None = strawberry_django.filter_field()
-    object_id: Annotated[
-        "IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    object_type: (
+        Annotated["ContentTypeFilter", strawberry.lazy("core.graphql.filters")] | None
+    ) = strawberry_django.filter_field()
+    object_id: (
+        Annotated["IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")]
+        | None
+    ) = strawberry_django.filter_field()
     name: FilterLookup[str] | None = strawberry_django.filter_field()
     created: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
     scheduled: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
-    interval: Annotated[
-        "IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    interval: (
+        Annotated["IntegerLookup", strawberry.lazy("netbox.graphql.filter_lookups")]
+        | None
+    ) = strawberry_django.filter_field()
     started: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
     completed: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
     user: Annotated[
         "UserFilter", strawberry.lazy("users.graphql.filters")
     ] | None = strawberry_django.filter_field()
-    status: Annotated[
-        "JobStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
-    ] | None = strawberry_django.filter_field()
-    data: Annotated[
-        "JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")
-    ] | None = strawberry_django.filter_field()
+    status: (
+        Annotated["JobStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")]
+        | None
+    ) = strawberry_django.filter_field()
+    data: (
+        Annotated["JSONFilter", strawberry.lazy("netbox.graphql.filter_lookups")] | None
+    ) = strawberry_django.filter_field()
     error: FilterLookup[str] | None = strawberry_django.filter_field()
     job_id: FilterLookup[str] | None = strawberry_django.filter_field()

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/graphql/types.py

@@ -58,14 +58,20 @@ class IPFabricTransformMapGroupType(NetBoxObjectType):
 class IPFabricTransformMapType(NetBoxObjectType):
     name: str
     source_model: str
-    target_model: Annotated[
-        "ContentTypeType",
-        strawberry.lazy("netbox.graphql.types"),
-    ] | None
-    group: Annotated[
-        "IPFabricTransformMapGroupType",
-        strawberry.lazy("ipfabric_netbox.graphql.types"),
-    ] | None
+    target_model: (
+        Annotated[
+            "ContentTypeType",
+            strawberry.lazy("netbox.graphql.types"),
+        ]
+        | None
+    )
+    group: (
+        Annotated[
+            "IPFabricTransformMapGroupType",
+            strawberry.lazy("ipfabric_netbox.graphql.types"),
+        ]
+        | None
+    )
 
 
 @strawberry_django.type(
@@ -74,9 +80,12 @@ class IPFabricTransformMapType(NetBoxObjectType):
     filters=IPFabricTransformFieldFilter,
 )
 class IPFabricTransformFieldType(BaseObjectType):
-    transform_map: Annotated[
-        "IPFabricTransformMapType", strawberry.lazy("ipfabric_netbox.graphql.types")
-    ] | None
+    transform_map: (
+        Annotated[
+            "IPFabricTransformMapType", strawberry.lazy("ipfabric_netbox.graphql.types")
+        ]
+        | None
+    )
     source_field: str
     target_field: str
     coalesce: bool
@@ -89,9 +98,12 @@ class IPFabricTransformFieldType(BaseObjectType):
     filters=IPFabricRelationshipFieldFilter,
 )
 class IPFabricRelationshipFieldType(BaseObjectType):
-    transform_map: Annotated[
-        "IPFabricTransformMapType", strawberry.lazy("ipfabric_netbox.graphql.types")
-    ] | None
+    transform_map: (
+        Annotated[
+            "IPFabricTransformMapType", strawberry.lazy("ipfabric_netbox.graphql.types")
+        ]
+        | None
+    )
     source_model: Annotated["ContentTypeType", strawberry.lazy("netbox.graphql.types")]
     target_field: str
     coalesce: bool
@@ -114,9 +126,12 @@ class IPFabricSourceType(OrganizationalObjectType):
     models.IPFabricSnapshot, fields="__all__", filters=IPFabricSnapshotFilter
 )
 class IPFabricSnapshotType(ChangelogMixin, TagsMixin, BaseObjectType):
-    source: Annotated[
-        "IPFabricSourceType", strawberry.lazy("ipfabric_netbox.graphql.types")
-    ] | None
+    source: (
+        Annotated[
+            "IPFabricSourceType", strawberry.lazy("ipfabric_netbox.graphql.types")
+        ]
+        | None
+    )
     name: str
     snapshot_id: str
     data: JSON
@@ -128,10 +143,12 @@ class IPFabricSnapshotType(ChangelogMixin, TagsMixin, BaseObjectType):
 )
 class IPFabricSyncType(ChangelogMixin, TagsMixin, BaseObjectType):
     name: str
-    snapshot_data: Annotated[
-        "IPFabricSnapshotType", strawberry.lazy("ipfabric_netbox.graphql.types")
-    ] | None
-    type: str
+    snapshot_data: (
+        Annotated[
+            "IPFabricSnapshotType", strawberry.lazy("ipfabric_netbox.graphql.types")
+        ]
+        | None
+    )
     status: str
     parameters: JSON
     auto_merge: bool
@@ -159,13 +176,14 @@ class JobType(BaseObjectType):
     models.IPFabricIngestion, fields="__all__", filters=IPFabricIngestionFilter
 )
 class IPFabricIngestionType(BaseObjectType):
-    sync: Annotated[
-        "IPFabricSyncType", strawberry.lazy("ipfabric_netbox.graphql.types")
-    ] | None
+    sync: (
+        Annotated["IPFabricSyncType", strawberry.lazy("ipfabric_netbox.graphql.types")]
+        | None
+    )
     job: Annotated["JobType", strawberry.lazy("ipfabric_netbox.graphql.types")] | None
-    branch: Annotated[
-        "BranchType", strawberry.lazy("ipfabric_netbox.graphql.types")
-    ] | None
+    branch: (
+        Annotated["BranchType", strawberry.lazy("ipfabric_netbox.graphql.types")] | None
+    )
 
 
 @strawberry_django.type(
@@ -174,9 +192,12 @@ class IPFabricIngestionType(BaseObjectType):
     filters=IPFabricIngestionIssueFilter,
 )
 class IPFabricIngestionIssueType(BaseObjectType):
-    ingestion: Annotated[
-        "IPFabricIngestionType", strawberry.lazy("ipfabric_netbox.graphql.types")
-    ] | None
+    ingestion: (
+        Annotated[
+            "IPFabricIngestionType", strawberry.lazy("ipfabric_netbox.graphql.types")
+        ]
+        | None
+    )
     timestamp: str
     model: str | None
     message: str

ipfabric_netbox-4.2.0b8/ipfabric_netbox/migrations/0018_remove_type_field.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2 on 2025-08-25 12:53
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        (
+            "ipfabric_netbox",
+            "0017_ipfabricsync_update_custom_fields",
+        ),
+    ]
+    operations = [
+        migrations.RemoveField(
+            model_name="ipfabricsync",
+            name="type",
+        ),
+    ]

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/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
@@ -598,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,
@@ -667,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):
         """

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/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-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/tests/api/test_api.py

@@ -532,18 +532,15 @@ class IPFabricSyncTest(APIViewTestCases.APIViewTestCase):
     create_data = [
         {
             "name": "Test Sync A",
-            "type": "dcim",
             "parameters": {"site": True, "device": False},
         },
         {
             "name": "Test Sync B",
-            "type": "ipam",
             "parameters": {"ipaddress": True, "prefix": True},
             "auto_merge": True,
         },
         {
             "name": "Test Sync C",
-            "type": "dcim",
             "parameters": {"device": True, "interface": True},
             "interval": 60,
         },
@@ -617,20 +614,17 @@ class IPFabricSyncTest(APIViewTestCases.APIViewTestCase):
         IPFabricSync.objects.create(
             name="Sync Test D",
             snapshot_data=snapshots[0],
-            type="dcim",
             parameters={"site": True, "device": False},
         )
         IPFabricSync.objects.create(
             name="Sync Test E",
             snapshot_data=snapshots[1],
-            type="dcim",
             parameters={"device": True, "interface": True},
             auto_merge=True,
         )
         IPFabricSync.objects.create(
             name="Sync Test F",
             snapshot_data=snapshots[2],
-            type="ipam",
             parameters={"ipaddress": True, "prefix": False},
             interval=30,
         )
@@ -724,19 +718,16 @@ class IPFabricIngestionTest(
             IPFabricSync.objects.create(
                 name="Ingestion Test Sync A",
                 snapshot_data=snapshots[0],
-                type="dcim",
                 parameters={"site": True, "device": False},
             ),
             IPFabricSync.objects.create(
                 name="Ingestion Test Sync B",
                 snapshot_data=snapshots[1],
-                type="dcim",
                 parameters={"device": True, "interface": True},
             ),
             IPFabricSync.objects.create(
                 name="Ingestion Test Sync C",
                 snapshot_data=snapshots[2],
-                type="ipam",
                 parameters={"ipaddress": True, "prefix": False},
             ),
         )
@@ -828,19 +819,16 @@ class IPFabricIngestionIssueTest(
             IPFabricSync.objects.create(
                 name="Issue Test Sync A",
                 snapshot_data=snapshots[0],
-                type="dcim",
                 parameters={"site": True, "device": False},
             ),
             IPFabricSync.objects.create(
                 name="Issue Test Sync B",
                 snapshot_data=snapshots[1],
-                type="dcim",
                 parameters={"device": True, "interface": True},
             ),
             IPFabricSync.objects.create(
                 name="Issue Test Sync C",
                 snapshot_data=snapshots[2],
-                type="ipam",
                 parameters={"ipaddress": True, "prefix": False},
             ),
         )

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/ipfabric_netbox/tests/test_models.py

@@ -119,7 +119,6 @@ class IPFabricTransformMapModelTestCase(TestCase):
         )
         sync = IPFabricSync.objects.create(
             name="ingest",
-            type="dcim",
             status="new",
             snapshot_data=snapshot,
             update_custom_fields=True,

{ipfabric_netbox-4.2.0b6 → ipfabric_netbox-4.2.0b8}/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.0b8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ipfabric_netbox"
-version = "4.2.0b6"
+version = "4.2.0b8"
 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 %}