ipfabric_netbox 3.1.2__py3-none-any.whl → 3.2.0__py3-none-any.whl

ipfabric_netbox/utilities/ipfutils.py

@@ -212,6 +212,18 @@ class IPFabricSyncRunner(object):
                     device_object.primary_ip4 = ip_address_obj
                     device_object.save()
 
+        if self.settings.get("macaddress") and device_interface.get("mac"):
+            # Need to create MAC Address object before we can assign it to Interface
+            macaddress_data = {
+                "mac": device_interface.get("mac"),
+                "id": interface_object.id,
+            }
+            macaddress_object = self.get_model_or_update(
+                "dcim", "macaddress", macaddress_data, uuid=device_uuid
+            )
+            interface_object.primary_mac_address = macaddress_object
+            interface_object.save()
+
         return True
 
     def collect_data(self):

ipfabric_netbox/utilities/transform_map.py

@@ -1,35 +1,57 @@
-from django.contrib.contenttypes.models import ContentType
+import importlib.resources
+import json
 
-from ipfabric_netbox.models import IPFabricRelationshipField
-from ipfabric_netbox.models import IPFabricTransformField
-from ipfabric_netbox.models import IPFabricTransformMap
+from django.apps import apps
 
+# These functions are used in the migration file to prepare the transform maps
+# Because of this we have to use historical models
+# see https://docs.djangoproject.com/en/5.1/topics/migrations/#historical-models
 
-def BuildField(data):
+
+def build_fields(data):
+    ContentType = apps.get_model("contenttypes", "ContentType")
     if "target_model" in data:
-        ct = ContentType.objects.get(
-            app_label=data["target_model"]["app_label"],
-            model=data["target_model"]["model"],
+        ct = ContentType.objects.get_for_model(
+            apps.get_model(
+                data["target_model"]["app_label"],
+                data["target_model"]["model"],
+            )
         )
         data["target_model"] = ct
     elif "source_model" in data:
-        ct = ContentType.objects.get(
-            app_label=data["source_model"]["app_label"],
-            model=data["source_model"]["model"],
+        ct = ContentType.objects.get_for_model(
+            apps.get_model(
+                data["source_model"]["app_label"],
+                data["source_model"]["model"],
+            )
         )
         data["source_model"] = ct
     return data
 
 
-def BuildTransformMaps(data):
+def build_transform_maps(data):
+    IPFabricTransformMap = apps.get_model("ipfabric_netbox", "IPFabricTransformMap")
+    IPFabricTransformField = apps.get_model("ipfabric_netbox", "IPFabricTransformField")
+    IPFabricRelationshipField = apps.get_model(
+        "ipfabric_netbox", "IPFabricRelationshipField"
+    )
     for tm in data:
-        field_data = BuildField(tm["data"])
+        field_data = build_fields(tm["data"])
         tm_obj = IPFabricTransformMap.objects.create(**field_data)
         for fm in tm["field_maps"]:
-            field_data = BuildField(fm)
+            field_data = build_fields(fm)
             IPFabricTransformField.objects.create(transform_map=tm_obj, **field_data)
         for rm in tm["relationship_maps"]:
-            relationship_data = BuildField(rm)
+            relationship_data = build_fields(rm)
             IPFabricRelationshipField.objects.create(
                 transform_map=tm_obj, **relationship_data
             )
+
+
+def get_transform_map() -> dict:
+    for data_file in importlib.resources.files("ipfabric_netbox.data").iterdir():
+        if data_file.name != "transform_map.json":
+            continue
+        with open(data_file, "rb") as data_file:
+            return json.load(data_file)
+    raise FileNotFoundError("'transform_map.json' not found in installed package")

ipfabric_netbox/views.py

@@ -1,4 +1,3 @@
-import requests
 from dcim.models import Device
 from dcim.models import Site
 from django.contrib import messages
@@ -60,7 +59,8 @@ from .tables import IPFabricTransformFieldTable
 from .tables import IPFabricTransformMapTable
 from .tables import StagedChangesTable
 from .utilities.ipfutils import IPFabric
-from .utilities.transform_map import BuildTransformMaps
+from .utilities.transform_map import build_transform_maps
+from .utilities.transform_map import get_transform_map
 
 
 # Transform Map Relationship Field
@@ -140,13 +140,7 @@ class IPFabricTransformMapRestoreView(generic.ObjectListView):
 
     def post(self, request):
         IPFabricTransformMap.objects.all().delete()
-        try:
-            data = requests.get(
-                "https://gitlab.com/ip-fabric/integrations/ipfabric-netbox/-/raw/main/scripts/transform_map.json"
-            ).json()
-        except Exception as e:
-            messages.error(request, e)
-        BuildTransformMaps(data=data)
+        build_transform_maps(data=get_transform_map())
         return redirect("plugins:ipfabric_netbox:ipfabrictransformmap_list")
 
 

{ipfabric_netbox-3.1.2.dist-info → ipfabric_netbox-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ipfabric_netbox
-Version: 3.1.2
+Version: 3.2.0
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 Home-page: https://gitlab.com/ip-fabric/integrations/ipfabric-netbox-sync
 License: MIT
@@ -15,7 +15,19 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: ipfabric (>=6.6.4)
+Provides-Extra: ipfabric-6-10
+Provides-Extra: ipfabric-6-6
+Provides-Extra: ipfabric-6-7
+Provides-Extra: ipfabric-6-8
+Provides-Extra: ipfabric-6-9
+Provides-Extra: ipfabric-7-0
+Requires-Dist: ipfabric (>=6.10.0,<6.11.0) ; extra != "ipfabric_6_6" and extra != "ipfabric_6_7" and extra != "ipfabric_6_8" and extra != "ipfabric_6_9" and extra == "ipfabric_6_10" and extra != "ipfabric_7_0"
+Requires-Dist: ipfabric (>=6.6.0,<6.7.0) ; extra == "ipfabric_6_6" and extra != "ipfabric_6_7" and extra != "ipfabric_6_8" and extra != "ipfabric_6_9" and extra != "ipfabric_6_10" and extra != "ipfabric_7_0"
+Requires-Dist: ipfabric (>=6.6.4) ; extra != "ipfabric_6_6" and extra != "ipfabric_6_7" and extra != "ipfabric_6_8" and extra != "ipfabric_6_9" and extra != "ipfabric_6_10" and extra != "ipfabric_7_0"
+Requires-Dist: ipfabric (>=6.7.0,<6.8.0) ; extra != "ipfabric_6_6" and extra == "ipfabric_6_7" and extra != "ipfabric_6_8" and extra != "ipfabric_6_9" and extra != "ipfabric_6_10" and extra != "ipfabric_7_0"
+Requires-Dist: ipfabric (>=6.8.0,<6.9.0) ; extra != "ipfabric_6_6" and extra != "ipfabric_6_7" and extra == "ipfabric_6_8" and extra != "ipfabric_6_9" and extra != "ipfabric_6_10" and extra != "ipfabric_7_0"
+Requires-Dist: ipfabric (>=6.9.0,<6.10.0) ; extra != "ipfabric_6_6" and extra != "ipfabric_6_7" and extra != "ipfabric_6_8" and extra == "ipfabric_6_9" and extra != "ipfabric_6_10" and extra != "ipfabric_7_0"
+Requires-Dist: ipfabric (>=7.0.0,<7.1.0) ; extra != "ipfabric_6_6" and extra != "ipfabric_6_7" and extra != "ipfabric_6_8" and extra != "ipfabric_6_9" and extra != "ipfabric_6_10" and extra == "ipfabric_7_0"
 Requires-Dist: netutils
 Project-URL: Bug Tracker, https://gitlab.com/ip-fabric/integrations/ipfabric-netbox-sync/-/issues
 Project-URL: Repository, https://gitlab.com/ip-fabric/integrations/ipfabric-netbox-sync
@@ -51,9 +63,10 @@ The plugin uses IP Fabric collect network data utilizing the [IP Fabric Python S
 - Diff Visualization
 
 ## NetBox Compatibility
+These are the minimum NetBox versions for corresponding plugin version. Following minor versions should work too, but they are not tested.
 
 | Netbox Version | Plugin Version |
-| -------------- | -------------- |
+|----------------|----------------|
 | 3.4            | <=1.0.11       |
 | 3.5            | <=1.0.11       |
 | 3.6            | <=1.0.11       |
@@ -62,6 +75,7 @@ The plugin uses IP Fabric collect network data utilizing the [IP Fabric Python S
 | 4.0.1          | >=3.0.1        |
 | 4.1.0          | >=3.1.0        |
 | 4.1.5          | >=3.1.1        |
+| 4.2.0          | >=3.2.0        |
 
 ## Screenshots
 

{ipfabric_netbox-3.1.2.dist-info → ipfabric_netbox-3.2.0.dist-info}/RECORD

@@ -1,12 +1,13 @@
-ipfabric_netbox/__init__.py,sha256=m4Z0tjRjIxp2-rpnhOKtfKrGz-2a1oqLIYAlkdc8hk4,1492
+ipfabric_netbox/__init__.py,sha256=48sc1aEKyahTfjM_KcYMhHLxFuY_VW66OX3BohC5Tgk,313
 ipfabric_netbox/api/__init__.py,sha256=DOkvDAI4BoNgdCiNxfseeExEHyOrK8weG-LvjPRyK8A,101
 ipfabric_netbox/api/nested_serializers.py,sha256=JwIlFpOHeiMB7F-sC0gx1f6qdNevS8NsXTUEHlVZeRs,2719
 ipfabric_netbox/api/serializers.py,sha256=bTR3AJ81Q8HZI3iWLPc1tndGqD0erAbAD9hKLI4DTYY,4341
 ipfabric_netbox/api/urls.py,sha256=BSQ5nqYSx0r-wnbdKGDAb5XH7BBy_0ngV_Q7vDgjMIE,948
 ipfabric_netbox/api/views.py,sha256=X02GwpDlq25_3KlxYTWyd4PnT1RCtfp7uN0zZ5Etjp8,4429
 ipfabric_netbox/choices.py,sha256=GqcnLqsFR4gnhWEwkvQbPxXYNi5SwNoIQz-J15LTMc4,4848
+ipfabric_netbox/data/transform_map.json,sha256=ghZjQhnYEF-udOGwGUA830MKv8cNMNZGp8HJ1-uBBYs,20337
 ipfabric_netbox/filtersets.py,sha256=P_2VCL892pLplPnsxul27bgGgMpHaZtgn9Vg0UsWErE,3877
-ipfabric_netbox/forms.py,sha256=Y-ISAtlQPjP5qYozAMZxsUCmGPmq8GhV5_ppf5Tu464,43096
+ipfabric_netbox/forms.py,sha256=to04ZwPX2tewEp43zzp2P57i1m5-fUizLvuk6f3hbHk,42938
 ipfabric_netbox/jobs.py,sha256=jfWWNA42KMyzc-EGit6LJIe-SNob4-4IQRfadQF_GRE,2862
 ipfabric_netbox/migrations/0001_initial.py,sha256=nka6_HJK4Q8BlmQblDntuNzVKLR484SsC6wGSbOQgI4,13813
 ipfabric_netbox/migrations/0002_ipfabricsnapshot_status.py,sha256=xQpouHjOutyj6riN2B592njzSvz_icpkUbo5W7nWLYw,431
@@ -14,11 +15,13 @@ ipfabric_netbox/migrations/0003_ipfabricsource_type_and_more.py,sha256=XUM_ZecLl
 ipfabric_netbox/migrations/0004_ipfabricsync_auto_merge.py,sha256=hlwHGKD7q3w1a1N04yIS39f6nsL_9TJCWEJlvwCdpPA,435
 ipfabric_netbox/migrations/0005_alter_ipfabricrelationshipfield_source_model_and_more.py,sha256=egiUtdu1zHElbcIIN9sUzS93dSCltVXFv0DG9IUp1HY,2802
 ipfabric_netbox/migrations/0006_alter_ipfabrictransformmap_target_model.py,sha256=6MmI-Uz9hmzj3nKqhUKdShjLnE8KNa4qthg0NVHjANc,2163
+ipfabric_netbox/migrations/0007_prepare_custom_fields.py,sha256=ohnNcbQn4CMkbh3XHtvmkctThUdYhN-ywN5xerOSmdE,3898
+ipfabric_netbox/migrations/0008_prepare_transform_maps.py,sha256=Jwr-P9MQQv9N-Yx_19V4q6lmZpeIkjoUW1gh4s-lDnI,1541
+ipfabric_netbox/migrations/0009_transformmap_changes_for_netbox_v4_2.py,sha256=P_ZojUapQ8x2XIe3ovZO0xUnRCXyl7WYzKeDvhQVctI,9341
 ipfabric_netbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/models.py,sha256=Io0JD9dqAS4mkkj93yJyn9pD1nMkhmJ5IVKkLpHjDxo,30562
+ipfabric_netbox/models.py,sha256=e32q25kxi4ICX2ITFp9lPUfRwXw1NMui1OW_HJCUBzE,30819
 ipfabric_netbox/navigation.py,sha256=2kZs341nAB7G76qnZT6mFxsYo68IPy-bmPMkSLA-Nk0,1735
-ipfabric_netbox/signals.py,sha256=GM2D_8zHfe3MzyNoe6v4Tq5ibPrbqhfEKYPhxtyrYwc,2588
-ipfabric_netbox/tables.py,sha256=w4YaFeYoAm4Pq5nKmD0MUbH7Mv-q86waQHyY-eL-hd8,6613
+ipfabric_netbox/tables.py,sha256=4cZb-_whp132B3EJglRBEkXwkYLUpWzIybkdHfAE9tM,6819
 ipfabric_netbox/template_content.py,sha256=bP2nUf5MM-GUbtQxJ8QoYVNXhrDCrkb8wZnbeqa07EA,315
 ipfabric_netbox/templates/ipfabric_netbox/inc/diff.html,sha256=xOiIrvRIBtqDD65u6xcLo2xdwDKNpAylDmzznaJRGCw,3281
 ipfabric_netbox/templates/ipfabric_netbox/inc/json.html,sha256=qPHUdaHyKM9Y7FqBEnYwcNoyp5GMFaexJFXMRf4AqZQ,569
@@ -46,14 +49,14 @@ ipfabric_netbox/templates/ipfabric_netbox/partials/sync_last_branch.html,sha256=
 ipfabric_netbox/templates/ipfabric_netbox/sync_list.html,sha256=3wfwPUIAfzzIP_pu3gL0L3wH65UX5XFLBW5BW-CZJDc,5587
 ipfabric_netbox/templates/static/ipfabric_netbox/css/rack.css,sha256=z1H-RmmsqF2pGdhn5J64TMFiccy62xZUHHlCRd8fJrQ,118
 ipfabric_netbox/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/tests/test_models.py,sha256=r1TTKuzQYaBbDjw0PzSKFe7V3IRFxiYRsqToEP52XNg,45898
+ipfabric_netbox/tests/test_models.py,sha256=jnu2abpuKtxUNNAJJjJxMUdRQ8dK8dTKor3j_IcMx1Q,15513
 ipfabric_netbox/urls.py,sha256=V98K_JxHaJAgDbo-DiMj-5FQIIposLMLJCPw3dtREWU,4430
 ipfabric_netbox/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/utilities/ipfutils.py,sha256=iupSEk5xNJOhK_-bJZNqZRc2damrcVSpM_i5zn7npJQ,21987
+ipfabric_netbox/utilities/ipfutils.py,sha256=c4yRzZds1c9TsQ8t7Hpsw0kkIh6bzDec2lStSWzjyk4,22539
 ipfabric_netbox/utilities/logging.py,sha256=2OpWlqZ6Va2LEVXmIjiCvdZ8Ncx6brCvm_PzhjbMoTU,3221
 ipfabric_netbox/utilities/nbutils.py,sha256=W-aorJjeIBYB80MAHmd1gpmhaZKH7R8lwIuCCbWWjh8,3117
-ipfabric_netbox/utilities/transform_map.py,sha256=I24MI0kmnPm6PeSn-Bmzf5hJQNpJRRTtPLC0R7_s62A,1256
-ipfabric_netbox/views.py,sha256=yS8BqrVOOiODuH72JMF5lK1SVAkJ7sfSLvzVGIXy8Bk,28478
-ipfabric_netbox-3.1.2.dist-info/METADATA,sha256=vsrIfygCVpXTTKkBFRNZcFOeHtw2Gw51_CI3se99xPw,3573
-ipfabric_netbox-3.1.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-ipfabric_netbox-3.1.2.dist-info/RECORD,,
+ipfabric_netbox/utilities/transform_map.py,sha256=g0elxtwSRJvu0ZRZHyMf4Y9R4wiQ-h2o9Er8gxUQ-Bs,2108
+ipfabric_netbox/views.py,sha256=K2iKh6i8kv88c7gVh6wW7d8Adcso24ZE8m6gVUiNZSw,28285
+ipfabric_netbox-3.2.0.dist-info/METADATA,sha256=S5q0v54rMCBkIkEZKDaZkK1t6UDZCup5lBdHnMErAtA,5341
+ipfabric_netbox-3.2.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+ipfabric_netbox-3.2.0.dist-info/RECORD,,

ipfabric_netbox/signals.py

@@ -1,68 +0,0 @@
-from typing import Optional
-
-from core.models import ObjectType
-from dcim.models import Device
-from dcim.models import Site
-from extras.choices import CustomFieldTypeChoices
-from extras.choices import CustomFieldUIEditableChoices
-from extras.choices import CustomFieldUIVisibleChoices
-from extras.choices import CustomLinkButtonClassChoices
-from extras.models import CustomField
-from extras.models import CustomLink
-
-from .models import IPFabricBranch
-from .models import IPFabricSource
-
-
-def create_custom_field(
-    field_name: str,
-    label: str,
-    models: list,
-    object_type=None,
-    cf_type: Optional[str] = "type_text",
-    ui_visibility: Optional[str] = "VISIBILITY_READ_ONLY",
-):
-    defaults = {
-        "label": label,
-        "related_object_type": ObjectType.objects.get_for_model(object_type)
-        if object_type
-        else None,
-        "ui_visible": getattr(CustomFieldUIVisibleChoices, "ALWAYS"),
-        "ui_editable": getattr(CustomFieldUIEditableChoices, "NO"),
-    }
-
-    custom_field, _ = CustomField.objects.update_or_create(
-        type=getattr(CustomFieldTypeChoices, cf_type.upper()),
-        name=field_name,
-        defaults=defaults,
-    )
-
-    for model in models:
-        custom_field.object_types.add(ObjectType.objects.get_for_model(model))
-
-
-def ipfabric_netbox_init():
-    create_custom_field(
-        "ipfabric_source",
-        "IP Fabric Source",
-        [Device, Site],
-        cf_type="type_object",
-        object_type=IPFabricSource,
-    )
-    create_custom_field(
-        "ipfabric_branch",
-        "IP Fabric Last Sync",
-        [Device, Site],
-        cf_type="type_object",
-        object_type=IPFabricBranch,
-    )
-    cl, _ = CustomLink.objects.update_or_create(
-        defaults={
-            "link_text": "{% if object.custom_field_data.ipfabric_source is defined %}{% set SOURCE_ID = object.custom_field_data.ipfabric_source %}{% if SOURCE_ID %}IP Fabric{% endif %}{% endif %}",
-            "link_url": '{% if object.custom_field_data.ipfabric_source is defined %}{% set SOURCE_ID = object.custom_field_data.ipfabric_source %}{% if SOURCE_ID %}{% set BASE_URL = object.custom_fields.filter(related_object_type__model="ipfabricsource").first().related_object_type.model_class().objects.get(pk=SOURCE_ID).url %}{{ BASE_URL }}/inventory/devices?options={"filters":{"sn": ["like","{{ object.serial }}"]}}{% endif %}{%endif%}',
-            "new_window": True,
-            "button_class": CustomLinkButtonClassChoices.BLUE,
-        },
-        name="ipfabric",
-    )
-    cl.object_types.add(ObjectType.objects.get_for_model(Device))