ipfabric_netbox 4.3.1b1__tar.gz → 4.3.1b3__tar.gz

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipfabric_netbox
-Version: 4.3.1b1
+Version: 4.3.1b3
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 License: MIT
 Keywords: netbox,ipfabric,plugin,sync

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/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.3.1b1"
+    version = "4.3.1b3"
     base_url = "ipfabric"
     min_version = "4.4.0"
 

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/ipfabric_netbox/api/serializers.py

@@ -1,4 +1,3 @@
-from core.choices import DataSourceStatusChoices
 from django.contrib.contenttypes.models import ContentType
 from netbox.api.fields import ChoiceField
 from netbox.api.fields import ContentTypeField
@@ -7,6 +6,8 @@ from netbox.api.serializers import NestedGroupModelSerializer
 from netbox_branching.api.serializers import BranchSerializer
 from rest_framework import serializers
 
+from ipfabric_netbox.choices import IPFabricSourceStatusChoices
+from ipfabric_netbox.choices import IPFabricSyncStatusChoices
 from ipfabric_netbox.models import IPFabricIngestion
 from ipfabric_netbox.models import IPFabricIngestionIssue
 from ipfabric_netbox.models import IPFabricRelationshipField
@@ -114,7 +115,7 @@ class IPFabricRelationshipFieldSerializer(NestedGroupModelSerializer):
 
 
 class IPFabricSourceSerializer(NestedGroupModelSerializer):
-    status = ChoiceField(choices=DataSourceStatusChoices, read_only=True)
+    status = ChoiceField(choices=IPFabricSourceStatusChoices, read_only=True)
     url = serializers.URLField()
 
     class Meta:
@@ -175,6 +176,7 @@ class IPFabricSnapshotSerializer(NestedGroupModelSerializer):
 
 
 class IPFabricSyncSerializer(NestedGroupModelSerializer):
+    status = ChoiceField(choices=IPFabricSyncStatusChoices, read_only=True)
     snapshot_data = IPFabricSnapshotSerializer(nested=True)
     parameters = serializers.JSONField()
 

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/ipfabric_netbox/choices.py

@@ -173,16 +173,16 @@ class IPFabricTransformMapSourceModelChoices(ChoiceSet):
     PARTNUMBERS = "part_number"
 
     CHOICES = (
-        (SITE, "Site", "cyan"),
-        (INVENTORY, "Inventory", "gray"),
-        (DEVICE, "Device", "gray"),
-        (VIRTUALCHASSIS, "Virtual Chassis", "grey"),
-        (INTERFACE, "Interface", "gray"),
-        (VLAN, "VLAN", "gray"),
-        (VRF, "VRF", "gray"),
-        (PREFIX, "Prefix", "gray"),
-        (IPADDRESS, "IP Address", "gray"),
-        (PARTNUMBERS, "Part Number", "gray"),
+        (SITE, _("Site"), "cyan"),
+        (INVENTORY, _("Inventory"), "gray"),
+        (DEVICE, _("Device"), "gray"),
+        (VIRTUALCHASSIS, _("Virtual Chassis"), "grey"),
+        (INTERFACE, _("Interface"), "gray"),
+        (VLAN, _("VLAN"), "gray"),
+        (VRF, _("VRF"), "gray"),
+        (PREFIX, _("Prefix"), "gray"),
+        (IPADDRESS, _("IP Address"), "gray"),
+        (PARTNUMBERS, _("Part Number"), "gray"),
     )
 
 
@@ -203,8 +203,8 @@ class IPFabricSourceTypeChoices(ChoiceSet):
     REMOTE = "remote"
 
     CHOICES = (
-        (LOCAL, "Local", "cyan"),
-        (REMOTE, "Remote", "gray"),
+        (LOCAL, _("Local"), "cyan"),
+        (REMOTE, _("Remote"), "gray"),
     )
 
 
@@ -220,12 +220,48 @@ class IPFabricRawDataTypeChoices(ChoiceSet):
     SITE = "site"
 
     CHOICES = (
-        (DEVICE, "Local", "cyan"),
-        (VLAN, "VLAN", "gray"),
-        (VIRTUALCHASSIS, "Virtual Chassis", "gray"),
-        (PREFIX, "Prefix", "gray"),
-        (INTERFACE, "Interface", "gray"),
-        (INVENTORYITEM, "Inventory Item", "gray"),
-        (IPADDRESS, "IP Address", "gray"),
-        (SITE, "Site", "gray"),
+        (DEVICE, _("Local"), "cyan"),
+        (VLAN, _("VLAN"), "gray"),
+        (VIRTUALCHASSIS, _("Virtual Chassis"), "gray"),
+        (PREFIX, _("Prefix"), "gray"),
+        (INTERFACE, _("Interface"), "gray"),
+        (INVENTORYITEM, _("Inventory Item"), "gray"),
+        (IPADDRESS, _("IP Address"), "gray"),
+        (SITE, _("Site"), "gray"),
+    )
+
+
+class IPFabricSourceStatusChoices(ChoiceSet):
+    NEW = "new"
+    QUEUED = "queued"
+    SYNCING = "syncing"
+    COMPLETED = "completed"
+    FAILED = "failed"
+
+    CHOICES = (
+        (NEW, _("New"), "blue"),
+        (QUEUED, _("Queued"), "orange"),
+        (SYNCING, _("Syncing"), "cyan"),
+        (COMPLETED, _("Completed"), "green"),
+        (FAILED, _("Failed"), "red"),
+    )
+
+
+class IPFabricSyncStatusChoices(ChoiceSet):
+    NEW = "new"
+    QUEUED = "queued"
+    SYNCING = "syncing"
+    READY_TO_MERGE = "ready_to_merge"
+    MERGING = "merging"
+    COMPLETED = "completed"
+    FAILED = "failed"
+
+    CHOICES = (
+        (NEW, _("New"), "blue"),
+        (QUEUED, _("Queued"), "orange"),
+        (SYNCING, _("Syncing"), "cyan"),
+        (READY_TO_MERGE, _("Ready to merge"), "purple"),
+        (MERGING, _("Merging"), "cyan"),
+        (COMPLETED, _("Completed"), "green"),
+        (FAILED, _("Failed"), "red"),
     )

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/ipfabric_netbox/filtersets.py

@@ -1,5 +1,4 @@
 import django_filters
-from core.choices import DataSourceStatusChoices
 from core.choices import ObjectChangeActionChoices
 from django.db.models import Q
 from django.utils.translation import gettext as _
@@ -8,6 +7,8 @@ from netbox.filtersets import ChangeLoggedModelFilterSet
 from netbox.filtersets import NetBoxModelFilterSet
 from netbox_branching.models import ChangeDiff
 
+from .choices import IPFabricSourceStatusChoices
+from .choices import IPFabricSyncStatusChoices
 from .models import IPFabricData
 from .models import IPFabricIngestion
 from .models import IPFabricIngestionIssue
@@ -110,7 +111,7 @@ class IPFabricSnapshotFilterSet(ChangeLoggedModelFilterSet):
 
 class IPFabricSourceFilterSet(NetBoxModelFilterSet):
     status = django_filters.MultipleChoiceFilter(
-        choices=DataSourceStatusChoices, null_value=None
+        choices=IPFabricSourceStatusChoices, null_value=None
     )
 
     class Meta:
@@ -235,6 +236,9 @@ class IPFabricSyncFilterSet(ChangeLoggedModelFilterSet):
         to_field_name="name",
         label=_("Snapshot (name)"),
     )
+    status = django_filters.MultipleChoiceFilter(
+        choices=IPFabricSyncStatusChoices, null_value=None
+    )
 
     class Meta:
         model = IPFabricSync

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/ipfabric_netbox/forms.py

@@ -1,6 +1,5 @@
 import copy
 
-from core.choices import DataSourceStatusChoices
 from core.choices import JobIntervalChoices
 from django import forms
 from django.contrib.contenttypes.models import ContentType
@@ -31,7 +30,9 @@ from utilities.forms.widgets import HTMXSelect
 from utilities.forms.widgets import NumberWithOptions
 
 from .choices import IPFabricSnapshotStatusModelChoices
+from .choices import IPFabricSourceStatusChoices
 from .choices import IPFabricSourceTypeChoices
+from .choices import IPFabricSyncStatusChoices
 from .choices import IPFabricTransformMapSourceModelChoices
 from .choices import required_transform_map_contenttypes
 from .choices import transform_field_source_columns
@@ -119,9 +120,9 @@ def list_to_choices(choices: list[str]) -> tuple[tuple[str, str], ...]:
 class IPFabricRelationshipFieldForm(NetBoxModelForm):
     coalesce = forms.BooleanField(required=False, initial=False)
     target_field = forms.CharField(
-        label="Target Field",
+        label=_("Target Field"),
         required=True,
-        help_text="Select target model field.",
+        help_text=_("Select target model field."),
         widget=forms.Select(),
     )
 
@@ -190,15 +191,15 @@ class IPFabricRelationshipFieldForm(NetBoxModelForm):
 class IPFabricTransformFieldForm(NetBoxModelForm):
     coalesce = forms.BooleanField(required=False, initial=False)
     source_field = forms.CharField(
-        label="Source Field",
+        label=_("Source Field"),
         required=True,
-        help_text="Select column from IP Fabric.",
+        help_text=_("Select column from IP Fabric."),
         widget=forms.Select(),
     )
     target_field = forms.CharField(
-        label="Target Field",
+        label=_("Target Field"),
         required=True,
-        help_text="Select target model field.",
+        help_text=_("Select target model field."),
         widget=forms.Select(),
     )
 
@@ -305,7 +306,7 @@ class IPFabricTransformMapBulkEditForm(NetBoxModelBulkEditForm):
     group = forms.ModelChoiceField(
         queryset=IPFabricTransformMapGroup.objects.all(),
         required=False,
-        label="Target Group",
+        label=_("Target Group"),
     )
     model = IPFabricTransformMap
     fields = ("group",)
@@ -341,25 +342,27 @@ class IPFabricTransformMapBulkImportForm(NetBoxModelImportForm):
 
 class IPFabricTransformMapCloneForm(forms.Form):
     name = forms.CharField(
-        required=True, label="Name", help_text="Name for the cloned transform map."
+        required=True,
+        label=_("Name"),
+        help_text=_("Name for the cloned transform map."),
     )
     group = forms.ModelChoiceField(
         queryset=IPFabricTransformMapGroup.objects.all(),
         required=False,
-        label="Target Group",
-        help_text="Select the group to assign the cloned transform map to.",
+        label=_("Target Group"),
+        help_text=_("Select the group to assign the cloned transform map to."),
     )
     clone_fields = forms.BooleanField(
         required=False,
         initial=True,
-        label="Clone Child Fields",
-        help_text="Clone all child fields of this transform map.",
+        label=_("Clone Child Fields"),
+        help_text=_("Clone all child fields of this transform map."),
     )
     clone_relationships = forms.BooleanField(
         required=False,
         initial=True,
-        label="Clone Child Relationships",
-        help_text="Clone all child relationships of this transform map.",
+        label=_("Clone Child Relationships"),
+        help_text=_("Clone all child relationships of this transform map."),
     )
 
 
@@ -383,7 +386,9 @@ class IPFabricSourceFilterForm(NetBoxModelFilterSetForm):
         FieldSet("q", "filter_id"),
         FieldSet("status", name=_("Source")),
     )
-    status = forms.MultipleChoiceField(choices=DataSourceStatusChoices, required=False)
+    status = forms.MultipleChoiceField(
+        choices=IPFabricSourceStatusChoices, required=False
+    )
 
 
 class IPFabricIngestionFilterForm(SavedFiltersMixin, FilterForm):
@@ -481,7 +486,7 @@ class IPFabricSourceForm(NetBoxModelForm):
                 parameters["timeout"] = self.cleaned_data[name]
 
         self.instance.parameters = parameters
-        self.instance.status = DataSourceStatusChoices.NEW
+        self.instance.status = IPFabricSourceStatusChoices.NEW
 
         instance = super().save(*args, **kwargs)
 
@@ -760,7 +765,7 @@ class IPFabricSyncForm(NetBoxModelForm):
                     )
                 ]
                 raise ValidationError(
-                    {"sites": f"Sites {invalid_sites} not part of the snapshot."}
+                    {"sites": _(f"Sites {invalid_sites} not part of the snapshot.")}
                 )
 
         scheduled_time = self.cleaned_data.get("scheduled")
@@ -801,7 +806,7 @@ class IPFabricSyncForm(NetBoxModelForm):
                     group.pk for group in self.cleaned_data["groups"]
                 ]
         self.instance.parameters = parameters
-        self.instance.status = DataSourceStatusChoices.NEW
+        self.instance.status = IPFabricSyncStatusChoices.NEW
         return super().save(*args, **kwargs)
 
 

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/ipfabric_netbox/graphql/enums.py

@@ -1,15 +1,17 @@
 import strawberry
-from core.choices import DataSourceStatusChoices
 from core.choices import JobStatusChoices
 from netbox_branching.choices import BranchStatusChoices
 
 from ipfabric_netbox.choices import IPFabricRawDataTypeChoices
 from ipfabric_netbox.choices import IPFabricSnapshotStatusModelChoices
+from ipfabric_netbox.choices import IPFabricSourceStatusChoices
 from ipfabric_netbox.choices import IPFabricSourceTypeChoices
+from ipfabric_netbox.choices import IPFabricSyncStatusChoices
 from ipfabric_netbox.choices import IPFabricTransformMapSourceModelChoices
 
 __all__ = (
-    "DataSourceStatusEnum",
+    "IPFabricSourceStatusEnum",
+    "IPFabricSyncStatusEnum",
     "IPFabricTransformMapSourceModelEnum",
     "IPFabricSourceTypeEnum",
     "IPFabricSnapshotStatusModelEnum",
@@ -18,7 +20,12 @@ __all__ = (
     "JobStatusEnum",
 )
 
-DataSourceStatusEnum = strawberry.enum(DataSourceStatusChoices.as_enum(prefix="type"))
+IPFabricSourceStatusEnum = strawberry.enum(
+    IPFabricSourceStatusChoices.as_enum(prefix="type")
+)
+IPFabricSyncStatusEnum = strawberry.enum(
+    IPFabricSyncStatusChoices.as_enum(prefix="type")
+)
 IPFabricTransformMapSourceModelEnum = strawberry.enum(
     IPFabricTransformMapSourceModelChoices.as_enum(prefix="type")
 )

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/ipfabric_netbox/graphql/filters.py

@@ -21,10 +21,11 @@ from users.graphql.filters import UserFilter
 
 from ipfabric_netbox import models
 from ipfabric_netbox.graphql.enums import BranchStatusEnum
-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 IPFabricSourceStatusEnum
 from ipfabric_netbox.graphql.enums import IPFabricSourceTypeEnum
+from ipfabric_netbox.graphql.enums import IPFabricSyncStatusEnum
 from ipfabric_netbox.graphql.enums import IPFabricTransformMapSourceModelEnum
 from ipfabric_netbox.graphql.enums import JobStatusEnum
 
@@ -127,7 +128,7 @@ class IPFabricSourceFilter(PrimaryModelFilterMixin):
     url: FilterLookup[str] | None = strawberry_django.filter_field()
     status: (
         Annotated[
-            "DataSourceStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
+            "IPFabricSourceStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
         ]
         | None
     ) = strawberry_django.filter_field()
@@ -179,7 +180,7 @@ class IPFabricSyncFilter(TagsFilterMixin, ChangeLogFilterMixin, BaseFilterMixin)
     ) = strawberry_django.filter_field()
     status: (
         Annotated[
-            "DataSourceStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
+            "IPFabricSyncStatusEnum", strawberry.lazy("ipfabric_netbox.graphql.enums")
         ]
         | None
     ) = strawberry_django.filter_field()

{ipfabric_netbox-4.3.1b1 → ipfabric_netbox-4.3.1b3}/ipfabric_netbox/jobs.py

@@ -1,7 +1,6 @@
 import logging
 from datetime import timedelta
 
-from core.choices import DataSourceStatusChoices
 from core.choices import JobStatusChoices
 from core.exceptions import SyncError
 from netbox.context_managers import event_tracking
@@ -9,6 +8,8 @@ from rq.timeouts import JobTimeoutException
 from utilities.datetime import local_now
 from utilities.request import NetBoxFakeRequest
 
+from .choices import IPFabricSourceStatusChoices
+from .choices import IPFabricSyncStatusChoices
 from .models import IPFabricIngestion
 from .models import IPFabricSource
 from .models import IPFabricSync
@@ -26,7 +27,7 @@ def sync_ipfabricsource(job, *args, **kwargs):
     except Exception as e:
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         IPFabricSource.objects.filter(pk=ipfsource.pk).update(
-            status=DataSourceStatusChoices.FAILED
+            status=IPFabricSourceStatusChoices.FAILED
         )
         if type(e) in (SyncError, JobTimeoutException):
             logging.error(e)
@@ -44,7 +45,7 @@ def sync_ipfabric(job, *args, **kwargs):
     except Exception as e:
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         IPFabricSync.objects.filter(pk=sync.pk).update(
-            status=DataSourceStatusChoices.FAILED
+            status=IPFabricSyncStatusChoices.FAILED
         )
         if type(e) in (SyncError, JobTimeoutException):
             logging.error(e)
@@ -90,7 +91,7 @@ def sync_ipfabric(job, *args, **kwargs):
 
             with event_tracking(request):
                 sync.scheduled = new_scheduled_time
-                sync.status = DataSourceStatusChoices.QUEUED
+                sync.status = IPFabricSyncStatusChoices.QUEUED
                 sync.full_clean()
                 sync.save()
             logger.info(
@@ -126,7 +127,7 @@ def merge_ipfabric_ingestion(job, remove_branch=False, *args, **kwargs):
         print(e)
         job.terminate(status=JobStatusChoices.STATUS_ERRORED)
         IPFabricSync.objects.filter(pk=ingestion.sync.pk).update(
-            status=DataSourceStatusChoices.FAILED
+            status=IPFabricSyncStatusChoices.FAILED
         )
         if type(e) in (SyncError, JobTimeoutException):
             logging.error(e)