ipfabric_netbox 4.3.0b5__py3-none-any.whl → 4.3.0b7__py3-none-any.whl

ipfabric_netbox/__init__.py

@@ -6,7 +6,7 @@ class NetboxIPFabricConfig(PluginConfig):
     name = "ipfabric_netbox"
     verbose_name = "NetBox IP Fabric SoT Plugin"
     description = "Sync IP Fabric into NetBox"
-    version = "4.3.0b5"
+    version = "4.3.0b7"
     base_url = "ipfabric"
     min_version = "4.4.0"
 

ipfabric_netbox/api/serializers.py

@@ -176,6 +176,7 @@ class IPFabricSnapshotSerializer(NestedGroupModelSerializer):
 
 class IPFabricSyncSerializer(NestedGroupModelSerializer):
     snapshot_data = IPFabricSnapshotSerializer(nested=True)
+    parameters = serializers.JSONField()
 
     class Meta:
         model = IPFabricSync
@@ -244,3 +245,7 @@ class IPFabricIngestionIssueSerializer(NestedGroupModelSerializer):
             "message",
             "model",
         )
+
+
+class EmptySerializer(serializers.Serializer):
+    pass

ipfabric_netbox/api/views.py

@@ -1,10 +1,15 @@
+from core.api.serializers_.jobs import JobSerializer
+from django.core.exceptions import PermissionDenied
 from django.db import transaction
+from django.http import HttpResponseBadRequest
+from drf_spectacular.utils import extend_schema
 from netbox.api.viewsets import NetBoxModelViewSet
 from netbox.api.viewsets import NetBoxReadOnlyModelViewSet
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from utilities.query import count_related
 
+from .serializers import EmptySerializer
 from .serializers import IPFabricIngestionIssueSerializer
 from .serializers import IPFabricIngestionSerializer
 from .serializers import IPFabricRelationshipFieldSerializer
@@ -56,6 +61,27 @@ class IPFabricSyncViewSet(NetBoxModelViewSet):
     queryset = IPFabricSync.objects.all()
     serializer_class = IPFabricSyncSerializer
 
+    @extend_schema(
+        methods=["post"],
+        request=EmptySerializer(),
+        responses={201: JobSerializer()},
+    )
+    @action(detail=True, methods=["post"])
+    def sync(self, request, pk):
+        if not request.user.has_perm("ipfabric_netbox.sync_ipfabricsync"):
+            raise PermissionDenied(
+                "This user does not have permission to sync IPFabricSync."
+            )
+        sync = self.get_object()
+        if not sync.ready_for_sync:
+            return HttpResponseBadRequest(
+                f"Sync '{sync.name}' is not ready to be synced."
+            )
+        job = sync.enqueue_sync_job(user=request.user, adhoc=True)
+        return Response(
+            JobSerializer(job, context={"request": request}).data, status=201
+        )
+
 
 class IPFabricIngestionViewSet(NetBoxReadOnlyModelViewSet):
     queryset = IPFabricIngestion.objects.all()
@@ -122,3 +148,24 @@ class IPFabricSourceViewSet(NetBoxModelViewSet):
     )
     serializer_class = IPFabricSourceSerializer
     filterset_class = IPFabricSourceFilterSet
+
+    @extend_schema(
+        methods=["post"],
+        request=EmptySerializer(),
+        responses={201: JobSerializer()},
+    )
+    @action(detail=True, methods=["post"])
+    def sync(self, request, pk):
+        if not request.user.has_perm("ipfabric_netbox.sync_ipfabricsource"):
+            raise PermissionDenied(
+                "This user does not have permission to sync IPFabricSource."
+            )
+        source = self.get_object()
+        if not source.ready_for_sync:
+            return HttpResponseBadRequest(
+                f"Source '{source.name}' is not ready to be synced."
+            )
+        job = source.enqueue_sync_job(request=request)
+        return Response(
+            JobSerializer(job, context={"request": request}).data, status=201
+        )

ipfabric_netbox/choices.py

@@ -170,7 +170,7 @@ class IPFabricTransformMapSourceModelChoices(ChoiceSet):
     VRF = "vrf"
     PREFIX = "prefix"
     IPADDRESS = "ipaddress"
-    # PARTNUMBERS = "part_number"
+    PARTNUMBERS = "part_number"
 
     CHOICES = (
         (SITE, "Site", "cyan"),
@@ -182,7 +182,7 @@ class IPFabricTransformMapSourceModelChoices(ChoiceSet):
         (VRF, "VRF", "gray"),
         (PREFIX, "Prefix", "gray"),
         (IPADDRESS, "IP Address", "gray"),
-        # (PARTNUMBERS, "Part Number", "gray"),
+        (PARTNUMBERS, "Part Number", "gray"),
     )
 
 

ipfabric_netbox/forms.py

@@ -7,8 +7,10 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
+from netbox.forms import NetBoxModelBulkEditForm
 from netbox.forms import NetBoxModelFilterSetForm
 from netbox.forms import NetBoxModelForm
+from netbox.forms import NetBoxModelImportForm
 from netbox.forms.mixins import SavedFiltersMixin
 from utilities.datetime import local_now
 from utilities.forms import add_blank_choice
@@ -16,21 +18,28 @@ from utilities.forms import ConfirmationForm
 from utilities.forms import FilterForm
 from utilities.forms import get_field_value
 from utilities.forms.fields import CommentField
+from utilities.forms.fields import CSVChoiceField
+from utilities.forms.fields import CSVContentTypeField
+from utilities.forms.fields import CSVModelChoiceField
 from utilities.forms.fields import DynamicModelChoiceField
 from utilities.forms.fields import DynamicModelMultipleChoiceField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import APISelectMultiple
+from utilities.forms.widgets import BulkEditNullBooleanSelect
 from utilities.forms.widgets import DateTimePicker
 from utilities.forms.widgets import HTMXSelect
 from utilities.forms.widgets import NumberWithOptions
 
 from .choices import IPFabricSnapshotStatusModelChoices
+from .choices import IPFabricSourceTypeChoices
+from .choices import IPFabricTransformMapSourceModelChoices
 from .choices import required_transform_map_contenttypes
 from .choices import transform_field_source_columns
 from .models import IPFabricIngestion
 from .models import IPFabricRelationshipField
 from .models import IPFabricSnapshot
 from .models import IPFabricSource
+from .models import IPFabricSupportedSyncModels
 from .models import IPFabricSync
 from .models import IPFabricTransformField
 from .models import IPFabricTransformMap
@@ -269,6 +278,20 @@ class IPFabricTransformMapGroupForm(NetBoxModelForm):
         fields = ("name", "description")
 
 
+class IPFabricTransformMapGroupBulkEditForm(NetBoxModelBulkEditForm):
+    description = forms.CharField(
+        label=_("Description"), max_length=200, required=False
+    )
+    model = IPFabricTransformMapGroup
+    fields = ("description",)
+
+
+class IPFabricTransformMapGroupBulkImportForm(NetBoxModelImportForm):
+    class Meta:
+        model = IPFabricTransformMapGroup
+        fields = ("name", "description")
+
+
 class IPFabricTransformMapForm(NetBoxModelForm):
     class Meta:
         model = IPFabricTransformMap
@@ -278,6 +301,44 @@ class IPFabricTransformMapForm(NetBoxModelForm):
         }
 
 
+class IPFabricTransformMapBulkEditForm(NetBoxModelBulkEditForm):
+    group = forms.ModelChoiceField(
+        queryset=IPFabricTransformMapGroup.objects.all(),
+        required=False,
+        label="Target Group",
+    )
+    model = IPFabricTransformMap
+    fields = ("group",)
+    nullable_fields = ("group",)
+
+
+class IPFabricTransformMapBulkImportForm(NetBoxModelImportForm):
+    source_model = CSVChoiceField(
+        label=_("Source model"),
+        choices=IPFabricTransformMapSourceModelChoices,
+        help_text=_("Models available in IP Fabric to source data from"),
+    )
+    target_model = CSVContentTypeField(
+        queryset=ContentType.objects.filter(IPFabricSupportedSyncModels),
+        required=True,
+        label=_("Target model"),
+        help_text=_(
+            "Target model to apply this transform map to (use format 'app_label.model', e.g., 'dcim.device')"
+        ),
+    )
+    group = CSVModelChoiceField(
+        label=_("Group"),
+        queryset=IPFabricTransformMapGroup.objects.all(),
+        required=False,
+        to_field_name="name",
+        help_text=_("Name of assigned transform map group"),
+    )
+
+    class Meta:
+        model = IPFabricTransformMap
+        fields = ("name", "source_model", "target_model", "group")
+
+
 class IPFabricTransformMapCloneForm(forms.Form):
     name = forms.CharField(
         required=True, label="Name", help_text="Name for the cloned transform map."
@@ -439,6 +500,23 @@ class IPFabricSourceForm(NetBoxModelForm):
         return instance
 
 
+class IPFabricSourceBulkEditForm(NetBoxModelBulkEditForm):
+    comments = CommentField()
+    type = forms.ChoiceField(
+        choices=add_blank_choice(IPFabricSourceTypeChoices),
+        required=False,
+        initial="",
+    )
+
+    model = IPFabricSource
+    fields = (
+        "type",
+        "url",
+        "description",
+        "comments",
+    )
+
+
 class OrderedModelMultipleChoiceField(forms.ModelMultipleChoiceField):
     """A ModelMultipleChoiceField that preserves the order of the selected items."""
 
@@ -724,11 +802,66 @@ class IPFabricSyncForm(NetBoxModelForm):
                 ]
         self.instance.parameters = parameters
         self.instance.status = DataSourceStatusChoices.NEW
+        return super().save(*args, **kwargs)
+
 
-        object = super().save(*args, **kwargs)
-        if object.scheduled:
-            object.enqueue_sync_job()
-        return object
+class IPFabricSyncBulkEditForm(NetBoxModelBulkEditForm):
+    source = forms.ModelChoiceField(
+        queryset=IPFabricSource.objects.all(),
+        required=False,
+        label=_("IP Fabric Source"),
+    )
+
+    snapshot_data = DynamicModelChoiceField(
+        queryset=IPFabricSnapshot.objects.filter(status="loaded"),
+        required=False,
+        label=_("Snapshot"),
+        query_params={
+            "source_id": "$source",
+            "status": "loaded",
+        },
+    )
+
+    update_custom_fields = forms.NullBooleanField(
+        required=False,
+        label=_("Custom Fields Updating"),
+        help_text=_("Update object custom fields where applicable."),
+        widget=BulkEditNullBooleanSelect,
+    )
+
+    scheduled = forms.DateTimeField(
+        required=False,
+        widget=DateTimePicker(),
+        label=_("Schedule at"),
+        help_text=_("Schedule execution of sync to a set time"),
+    )
+
+    interval = forms.IntegerField(
+        required=False,
+        min_value=1,
+        label=_("Recurs every"),
+        widget=NumberWithOptions(options=JobIntervalChoices),
+        help_text=_("Interval at which this sync is re-run (in minutes)"),
+    )
+
+    auto_merge = forms.NullBooleanField(
+        required=False,
+        label=_("Auto Merge"),
+        help_text=_("Automatically merge staged changes into NetBox"),
+        widget=BulkEditNullBooleanSelect,
+    )
+
+    model = IPFabricSync
+    fields = (
+        "name",
+        "source",
+        "snapshot_data",
+        "auto_merge",
+        "update_custom_fields",
+        "tags",
+        "scheduled",
+        "interval",
+    )
 
 
 tableChoices = [

ipfabric_netbox/models.py

@@ -167,7 +167,7 @@ class IPFabricTransformMap(NetBoxModel):
             qs = qs.exclude(pk=self.pk)
         if qs.exists():
             err_msg = _(
-                "A transform map with this group and target model already exists."
+                f"A transform map with group '{self.group}' and target model '{self.target_model}' already exists."
             )
             raise ValidationError(
                 {
@@ -669,6 +669,11 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
     def get_status_color(self):
         return DataSourceStatusChoices.colors.get(self.status)
 
+    def save(self, *args, **kwargs):
+        super().save(*args, **kwargs)
+        if self.scheduled:
+            self.enqueue_sync_job()
+
     @property
     def ready_for_sync(self):
         if self.status not in (DataSourceStatusChoices.SYNCING,):

ipfabric_netbox/tables.py

@@ -45,6 +45,7 @@ DATA_BUTTON = """
 
 class IPFabricRelationshipFieldTable(NetBoxTable):
     actions = columns.ActionsColumn(actions=("edit", "delete"))
+    source_model = columns.ContentTypeColumn(verbose_name=_("Source Model"))
 
     class Meta(NetBoxTable.Meta):
         model = IPFabricRelationshipField
@@ -79,6 +80,7 @@ class IPFabricTransformMapGroupTable(NetBoxTable):
 class IPFabricTransformMapTable(NetBoxTable):
     name = tables.Column(linkify=True)
     group = tables.Column(linkify=True)
+    target_model = columns.ContentTypeColumn(verbose_name=_("Target Model"))
 
     class Meta(NetBoxTable.Meta):
         model = IPFabricTransformMap

ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync.html

@@ -58,7 +58,7 @@
           </tr>
           <tr>
             <th scope="row">Schedule</th>
-            <td><div>{{ object.scheduled }}</div></td>
+            <td><div>{% if scheduled_job %}<a href="{% url 'core:job' pk=scheduled_job.pk %}">{{ object.scheduled }}</a>{% else %} {{ object.scheduled | placeholder }} {% endif %}</div></td>
           </tr>
           <tr>
             <th scope="row">Interval</th>

ipfabric_netbox/tests/api/test_api.py

@@ -1,3 +1,4 @@
+from core.choices import DataSourceStatusChoices
 from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from rest_framework import status
@@ -15,7 +16,7 @@ from ipfabric_netbox.models import IPFabricTransformMap
 from ipfabric_netbox.models import IPFabricTransformMapGroup
 
 
-BASE = "/api/plugins/ipfabric/"
+BASE = "/api/plugins/ipfabric"
 
 
 class IPFabricTransformMapGroupTest(APIViewTestCases.APIViewTestCase):
@@ -36,10 +37,10 @@ class IPFabricTransformMapGroupTest(APIViewTestCases.APIViewTestCase):
     }
 
     def _get_list_url(self):
-        return f"{BASE}transform-map-group/"
+        return f"{BASE}/transform-map-group/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}transform-map-group/{instance.pk}/"
+        return f"{BASE}/transform-map-group/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -62,10 +63,10 @@ class IPFabricTransformMapTest(APIViewTestCases.APIViewTestCase):
     ]
 
     def _get_list_url(self):
-        return f"{BASE}transform-map/"
+        return f"{BASE}/transform-map/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}transform-map/{instance.pk}/"
+        return f"{BASE}/transform-map/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -132,10 +133,10 @@ class IPFabricTransformFieldTest(APIViewTestCases.APIViewTestCase):
     ]
 
     def _get_list_url(self):
-        return f"{BASE}transform-field/"
+        return f"{BASE}/transform-field/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}transform-field/{instance.pk}/"
+        return f"{BASE}/transform-field/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -235,10 +236,10 @@ class IPFabricRelationshipFieldTest(APIViewTestCases.APIViewTestCase):
     ]
 
     def _get_list_url(self):
-        return f"{BASE}relationship-field/"
+        return f"{BASE}/relationship-field/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}relationship-field/{instance.pk}/"
+        return f"{BASE}/relationship-field/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -340,10 +341,10 @@ class IPFabricSourceTest(APIViewTestCases.APIViewTestCase):
     graphql_base_name = "ipfabric_source"
 
     def _get_list_url(self):
-        return f"{BASE}source/"
+        return f"{BASE}/source/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}source/{instance.pk}/"
+        return f"{BASE}/source/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -387,6 +388,66 @@ class IPFabricSourceTest(APIViewTestCases.APIViewTestCase):
             },
         ]
 
+    def test_sync_action_success(self):
+        """Test successful sync action with proper permissions and ready source."""
+        self.add_permissions(
+            "ipfabric_netbox.add_ipfabricsource",
+            "ipfabric_netbox.sync_ipfabricsource",
+        )
+        # Get the first source from setUpTestData
+        source = IPFabricSource.objects.first()
+        # Set status to make ready_for_sync return True
+        source.status = DataSourceStatusChoices.COMPLETED
+        source.save()
+
+        with self.settings(CELERY_TASK_ALWAYS_EAGER=True):
+            # Create a mock job object to simulate enqueue_sync_job response
+            from unittest.mock import Mock, patch
+
+            mock_job = Mock()
+            mock_job.id = "test-job-123"
+            mock_job.status = "queued"
+
+            with patch.object(source, "enqueue_sync_job", return_value=mock_job):
+                url = f"{BASE}/source/{source.pk}/sync/"
+                response = self.client.post(url, **self.header)
+
+                self.assertHttpStatus(response, status.HTTP_201_CREATED)
+                self.assertIn("id", response.data)
+
+    def test_sync_action_permission_denied(self):
+        """Test sync action without proper permissions."""
+        # Note: Not adding sync_ipfabricsource permission
+        self.add_permissions(
+            "ipfabric_netbox.add_ipfabricsource",
+        )
+
+        source = IPFabricSource.objects.first()
+        url = f"{BASE}/source/{source.pk}/sync/"
+        response = self.client.post(url, **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
+
+    def test_sync_action_not_ready(self):
+        """Test sync action when source is not ready for sync."""
+        self.add_permissions(
+            "ipfabric_netbox.add_ipfabricsource",
+            "ipfabric_netbox.sync_ipfabricsource",
+        )
+
+        source = IPFabricSource.objects.first()
+        # Set status to make ready_for_sync return False
+        source.status = DataSourceStatusChoices.SYNCING
+        source.save()
+
+        url = f"{BASE}/source/{source.pk}/sync/"
+        response = self.client.post(url, **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertIn(
+            f"Source '{source.name}' is not ready to be synced.", str(response.content)
+        )
+
 
 class IPFabricSnapshotTest(
     APIViewTestCases.GetObjectViewTestCase,
@@ -407,10 +468,10 @@ class IPFabricSnapshotTest(
     ]
 
     def _get_list_url(self):
-        return f"{BASE}snapshot/"
+        return f"{BASE}/snapshot/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}snapshot/{instance.pk}/"
+        return f"{BASE}/snapshot/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -468,7 +529,7 @@ class IPFabricSnapshotTest(
     def test_sites_action_lists_all_and_filters(self):
         self.add_permissions("ipfabric_netbox.view_ipfabricsnapshot")
         # list all
-        url = f"{BASE}snapshot/{self.snapshots[0].pk}/sites/"
+        url = f"{BASE}/snapshot/{self.snapshots[0].pk}/sites/"
         resp = self.client.get(url, **self.header)
         self.assertHttpStatus(resp, status.HTTP_200_OK)
         body = resp.json()
@@ -477,7 +538,7 @@ class IPFabricSnapshotTest(
             labels = [i["name"] for i in body["results"]]
             self.assertEqual(labels, self.snapshots[0].data["sites"])
         # filter
-        url = f"{BASE}snapshot/{self.snapshots[0].pk}/sites/?q=site"
+        url = f"{BASE}/snapshot/{self.snapshots[0].pk}/sites/?q=site"
         resp = self.client.get(url, **self.header)
         self.assertHttpStatus(resp, status.HTTP_200_OK)
         body = resp.json()
@@ -496,7 +557,7 @@ class IPFabricSnapshotTest(
             IPFabricData.objects.filter(snapshot_data=self.snapshots[0]).count(), 0
         )
         # PATCH raw
-        url = f"{BASE}snapshot/{self.snapshots[0].pk}/raw/"
+        url = f"{BASE}/snapshot/{self.snapshots[0].pk}/raw/"
         payload = {
             "data": [
                 {"data": {"example": 1}, "type": "device"},
@@ -550,10 +611,10 @@ class IPFabricSyncTest(APIViewTestCases.APIViewTestCase):
     }
 
     def _get_list_url(self):
-        return f"{BASE}sync/"
+        return f"{BASE}/sync/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}sync/{instance.pk}/"
+        return f"{BASE}/sync/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -637,6 +698,72 @@ class IPFabricSyncTest(APIViewTestCases.APIViewTestCase):
         cls.create_data[1]["parameters"] = {"ipaddress": True, "prefix": True}
         cls.create_data[2]["parameters"] = {"device": True, "interface": True}
 
+    def test_sync_action_success(self):
+        """Test successful sync action with proper permissions and ready sync."""
+        self.add_permissions(
+            "ipfabric_netbox.add_ipfabricsync",
+            "ipfabric_netbox.sync_ipfabricsync",
+        )
+        # 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.save()
+
+        # Ensure the snapshot has data
+        sync.snapshot_data.source.type = (
+            "local"  # For local type, ready_for_sync checks are simpler
+        )
+        sync.snapshot_data.source.save()
+
+        with self.settings(CELERY_TASK_ALWAYS_EAGER=True):
+            # Create a mock job object to simulate enqueue_sync_job response
+            from unittest.mock import Mock, patch
+
+            mock_job = Mock()
+            mock_job.id = "test-sync-job-456"
+            mock_job.status = "queued"
+
+            with patch.object(sync, "enqueue_sync_job", return_value=mock_job):
+                url = f"{BASE}/sync/{sync.pk}/sync/"
+                response = self.client.post(url, **self.header)
+
+                self.assertHttpStatus(response, status.HTTP_201_CREATED)
+                self.assertIn("id", response.data)
+
+    def test_sync_action_permission_denied(self):
+        """Test sync action without proper permissions."""
+        # Note: Not adding sync_ipfabricsource permission
+        self.add_permissions(
+            "ipfabric_netbox.add_ipfabricsync",
+        )
+
+        sync = IPFabricSync.objects.first()
+        url = f"{BASE}/sync/{sync.pk}/sync/"
+        response = self.client.post(url, **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_403_FORBIDDEN)
+
+    def test_sync_action_not_ready(self):
+        """Test sync action when sync is not ready for sync."""
+        self.add_permissions(
+            "ipfabric_netbox.add_ipfabricsync",
+            "ipfabric_netbox.sync_ipfabricsync",
+        )
+
+        sync = IPFabricSync.objects.first()
+        # Set status to make ready_for_sync return False
+        sync.status = DataSourceStatusChoices.SYNCING
+        sync.save()
+
+        url = f"{BASE}/sync/{sync.pk}/sync/"
+        response = self.client.post(url, **self.header)
+
+        self.assertHttpStatus(response, status.HTTP_400_BAD_REQUEST)
+        self.assertIn(
+            f"Sync '{sync.name}' is not ready to be synced.", str(response.content)
+        )
+
 
 class IPFabricIngestionTest(
     APIViewTestCases.GetObjectViewTestCase,
@@ -653,10 +780,10 @@ class IPFabricIngestionTest(
     ]
 
     def _get_list_url(self):
-        return f"{BASE}ingestion/"
+        return f"{BASE}/ingestion/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}ingestion/{instance.pk}/"
+        return f"{BASE}/ingestion/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):
@@ -754,10 +881,10 @@ class IPFabricIngestionIssueTest(
     ]
 
     def _get_list_url(self):
-        return f"{BASE}ingestion-issues/"
+        return f"{BASE}/ingestion-issues/"
 
     def _get_detail_url(self, instance):
-        return f"{BASE}ingestion-issues/{instance.pk}/"
+        return f"{BASE}/ingestion-issues/{instance.pk}/"
 
     @classmethod
     def setUpTestData(cls):