ipfabric_netbox 4.2.0b4__py3-none-any.whl → 4.2.0b6__py3-none-any.whl

ipfabric_netbox/tests/test_models.py

@@ -8,6 +8,7 @@ from django.test import TestCase
 from django.utils import timezone
 
 from ipfabric_netbox.choices import IPFabricSnapshotStatusModelChoices
+from ipfabric_netbox.models import IPFabricIngestion
 from ipfabric_netbox.models import IPFabricSnapshot
 from ipfabric_netbox.models import IPFabricSource
 from ipfabric_netbox.models import IPFabricSync
@@ -121,6 +122,7 @@ class IPFabricTransformMapModelTestCase(TestCase):
             type="dcim",
             status="new",
             snapshot_data=snapshot,
+            update_custom_fields=True,
             parameters={
                 "vrf": False,
                 "site": True,
@@ -138,6 +140,8 @@ class IPFabricTransformMapModelTestCase(TestCase):
             },
         )
 
+        ingestion = IPFabricIngestion.objects.create(sync=sync)
+
         runner = IPFabricSyncRunner(
             settings={
                 "site": True,
@@ -152,7 +156,11 @@ class IPFabricTransformMapModelTestCase(TestCase):
                 "snapshot_id": "12dd8c61-129c-431a-b98b-4c9211571f89",
             },
             sync=sync,
+            ingestion=ingestion,
         )
+        # Need to monkeypatch since we are not in active Branch (different schema)
+        # Using default schema "default" here since we are in "test_netbox" DB
+        runner.get_db_connection_name = lambda: "default"
 
         site_data = {
             "siteName": "MPLS",
@@ -166,7 +174,9 @@ class IPFabricTransformMapModelTestCase(TestCase):
             "networksCount": 6,
         }
 
-        self.site = runner.get_model_or_update("dcim", "site", site_data)
+        self.site = runner.sync_item(
+            item=site_data, app_label="dcim", model="site", cf=sync.update_custom_fields
+        )
 
         device_data = {
             "id": "961251111",
@@ -204,14 +214,36 @@ class IPFabricTransformMapModelTestCase(TestCase):
             "slug": None,
         }
 
-        self.mf_obj = runner.get_model_or_update("dcim", "manufacturer", device_data)
-        self.dt_obj = runner.get_model_or_update("dcim", "devicetype", device_data)
-
-        self.platform = runner.get_model_or_update("dcim", "platform", device_data)
-
-        self.role = runner.get_model_or_update("dcim", "devicerole", device_data)
-
-        self.device_object = runner.get_model_or_update("dcim", "device", device_data)
+        self.mf_obj = runner.sync_item(
+            item=device_data,
+            app_label="dcim",
+            model="manufacturer",
+            cf=sync.update_custom_fields,
+        )
+        self.dt_obj = runner.sync_item(
+            item=device_data,
+            app_label="dcim",
+            model="devicetype",
+            cf=sync.update_custom_fields,
+        )
+        self.platform = runner.sync_item(
+            item=device_data,
+            app_label="dcim",
+            model="platform",
+            cf=sync.update_custom_fields,
+        )
+        self.role = runner.sync_item(
+            item=device_data,
+            app_label="dcim",
+            model="devicerole",
+            cf=sync.update_custom_fields,
+        )
+        self.device_object = runner.sync_item(
+            item=device_data,
+            app_label="dcim",
+            model="device",
+            cf=sync.update_custom_fields,
+        )
 
     def test_transform_map(self):
         site_transform_map = IPFabricTransformMap.objects.get(name="Site Transform Map")
@@ -383,5 +415,10 @@ class IPFabricTransformMapModelTestCase(TestCase):
         )
         transform_field.template = "{{ object.hostname }} - test"
         transform_field.save()
-        device_object = runner.get_model_or_update("dcim", "device", device_data)
+        device_object = runner.sync_item(
+            item=device_data,
+            app_label="dcim",
+            model="device",
+            cf=sync.update_custom_fields,
+        )
         self.assertEqual(device_object.name, "L21PE152 - test")

ipfabric_netbox/utilities/ipfutils.py

@@ -589,6 +589,35 @@ class IPFabricSyncRunner(object):
 
         return instance
 
+    def sync_item(
+        self,
+        item,
+        app_label: str,
+        model: str,
+        cf: bool = False,
+        ingestion: "IPFabricIngestion" = None,
+    ) -> ModelTypeVar | None:
+        """Sync a single item to NetBox."""
+        synced_object = self.sync_model(
+            app_label=app_label,
+            model=model,
+            data=item,
+            sync=self.settings.get(model),
+        )
+        if synced_object is None:
+            return None
+
+        if cf:
+            synced_object.snapshot()
+            synced_object.custom_field_data[
+                "ipfabric_source"
+            ] = self.sync.snapshot_data.source.pk
+            if ingestion:
+                synced_object.custom_field_data["ipfabric_ingestion"] = ingestion.pk
+            synced_object.save()
+
+        return synced_object
+
     def sync_items(
         self,
         items,
@@ -605,23 +634,7 @@ class IPFabricSyncRunner(object):
             return
 
         for item in items:
-            synced_object = self.sync_model(
-                app_label=app_label,
-                model=model,
-                data=item,
-                sync=self.settings.get(model),
-            )
-            if synced_object is None:
-                continue
-
-            if cf:
-                synced_object.snapshot()
-                synced_object.custom_field_data[
-                    "ipfabric_source"
-                ] = self.sync.snapshot_data.source.pk
-                if ingestion:
-                    synced_object.custom_field_data["ipfabric_ingestion"] = ingestion.pk
-                synced_object.save()
+            self.sync_item(item, app_label, model, cf, ingestion)
 
     @handle_errors
     def sync_devices(
@@ -684,11 +697,14 @@ class IPFabricSyncRunner(object):
 
             if device_object and self.settings.get("device"):
                 device_object.snapshot()
-                device_object.custom_field_data[
-                    "ipfabric_source"
-                ] = self.sync.snapshot_data.source.pk
-                if ingestion:
-                    device_object.custom_field_data["ipfabric_ingestion"] = ingestion.pk
+                if self.sync.update_custom_fields:
+                    device_object.custom_field_data[
+                        "ipfabric_source"
+                    ] = self.sync.snapshot_data.source.pk
+                    if ingestion:
+                        device_object.custom_field_data[
+                            "ipfabric_ingestion"
+                        ] = ingestion.pk
                 device_object.save()
 
                 self.logger.increment_statistics(model="device")
@@ -829,7 +845,11 @@ class IPFabricSyncRunner(object):
         ) = self.collect_data()
 
         self.sync_items(
-            app_label="dcim", model="site", items=sites, cf=True, ingestion=ingestion
+            app_label="dcim",
+            model="site",
+            items=sites,
+            cf=self.sync.update_custom_fields,
+            ingestion=ingestion,
         )
         self.sync_devices(
             ingestion,

{ipfabric_netbox-4.2.0b4.dist-info → ipfabric_netbox-4.2.0b6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ipfabric_netbox
-Version: 4.2.0b4
+Version: 4.2.0b6
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 License: MIT
 Keywords: netbox,ipfabric,plugin,sync

{ipfabric_netbox-4.2.0b4.dist-info → ipfabric_netbox-4.2.0b6.dist-info}/RECORD

@@ -1,14 +1,18 @@
-ipfabric_netbox/__init__.py,sha256=_cSQ-8y57chZeFDlT3xrIutYLZm-R1-PozQX6LHj_Ts,674
-ipfabric_netbox/api/__init__.py,sha256=DOkvDAI4BoNgdCiNxfseeExEHyOrK8weG-LvjPRyK8A,101
-ipfabric_netbox/api/nested_serializers.py,sha256=dG9YdK6wY6dDEvUWsjzsla-J_GnB5szzDjrcZhdWoEg,2124
-ipfabric_netbox/api/serializers.py,sha256=KihGDzoYTM9M9lrU0uUQPFl3ru7t59MuIebBdQe_DhY,5130
-ipfabric_netbox/api/urls.py,sha256=oZuDEJ6C7dpz8c9J3aJGi1CBSAij8Y4ClLa3Lu5AWk0,1236
-ipfabric_netbox/api/views.py,sha256=j-5-t22519p-4iJxx6PwUNaJumdweIHCdUkYKijiTyI,5041
+ipfabric_netbox/__init__.py,sha256=E5BKH5-wfz4YUPlNookiC6kVSmlN7ZR5mc7rN9YeHCY,674
+ipfabric_netbox/api/__init__.py,sha256=XRclTGWVR0ZhAAwgYul5Wm_loug5_hUjEumbLQEwKYM,47
+ipfabric_netbox/api/serializers.py,sha256=RV1tmkbRF_Est3x1w_bfk63qwgEQc97Bm4mk89tv2FU,6502
+ipfabric_netbox/api/urls.py,sha256=1fXXVTxNY5E64Nfz6b7zXD9bZI3FcefuxAWKMe0w_QU,1240
+ipfabric_netbox/api/views.py,sha256=mTwX9iUWzqLUIt2D80402VkPX39PyjFqs5HD3f79RCg,5137
 ipfabric_netbox/choices.py,sha256=tQ5RHwmuArQ7dCLcE3A_Bnw2ctGHgw67z--AawyyPPg,5261
 ipfabric_netbox/data/transform_map.json,sha256=4PsucgMHcLW3SPoKEptQCd0gA5tCF4hjrR4bGQFCWy8,21744
 ipfabric_netbox/exceptions.py,sha256=DT4dpbakvqoROtBR_F0LzvQCMNWpGhufFcUbZTx0OLY,2655
-ipfabric_netbox/filtersets.py,sha256=unVb64gR_m5oMRo1nP4yWrcogMRvfnzVQRmna6-9fKw,6121
-ipfabric_netbox/forms.py,sha256=07p_vngzsnHG0aev83JqBhb8fSBts0w-MTKu4BuoNLw,44494
+ipfabric_netbox/filtersets.py,sha256=FrlHkLWf_mNMTaT_Zm2wl1wYkHXMX7hXxMLYAkC6_Gg,7922
+ipfabric_netbox/forms.py,sha256=PLAoSJGqwHWPVO5F8Sf2iJv-L5xjYzv-wseiasaxdlg,44767
+ipfabric_netbox/graphql/__init__.py,sha256=-a5w_VY7pc-RVt8MvThkTzeAqCC3xCan4Ue6iMefmjI,754
+ipfabric_netbox/graphql/enums.py,sha256=4jtB2gKsmPXu9is5jd38hUbfrt1V5Wm1Ff-2JCDI3EU,1518
+ipfabric_netbox/graphql/filters.py,sha256=NGIxHIQhmya-aEsgzQgkRjwMxV1jaGOPxLzRzlrJPPg,12587
+ipfabric_netbox/graphql/schema.py,sha256=5UVHA1hHRvho5eLuuS-HLXTVTbxpUUx68ovG03gumGE,3209
+ipfabric_netbox/graphql/types.py,sha256=La_UjdZg3SLGwpusQRFas-7oIQyxHgq1cluSVp7mn2g,5731
 ipfabric_netbox/jobs.py,sha256=KrTUeCuFUIU7vKCUS3RiBYCBG7g7GzhGagM_qFMGQJ4,3089
 ipfabric_netbox/migrations/0001_initial.py,sha256=VphxkWL6QzWq2tcrdXlog718xQtiEGizKwS830z_fOs,13824
 ipfabric_netbox/migrations/0001_initial_squashed_0013_switch_to_branching_plugin.py,sha256=xDj5QJfTmG7ZgUSTRiJRndjSOv25dORtzzs-LySbr-c,20874
@@ -26,8 +30,10 @@ ipfabric_netbox/migrations/0012_remove_status_field.py,sha256=UZTY2BOBuV4Y_7zuPR
 ipfabric_netbox/migrations/0013_switch_to_branching_plugin.py,sha256=JfdTNerjuFyjW3pDm4vueOp2lrDh2xt6lL1Et5i4crg,10754
 ipfabric_netbox/migrations/0014_ipfabrictransformmapgroup_ipfabrictransformmap_group.py,sha256=RCfgKyqQhTkfSPhf0IukI3fjeAEBUs5pKWIpsLxgzp0,2272
 ipfabric_netbox/migrations/0015_ipfabricingestionissue.py,sha256=AjAkyboa4BSXsN53BqzO1k_U6QHu4rlA2IhzhubocJw,1732
+ipfabric_netbox/migrations/0016_tags_and_changelog_for_snapshots.py,sha256=XqftTQ4GFnoCoGSHPa2WL_bjSVCGxdP2MFXCUa6LN1k,929
+ipfabric_netbox/migrations/0017_ipfabricsync_update_custom_fields.py,sha256=IVbAL2WdigYT40sXN0A8K3HweJ_O4QqyzjB06TbkG5E,447
 ipfabric_netbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/models.py,sha256=CXRMO1nKlcVz_R9WbTjQ0FWsXe1C6ZHIEoRhavI8Jyo,36067
+ipfabric_netbox/models.py,sha256=U9_ooh8juhtXwwcj0ay_6KZ-FlBt2SYrR7YCScAYa9k,36168
 ipfabric_netbox/navigation.py,sha256=2dEJ_wKHb52Tl0FOV1TH3JbxRe8YZ56ewrTsBFGKpCg,2210
 ipfabric_netbox/signals.py,sha256=cGa5PVD2i24pGXiVNfbu6ruIDqPVdwKQHTSWe9Ura84,1838
 ipfabric_netbox/tables.py,sha256=pHKv6Bosjnc-7aApak3nLhzxqBiA30olPdaMO8F1PQg,8262
@@ -63,14 +69,16 @@ ipfabric_netbox/templates/static/ipfabric_netbox/css/rack.css,sha256=z1H-RmmsqF2
 ipfabric_netbox/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ipfabric_netbox/templatetags/ipfabric_netbox_helpers.py,sha256=STw4pAd2qG7hgf-O6UNTwsO5VqEa_gxf5wLv50BWL4Q,417
 ipfabric_netbox/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/tests/test_models.py,sha256=4SGMX0LZ_fThkc-F1AMZIQbpmJvQNVFnS6QYZpIZkNA,14998
+ipfabric_netbox/tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ipfabric_netbox/tests/api/test_api.py,sha256=DVMnhtleWJdpmVHafqCh9fgN6PZhWMEBXBL_rfm3ly8,30615
+ipfabric_netbox/tests/test_models.py,sha256=rPwdVs127vU78yOcmlC44f7dZw12oLVzTSJf1nH0jus,16068
 ipfabric_netbox/urls.py,sha256=ok66LP09rYi01qJmwdGGlBzV9wrGWVwVAIngPcreJxg,5449
 ipfabric_netbox/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/utilities/ipfutils.py,sha256=4W6fYuguvVdhNlWok-dTUhI0M4CK7hrBiMcLAtPuKIQ,31411
+ipfabric_netbox/utilities/ipfutils.py,sha256=wFmL5oriuF-is1ZlrIcLmoeYUY5ih-CA9weRQrx5AiA,31885
 ipfabric_netbox/utilities/logging.py,sha256=GYknjocMN6LQ2873_az3y0RKm29TCXaWviUIIneH-x0,3445
 ipfabric_netbox/utilities/nbutils.py,sha256=kFBEiJOGvr_49hJWCS2duXojx2-A9kVk0Xp_vj0ohfs,2641
 ipfabric_netbox/utilities/transform_map.py,sha256=QotbGc2TksINJrb62STgAigpC5Nsgi5umYHu_0rZd8k,2204
 ipfabric_netbox/views.py,sha256=nGWO-PlTyKviBzGEdmE3C_1I-xFjZMldqOWGx12wdbg,36855
-ipfabric_netbox-4.2.0b4.dist-info/METADATA,sha256=WLyQPiEquLOnO2yUlbtPIcAxAMtTMZjyfAdwEBtRvdo,4638
-ipfabric_netbox-4.2.0b4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-ipfabric_netbox-4.2.0b4.dist-info/RECORD,,
+ipfabric_netbox-4.2.0b6.dist-info/METADATA,sha256=UKZI463uPse64h8bR0yCQQvkYUbqTuWwZlDMtG5fpFY,4638
+ipfabric_netbox-4.2.0b6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+ipfabric_netbox-4.2.0b6.dist-info/RECORD,,

ipfabric_netbox/api/nested_serializers.py

@@ -1,78 +0,0 @@
-from drf_spectacular.types import OpenApiTypes
-from drf_spectacular.utils import extend_schema_field
-from netbox.api.fields import ContentTypeField
-from netbox.api.serializers import NetBoxModelSerializer
-from netbox.api.serializers import WritableNestedSerializer
-from rest_framework import serializers
-
-from ipfabric_netbox.models import IPFabricSnapshot
-from ipfabric_netbox.models import IPFabricSource
-from ipfabric_netbox.models import IPFabricSync
-from ipfabric_netbox.models import IPFabricTransformMap
-
-
-__all__ = (
-    "NestedIPFabricSourceSerializer",
-    "NestedIPFabricSnapshotSerializer",
-    "NestedIPFabricTransformMapSerializer",
-    "NestedIPFabricSyncSerializer",
-)
-
-
-class NestedIPFabricSourceSerializer(WritableNestedSerializer):
-    url = serializers.URLField()
-
-    class Meta:
-        model = IPFabricSource
-        fields = ["id", "url", "display", "name", "type"]
-
-
-class NestedIPFabricSnapshotSerializer(NetBoxModelSerializer):
-    source = NestedIPFabricSourceSerializer(read_only=True)
-    display = serializers.SerializerMethodField(read_only=True)
-
-    class Meta:
-        model = IPFabricSnapshot
-        fields = [
-            "id",
-            "name",
-            "source",
-            "snapshot_id",
-            "status",
-            "date",
-            "display",
-            "sites",
-        ]
-
-    @extend_schema_field(OpenApiTypes.STR)
-    def get_display(self, obj):
-        return f"{obj.name} ({obj.snapshot_id})"
-
-
-class NestedIPFabricSyncSerializer(NetBoxModelSerializer):
-    snapshot_data = NestedIPFabricSnapshotSerializer(read_only=True)
-
-    class Meta:
-        model = IPFabricSync
-        fields = [
-            "id",
-            "name",
-            "display",
-            "snapshot_data",
-            "type",
-            "status",
-            "parameters",
-            "last_synced",
-        ]
-
-
-class NestedIPFabricTransformMapSerializer(NetBoxModelSerializer):
-    target_model = ContentTypeField(read_only=True)
-
-    class Meta:
-        model = IPFabricTransformMap
-        fields = [
-            "id",
-            "source_model",
-            "target_model",
-        ]