ipfabric_netbox 4.3.1__tar.gz → 4.3.1b2__tar.gz

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/PKG-INFO

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

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

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/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.1 → ipfabric_netbox-4.3.1b2}/ipfabric_netbox/choices.py

@@ -229,3 +229,39 @@ class IPFabricRawDataTypeChoices(ChoiceSet):
         (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.1 → ipfabric_netbox-4.3.1b2}/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.1 → ipfabric_netbox-4.3.1b2}/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
@@ -383,7 +384,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 +484,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)
 
@@ -801,7 +804,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.1 → ipfabric_netbox-4.3.1b2}/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.1 → ipfabric_netbox-4.3.1b2}/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.1 → ipfabric_netbox-4.3.1b2}/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)

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/ipfabric_netbox/models.py

@@ -7,7 +7,6 @@ from copy import deepcopy
 from uuid import uuid4
 
 import httpx
-from core.choices import DataSourceStatusChoices
 from core.choices import JobStatusChoices
 from core.exceptions import SyncError
 from core.models import Job
@@ -46,7 +45,9 @@ from utilities.request import NetBoxFakeRequest
 
 from .choices import IPFabricRawDataTypeChoices
 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 .signals import clear_other_primary_ip
@@ -418,7 +419,7 @@ class IPFabricClient:
             self.handle_sync_failure("Error", e)
 
     def handle_sync_failure(self, failure_type, exception, message=None):
-        self.status = DataSourceStatusChoices.FAILED
+        self.status = IPFabricSyncStatusChoices.FAILED
 
         if message:
             self.logger.log_failure(
@@ -439,8 +440,8 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
     url = models.CharField(max_length=200, verbose_name=_("URL"))
     status = models.CharField(
         max_length=50,
-        choices=DataSourceStatusChoices,
-        default=DataSourceStatusChoices.NEW,
+        choices=IPFabricSourceStatusChoices,
+        default=IPFabricSourceStatusChoices.NEW,
         editable=False,
     )
     parameters = models.JSONField(blank=True, null=True)
@@ -460,8 +461,8 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
     @property
     def ready_for_sync(self):
         return self.status not in (
-            DataSourceStatusChoices.QUEUED,
-            DataSourceStatusChoices.SYNCING,
+            IPFabricSourceStatusChoices.QUEUED,
+            IPFabricSourceStatusChoices.SYNCING,
         )
 
     @property
@@ -476,7 +477,7 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
 
     def enqueue_sync_job(self, request):
         # Set the status to "syncing"
-        self.status = DataSourceStatusChoices.QUEUED
+        self.status = IPFabricSourceStatusChoices.QUEUED
         IPFabricSource.objects.filter(pk=self.pk).update(status=self.status)
 
         # Enqueue a sync job
@@ -489,7 +490,7 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
 
     def sync(self, job):
         self.logger = SyncLogging(job=job.pk)
-        if self.status == DataSourceStatusChoices.SYNCING:
+        if self.status == IPFabricSourceStatusChoices.SYNCING:
             self.logger.log_failure(
                 "Cannot initiate sync; syncing already in progress.", obj=self
             )
@@ -497,7 +498,7 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
 
         pre_sync.send(sender=self.__class__, instance=self)
 
-        self.status = DataSourceStatusChoices.SYNCING
+        self.status = IPFabricSourceStatusChoices.SYNCING
         IPFabricSource.objects.filter(pk=self.pk).update(status=self.status)
 
         # Begin Sync
@@ -542,7 +543,7 @@ class IPFabricSource(IPFabricClient, JobsMixin, PrimaryModel):
                         f"Created/Updated Snapshot {snapshot.name} ({snapshot.snapshot_id})",
                         obj=snapshot,  # noqa E225
                     )
-            self.status = DataSourceStatusChoices.COMPLETED
+            self.status = IPFabricSourceStatusChoices.COMPLETED
             self.logger.log_success(f"Completed syncing snapshots from {self.name}")
             logger.debug(f"Completed syncing snapshots from {self.url}")
         except Exception as e:
@@ -621,8 +622,8 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
     )
     status = models.CharField(
         max_length=50,
-        choices=DataSourceStatusChoices,
-        default=DataSourceStatusChoices.NEW,
+        choices=IPFabricSyncStatusChoices,
+        default=IPFabricSyncStatusChoices.NEW,
         editable=False,
     )
     parameters = models.JSONField(blank=True, null=True)
@@ -668,7 +669,7 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
         return reverse("plugins:ipfabric_netbox:ipfabricsync", args=[self.pk])
 
     def get_status_color(self):
-        return DataSourceStatusChoices.colors.get(self.status)
+        return IPFabricSyncStatusChoices.colors.get(self.status)
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
@@ -677,7 +678,7 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
 
     @property
     def ready_for_sync(self):
-        if self.status not in (DataSourceStatusChoices.SYNCING,):
+        if self.status not in (IPFabricSyncStatusChoices.SYNCING,):
             if self.snapshot_data.source.type == "remote":
                 if self.snapshot_data.ipf_data.count() > 0:
                     return True
@@ -723,7 +724,7 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
 
     def enqueue_sync_job(self, adhoc=False, user=None) -> Job | None:
         def set_syncing_status():
-            self.status = DataSourceStatusChoices.QUEUED
+            self.status = IPFabricSyncStatusChoices.QUEUED
             IPFabricSync.objects.filter(pk=self.pk).update(status=self.status)
 
         def sync_snapshots():
@@ -794,12 +795,12 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
                 f"Combination of these transform map groups failed validation. Missing maps: {missing}."
             )
 
-        if self.status == DataSourceStatusChoices.SYNCING:
+        if self.status == IPFabricSyncStatusChoices.SYNCING:
             raise SyncError("Cannot initiate sync; ingestion already in progress.")
 
         pre_sync.send(sender=self.__class__, instance=self)
 
-        self.status = DataSourceStatusChoices.SYNCING
+        self.status = IPFabricSyncStatusChoices.SYNCING
         IPFabricSync.objects.filter(pk=self.pk).update(status=self.status)
 
         # Begin Sync
@@ -875,11 +876,11 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
                 current_request.set(token.old_value)
                 active_branch.set(current_branch)
 
-            if self.status != DataSourceStatusChoices.FAILED:
-                self.status = DataSourceStatusChoices.COMPLETED
+            if self.status != IPFabricSyncStatusChoices.FAILED:
+                self.status = IPFabricSyncStatusChoices.READY_TO_MERGE
 
         except Exception as e:
-            self.status = DataSourceStatusChoices.FAILED
+            self.status = IPFabricSyncStatusChoices.FAILED
             self.logger.log_failure(f"Ingestion Failed: `{e}`", obj=ingestion)
             self.logger.log_failure(
                 f"Stack Trace: `{traceback.format_exc()}`", obj=ingestion
@@ -893,7 +894,7 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
 
         self.last_synced = timezone.now()
 
-        if self.auto_merge and self.status == DataSourceStatusChoices.COMPLETED:
+        if self.auto_merge and self.status == IPFabricSyncStatusChoices.READY_TO_MERGE:
             self.logger.log_info("Auto Merging Ingestion", obj=ingestion)
             logger.info("Auto Merging Ingestion")
             try:
@@ -947,7 +948,7 @@ class IPFabricIngestion(JobsMixin, models.Model):
 
     def enqueue_merge_job(self, user, remove_branch=False):
         # Set the status to "queued"
-        self.status = DataSourceStatusChoices.QUEUED
+        self.status = IPFabricSyncStatusChoices.QUEUED
         IPFabricSync.objects.filter(ipfabricingestion=self.pk).update(
             status=self.status
         )
@@ -988,12 +989,12 @@ class IPFabricIngestion(JobsMixin, models.Model):
 
     def sync_merge(self):
         ipfabricsync = self.sync
-        if ipfabricsync.status == DataSourceStatusChoices.SYNCING:
+        if ipfabricsync.status == IPFabricSyncStatusChoices.MERGING:
             raise SyncError("Cannot initiate merge; merge already in progress.")
 
         pre_sync.send(sender=self.__class__, instance=self)
 
-        ipfabricsync.status = DataSourceStatusChoices.SYNCING
+        ipfabricsync.status = IPFabricSyncStatusChoices.MERGING
         IPFabricSync.objects.filter(ipfabricingestion=self.pk).update(
             status=self.sync.status
         )
@@ -1010,9 +1011,9 @@ class IPFabricIngestion(JobsMixin, models.Model):
                 assign_virtualchassis_master, sender=VirtualChassis
             )
             signals.pre_save.disconnect(clear_other_primary_ip, sender=Device)
-            ipfabricsync.status = DataSourceStatusChoices.COMPLETED
+            ipfabricsync.status = IPFabricSyncStatusChoices.COMPLETED
         except Exception as e:
-            ipfabricsync.status = DataSourceStatusChoices.FAILED
+            ipfabricsync.status = IPFabricSyncStatusChoices.FAILED
             logger.debug(f"Merging {self.name} Failed: `{e}`")
 
         logger.debug(f"Completed merge {self.name}")

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/ipfabric_netbox/tests/api/test_api.py

@@ -1,9 +1,10 @@
-from core.choices import DataSourceStatusChoices
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from rest_framework import status
 from utilities.testing import APIViewTestCases
 
+from ipfabric_netbox.choices import IPFabricSourceStatusChoices
+from ipfabric_netbox.choices import IPFabricSyncStatusChoices
 from ipfabric_netbox.models import IPFabricData
 from ipfabric_netbox.models import IPFabricIngestion
 from ipfabric_netbox.models import IPFabricIngestionIssue
@@ -397,7 +398,7 @@ class IPFabricSourceTest(APIViewTestCases.APIViewTestCase):
         # Get the first source from setUpTestData
         source = IPFabricSource.objects.first()
         # Set status to make ready_for_sync return True
-        source.status = DataSourceStatusChoices.COMPLETED
+        source.status = IPFabricSourceStatusChoices.COMPLETED
         source.save()
 
         with self.settings(CELERY_TASK_ALWAYS_EAGER=True):
@@ -437,7 +438,7 @@ class IPFabricSourceTest(APIViewTestCases.APIViewTestCase):
 
         source = IPFabricSource.objects.first()
         # Set status to make ready_for_sync return False
-        source.status = DataSourceStatusChoices.SYNCING
+        source.status = IPFabricSourceStatusChoices.SYNCING
         source.save()
 
         url = f"{BASE}/source/{source.pk}/sync/"
@@ -707,7 +708,7 @@ class IPFabricSyncTest(APIViewTestCases.APIViewTestCase):
         # Get the first sync from setUpTestData
         sync = IPFabricSync.objects.first()
         # Set status and ensure snapshot has data to make ready_for_sync return True
-        sync.status = DataSourceStatusChoices.COMPLETED
+        sync.status = IPFabricSyncStatusChoices.COMPLETED
         sync.save()
 
         # Ensure the snapshot has data
@@ -753,7 +754,7 @@ class IPFabricSyncTest(APIViewTestCases.APIViewTestCase):
 
         sync = IPFabricSync.objects.first()
         # Set status to make ready_for_sync return False
-        sync.status = DataSourceStatusChoices.SYNCING
+        sync.status = IPFabricSyncStatusChoices.SYNCING
         sync.save()
 
         url = f"{BASE}/sync/{sync.pk}/sync/"

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/ipfabric_netbox/tests/test_forms.py

@@ -1,7 +1,6 @@
 from datetime import timedelta
 from unittest.mock import patch
 
-from core.choices import DataSourceStatusChoices
 from dcim.models import Device
 from dcim.models import Site
 from django.contrib.contenttypes.models import ContentType
@@ -9,7 +8,9 @@ from django.test import TestCase
 from utilities.datetime import local_now
 
 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.forms import IPFabricIngestionFilterForm
 from ipfabric_netbox.forms import IPFabricIngestionMergeForm
 from ipfabric_netbox.forms import IPFabricRelationshipFieldForm
@@ -38,7 +39,7 @@ class IPFabricSourceFormTestCase(TestCase):
             name="Test IP Fabric Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://test.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
             parameters={"auth": "test_token", "verify": True, "timeout": 30},
         )
 
@@ -134,7 +135,7 @@ class IPFabricSourceFormTestCase(TestCase):
         )
         self.assertTrue(form.is_valid(), form.errors)
         instance = form.save()
-        self.assertEqual(instance.status, DataSourceStatusChoices.NEW)
+        self.assertEqual(instance.status, IPFabricSourceStatusChoices.NEW)
 
     def test_form_initializes_existing_parameters(self):
         # Test that form properly initializes with existing instance parameters
@@ -339,7 +340,7 @@ class IPFabricRelationshipFieldFormTestCase(TestCase):
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://test.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         cls.transform_map_group = IPFabricTransformMapGroup.objects.create(
@@ -453,7 +454,7 @@ class IPFabricTransformFieldFormTestCase(TestCase):
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://test.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         cls.transform_map_group = IPFabricTransformMapGroup.objects.create(
@@ -671,7 +672,7 @@ class IPFabricSnapshotFilterFormTestCase(TestCase):
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://test.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
     def test_all_fields_are_optional(self):
@@ -699,8 +700,8 @@ class IPFabricSourceFilterFormTestCase(TestCase):
         form = IPFabricSourceFilterForm(
             data={
                 "status": [
-                    DataSourceStatusChoices.NEW,
-                    DataSourceStatusChoices.COMPLETED,
+                    IPFabricSourceStatusChoices.NEW,
+                    IPFabricSourceStatusChoices.COMPLETED,
                 ]
             }
         )
@@ -714,7 +715,7 @@ class IPFabricIngestionFilterFormTestCase(TestCase):
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://test.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         cls.snapshot = IPFabricSnapshot.objects.create(
@@ -762,7 +763,7 @@ class IPFabricSyncFormTestCase(TestCase):
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://test.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         cls.snapshot = IPFabricSnapshot.objects.create(
@@ -1017,7 +1018,7 @@ class IPFabricSyncFormTestCase(TestCase):
             name="Different Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://different.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         # Try to use self.snapshot (which belongs to self.source) with different_source
@@ -1179,7 +1180,7 @@ class IPFabricSyncFormTestCase(TestCase):
         self.assertEqual(sync_instance.name, "Test Sync Save")
         self.assertEqual(sync_instance.snapshot_data.source, self.source)
         self.assertEqual(sync_instance.snapshot_data, self.snapshot)
-        self.assertEqual(sync_instance.status, DataSourceStatusChoices.NEW)
+        self.assertEqual(sync_instance.status, IPFabricSyncStatusChoices.NEW)
         self.assertTrue(sync_instance.auto_merge)
         self.assertTrue(sync_instance.update_custom_fields)
 
@@ -1364,11 +1365,11 @@ class IPFabricSyncFormTestCase(TestCase):
         sync_instance = form.save()
 
         # Status should always be NEW after save
-        self.assertEqual(sync_instance.status, DataSourceStatusChoices.NEW)
+        self.assertEqual(sync_instance.status, IPFabricSyncStatusChoices.NEW)
 
         # Verify in database as well
         saved_instance = IPFabricSync.objects.get(pk=sync_instance.pk)
-        self.assertEqual(saved_instance.status, DataSourceStatusChoices.NEW)
+        self.assertEqual(saved_instance.status, IPFabricSyncStatusChoices.NEW)
 
     def test_fieldsets_for_local_source_type(self):
         """Test that fieldsets returns correct structure for local source type"""
@@ -1413,7 +1414,7 @@ class IPFabricSyncFormTestCase(TestCase):
             name="Test Remote Source",
             type=IPFabricSourceTypeChoices.REMOTE,
             url="https://remote.ipfabric.local",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         remote_snapshot = IPFabricSnapshot.objects.create(

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/ipfabric_netbox/tests/test_views.py

@@ -3,7 +3,6 @@ from datetime import timedelta
 from unittest.mock import patch
 from uuid import uuid4
 
-from core.choices import DataSourceStatusChoices
 from core.choices import JobStatusChoices
 from core.models import Job
 from dcim.models import Device
@@ -24,7 +23,9 @@ from utilities.testing import ModelTestCase
 from utilities.testing import ViewTestCases
 
 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.forms import dcim_parameters
 from ipfabric_netbox.forms import ipam_parameters
 from ipfabric_netbox.forms import tableChoices
@@ -79,7 +80,7 @@ class IPFabricSourceTestCase(
                 name="IP Fabric Source 1",
                 type=IPFabricSourceTypeChoices.LOCAL,
                 url="https://ipfabric1.example.com",
-                status=DataSourceStatusChoices.NEW,
+                status=IPFabricSourceStatusChoices.NEW,
                 parameters={"auth": "token1", "verify": True, "timeout": 30},
                 last_synced=timezone.now(),
             ),
@@ -87,7 +88,7 @@ class IPFabricSourceTestCase(
                 name="IP Fabric Source 2",
                 type=IPFabricSourceTypeChoices.LOCAL,
                 url="https://ipfabric2.example.com",
-                status=DataSourceStatusChoices.COMPLETED,
+                status=IPFabricSourceStatusChoices.COMPLETED,
                 parameters={"auth": "token2", "verify": False, "timeout": 60},
                 last_synced=timezone.now(),
             ),
@@ -95,7 +96,7 @@ class IPFabricSourceTestCase(
                 name="IP Fabric Source 3",
                 type=IPFabricSourceTypeChoices.LOCAL,
                 url="https://ipfabric3.example.com",
-                status=DataSourceStatusChoices.FAILED,
+                status=IPFabricSourceStatusChoices.FAILED,
                 parameters={"auth": "token3", "verify": True, "timeout": 45},
             ),
         )
@@ -390,13 +391,13 @@ class IPFabricSnapshotTestCase(
             name="Test Source 1",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://ipfabric1.example.com",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
         source2 = IPFabricSource.objects.create(
             name="Test Source 2",
             type=IPFabricSourceTypeChoices.REMOTE,
             url="https://ipfabric2.example.com",
-            status=DataSourceStatusChoices.COMPLETED,
+            status=IPFabricSourceStatusChoices.COMPLETED,
         )
 
         # Create three IPFabricSnapshot instances for testing
@@ -511,7 +512,7 @@ class IPFabricDataTestCase(
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://ipfabric.example.com",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         snapshot = IPFabricSnapshot.objects.create(
@@ -628,7 +629,7 @@ class IPFabricSyncTestCase(
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://ipfabric.example.com",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         snapshot1 = IPFabricSnapshot.objects.create(
@@ -654,7 +655,7 @@ class IPFabricSyncTestCase(
             IPFabricSync(
                 name="Sync Job 1",
                 snapshot_data=snapshot1,
-                status=DataSourceStatusChoices.NEW,
+                status=IPFabricSyncStatusChoices.NEW,
                 parameters=get_parameters(),
                 last_synced=timezone.now(),
                 scheduled=timezone.now() + timedelta(hours=6),
@@ -663,14 +664,14 @@ class IPFabricSyncTestCase(
             IPFabricSync(
                 name="Sync Job 2",
                 snapshot_data=snapshot1,
-                status=DataSourceStatusChoices.COMPLETED,
+                status=IPFabricSyncStatusChoices.COMPLETED,
                 parameters=get_parameters(),
                 last_synced=timezone.now(),
             ),
             IPFabricSync(
                 name="Sync Job 3",
                 snapshot_data=snapshot2,
-                status=DataSourceStatusChoices.FAILED,
+                status=IPFabricSyncStatusChoices.FAILED,
                 parameters=get_parameters(),
             ),
         )
@@ -701,16 +702,16 @@ class IPFabricSyncTestCase(
 
         cls.csv_data = (
             "name,snapshot_data,status,parameters",
-            f'Sync CSV 1,{snapshot1.pk},{DataSourceStatusChoices.NEW},"{{\\"auto_merge\\": true}}"',  # noqa: E231
-            f'Sync CSV 2,{snapshot1.pk},{DataSourceStatusChoices.COMPLETED},"{{\\"auto_merge\\": false}}"',  # noqa: E231
-            f'Sync CSV 3,{snapshot2.pk},{DataSourceStatusChoices.NEW},"{{\\"auto_merge\\": true}}"',  # noqa: E231
+            f'Sync CSV 1,{snapshot1.pk},{IPFabricSyncStatusChoices.NEW},"{{\\"auto_merge\\": true}}"',  # noqa: E231
+            f'Sync CSV 2,{snapshot1.pk},{IPFabricSyncStatusChoices.COMPLETED},"{{\\"auto_merge\\": false}}"',  # noqa: E231
+            f'Sync CSV 3,{snapshot2.pk},{IPFabricSyncStatusChoices.NEW},"{{\\"auto_merge\\": true}}"',  # noqa: E231
         )
 
         cls.csv_update_data = (
             "id,name,status",
-            f"{cls.syncs[0].pk},Updated Sync 1,{DataSourceStatusChoices.COMPLETED}",  # noqa: E231
-            f"{cls.syncs[1].pk},Updated Sync 2,{DataSourceStatusChoices.FAILED}",  # noqa: E231
-            f"{cls.syncs[2].pk},Updated Sync 3,{DataSourceStatusChoices.COMPLETED}",  # noqa: E231
+            f"{cls.syncs[0].pk},Updated Sync 1,{IPFabricSyncStatusChoices.COMPLETED}",  # noqa: E231
+            f"{cls.syncs[1].pk},Updated Sync 2,{IPFabricSyncStatusChoices.FAILED}",  # noqa: E231
+            f"{cls.syncs[2].pk},Updated Sync 3,{IPFabricSyncStatusChoices.COMPLETED}",  # noqa: E231
         )
 
         cls.bulk_edit_data = {
@@ -1503,7 +1504,7 @@ class IPFabricIngestionTestCase(
             name="Test Source",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://ipfabric.example.com",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
         )
 
         snapshot = IPFabricSnapshot.objects.create(
@@ -1519,7 +1520,7 @@ class IPFabricIngestionTestCase(
         sync1 = IPFabricSync.objects.create(
             name="Test Sync 1",
             snapshot_data=snapshot,
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSyncStatusChoices.NEW,
             parameters={"batch_size": 100},
             last_synced=timezone.now(),
         )
@@ -1527,7 +1528,7 @@ class IPFabricIngestionTestCase(
         sync2 = IPFabricSync.objects.create(
             name="Test Sync 2",
             snapshot_data=snapshot,
-            status=DataSourceStatusChoices.COMPLETED,
+            status=IPFabricSyncStatusChoices.COMPLETED,
             parameters={"batch_size": 200},
             last_synced=timezone.now(),
         )
@@ -1535,7 +1536,7 @@ class IPFabricIngestionTestCase(
         sync3 = IPFabricSync.objects.create(
             name="Test Sync 3",
             snapshot_data=snapshot,
-            status=DataSourceStatusChoices.FAILED,
+            status=IPFabricSyncStatusChoices.FAILED,
             parameters={"batch_size": 50},
         )
 
@@ -1596,7 +1597,7 @@ class IPFabricIngestionTestCase(
 
         cls.form_data = {
             "snapshot": snapshot.pk,
-            "status": DataSourceStatusChoices.NEW,
+            "status": IPFabricSyncStatusChoices.NEW,
             "parameters": '{"batch_size": 150}',
         }
 
@@ -1914,7 +1915,7 @@ class IPFabricTableViewTestCase(PluginPathMixin, ModelTestCase):
             name="IP Fabric Source 1",
             type=IPFabricSourceTypeChoices.LOCAL,
             url="https://ipfabric1.example.com",
-            status=DataSourceStatusChoices.NEW,
+            status=IPFabricSourceStatusChoices.NEW,
             parameters={"auth": "token1", "verify": True, "timeout": 30},
             last_synced=timezone.now(),
         )

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/ipfabric_netbox/utilities/ipfutils.py

@@ -5,7 +5,6 @@ from typing import Callable
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
-from core.choices import DataSourceStatusChoices
 from core.exceptions import SyncError
 from dcim.models import Device
 from dcim.models import Interface
@@ -22,6 +21,7 @@ from netbox.config import get_config
 from netutils.utils import jinja2_convenience_function
 
 from ..choices import IPFabricSourceTypeChoices
+from ..choices import IPFabricSyncStatusChoices
 from ..exceptions import create_or_get_sync_issue
 from ..exceptions import IPAddressDuplicateError
 from ..exceptions import SearchError
@@ -185,7 +185,7 @@ class IPFabricSyncRunner(object):
                         obj=self.sync,
                     )
                 # Make sure the whole sync is failed when we encounter error
-                self.sync.status = DataSourceStatusChoices.FAILED
+                self.sync.status = IPFabricSyncStatusChoices.FAILED
                 return None
 
         return wrapper

{ipfabric_netbox-4.3.1 → ipfabric_netbox-4.3.1b2}/pyproject.toml

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