ipfabric_netbox 3.2.3__tar.gz → 3.2.4__tar.gz

{ipfabric_netbox-3.2.3 → ipfabric_netbox-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ipfabric_netbox
-Version: 3.2.3
+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.3 → ipfabric_netbox-3.2.4}/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.3"
+    version = "3.2.4"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

{ipfabric_netbox-3.2.3 → ipfabric_netbox-3.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-3.2.3 → ipfabric_netbox-3.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ipfabric_netbox"
-version = "3.2.3"
+version = "3.2.4"
 description = "NetBox plugin to sync IP Fabric data into NetBox"
 authors = [{name = "Solution Architecture <solution.architecture@ipfabric.io>"}]
 license = "MIT"