ipfabric_netbox 3.2.2__py3-none-any.whl → 3.2.4__py3-none-any.whl

ipfabric_netbox/__init__.py

@@ -5,7 +5,7 @@ class NetboxIPFabricConfig(PluginConfig):
     name = "ipfabric_netbox"
     verbose_name = "NetBox IP Fabric SoT Plugin"
     description = "Sync IP Fabric into NetBox"
-    version = "3.2.2"
+    version = "3.2.4"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

ipfabric_netbox/migrations/0010_remove_uuid_from_get_or_create.py

@@ -10,7 +10,7 @@ if TYPE_CHECKING:
 
 
 items_to_change = {
-    ("ip_address", "ipam", "ipaddress"): {"fields": [], "relationships": ["vrf"]},
+    ("ipaddress", "ipam", "ipaddress"): {"fields": [], "relationships": ["vrf"]},
     ("device", "dcim", "platform"): {"fields": [], "relationships": ["manufacturer"]},
     ("device", "dcim", "device"): {
         "fields": [],
@@ -43,37 +43,46 @@ def add_templates(apps: "apps", schema_editor: "BaseDatabaseSchemaEditor"):
         if transform_map_id not in items_to_change:
             continue
         source_model, app_label, target_model = transform_map_id
-        transform_map = apps.get_model(
+        transform_map, _ = apps.get_model(
             "ipfabric_netbox", "IPFabricTransformMap"
-        ).objects.get(
+        ).objects.get_or_create(
             source_model=source_model,
             target_model=apps.get_model("contenttypes", "ContentType").objects.get(
                 app_label=app_label,
                 model=target_model,
             ),
+            defaults={"name": item["data"]["name"]},
         )
 
         change_data = items_to_change[transform_map_id]
 
         for field_map in item["field_maps"]:
-            if field_map["target_field"] not in change_data["fields"]:
+            f_target_field = field_map.pop("target_field", None)
+            if f_target_field not in change_data["fields"]:
                 continue
-            field = apps.get_model(
+            field, _ = apps.get_model(
                 "ipfabric_netbox", "IPFabricTransformField"
-            ).objects.get(
-                target_field=field_map["target_field"], transform_map=transform_map
+            ).objects.get_or_create(
+                target_field=f_target_field,
+                transform_map=transform_map,
+                defaults=field_map,
             )
             field.template = field_map["template"]
             field.save()
 
         for relationship_map in item["relationship_maps"]:
-            if relationship_map["target_field"] not in change_data["relationships"]:
+            rel_target_field = relationship_map.pop("target_field", None)
+            if rel_target_field not in change_data["relationships"]:
                 continue
-            relationship = apps.get_model(
+            relationship_map["source_model"] = apps.get_model(
+                "contenttypes", "ContentType"
+            ).objects.get(**relationship_map.pop("source_model"))
+            relationship, _ = apps.get_model(
                 "ipfabric_netbox", "IPFabricRelationshipField"
-            ).objects.get(
-                target_field=relationship_map["target_field"],
+            ).objects.get_or_create(
+                target_field=rel_target_field,
                 transform_map=transform_map,
+                defaults=relationship_map,
             )
             relationship.template = relationship_map["template"]
             relationship.save()

ipfabric_netbox/utilities/ipfutils.py

@@ -334,15 +334,18 @@ class IPFabricSyncRunner(object):
                     snapshot_id=self.settings["snapshot_id"], filters=site_filter
                 )
 
+                inventory_item_filter = {
+                    "and": [
+                        {"sn": ["empty", False]},
+                        {"name": ["empty", False]},
+                    ]
+                }
+                if site_filter:
+                    inventory_item_filter["and"].append(site_filter)
+
                 data["inventoryitem"] = self.client.inventory.pn.all(
                     snapshot_id=self.settings["snapshot_id"],
-                    filters={
-                        "and": [
-                            site_filter,
-                            {"sn": ["empty", False]},
-                            {"name": ["empty", False]},
-                        ]
-                    },
+                    filters=inventory_item_filter,
                 )
 
                 data["vlan"] = self.client.technology.vlans.site_summary.all(

{ipfabric_netbox-3.2.2.dist-info → ipfabric_netbox-3.2.4.dist-info}/METADATA

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

{ipfabric_netbox-3.2.2.dist-info → ipfabric_netbox-3.2.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ipfabric_netbox/__init__.py,sha256=Hx79dSbjd4DIMkPCRqBBdEDb9t9MAVvHEk9TZHXAw3c,315
+ipfabric_netbox/__init__.py,sha256=SrkmJ_57W0Je4fMJchMOrcPpCvBL4tNJL7uUbkGEX9w,315
 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
@@ -19,7 +19,7 @@ ipfabric_netbox/migrations/0006_alter_ipfabrictransformmap_target_model.py,sha25
 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=rEqa3OC8UpbdiZKOHBqnrjEgZXYxl8UFCDXHRl_Lnhk,9256
-ipfabric_netbox/migrations/0010_remove_uuid_from_get_or_create.py,sha256=Sdmyms5sbuuTH0LkF4k4A9JVS00-N41tY11eaqceJSw,3511
+ipfabric_netbox/migrations/0010_remove_uuid_from_get_or_create.py,sha256=K1oF-B32Ei60XbQdntmjksx1o7rpnpgXCVKFT1dOU1Q,3958
 ipfabric_netbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ipfabric_netbox/models.py,sha256=krbTm99p7Tj1UHSo0OP5f6RFFdl5RggVG4vp-gkckUU,30725
 ipfabric_netbox/navigation.py,sha256=2kZs341nAB7G76qnZT6mFxsYo68IPy-bmPMkSLA-Nk0,1735
@@ -55,11 +55,11 @@ ipfabric_netbox/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 ipfabric_netbox/tests/test_models.py,sha256=syndh1M3uiZIokn_MJUHfU5jNNMUDPQ5sm8iK-gu1Is,15192
 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=c9a_3mQ_GVksYqsCIGJSBnzOVKX1V21Jb9lrU2ASadE,27306
+ipfabric_netbox/utilities/ipfutils.py,sha256=v-9GUfvK0SEeyl7PBHzMqIKl1_wWmy38y_KoBS9K-9o,27409
 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=g0elxtwSRJvu0ZRZHyMf4Y9R4wiQ-h2o9Er8gxUQ-Bs,2108
 ipfabric_netbox/views.py,sha256=K2iKh6i8kv88c7gVh6wW7d8Adcso24ZE8m6gVUiNZSw,28285
-ipfabric_netbox-3.2.2.dist-info/METADATA,sha256=sFnkbdFcINTc3j0ZYZdTWqQVPzFdfnPXyGEvVhf5-3Y,4947
-ipfabric_netbox-3.2.2.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-ipfabric_netbox-3.2.2.dist-info/RECORD,,
+ipfabric_netbox-3.2.4.dist-info/METADATA,sha256=6QVcK8HDuEAQ6kFiulmkk_LaIvYcb58gQFrhw3i9sZI,4947
+ipfabric_netbox-3.2.4.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+ipfabric_netbox-3.2.4.dist-info/RECORD,,