ipfabric_netbox 3.2.1__py3-none-any.whl → 3.2.2__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.1"
+    version = "3.2.2"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

ipfabric_netbox/exceptions.py

@@ -14,11 +14,11 @@ class ErrorMixin(Exception):
         self.coalesce_fields = context
 
 
-class SearchError(LookupError, ErrorMixin):
+class SearchError(ErrorMixin, LookupError):
     def __str__(self):
         return f"{self.model} with these keys not found: {self.coalesce_fields}."
 
 
-class SyncDataError(SyncError, ErrorMixin):
+class SyncDataError(ErrorMixin, SyncError):
     def __str__(self):
         return f"Sync failed for {self.model}: coalesce_fields={self.coalesce_fields} defaults={self.defaults}."

ipfabric_netbox/utilities/ipfutils.py

@@ -302,7 +302,6 @@ class IPFabricSyncRunner(object):
                 query_filter = {
                     "and": [{"vendor": ["neq", vendor]} for vendor in excluded_vendors]
                 }
-                # filter = {"and": [{"vendor": ["neq", "aws"]}, {"vendor": ["neq", "azure"]}]}
 
                 if ingestion_sites := self.settings.get("sites"):
                     site_filter = {
@@ -311,13 +310,14 @@ class IPFabricSyncRunner(object):
                     query_filter["and"].append(site_filter)
 
                     self.logger.log_info(
-                        f"Creating site filter {json.dumps(site_filter)}", obj=self.sync
+                        f"Creating site filter `{json.dumps(site_filter)}`",
+                        obj=self.sync,
                     )
                 else:
                     site_filter = {}
 
                 data["site"] = self.client.inventory.sites.all(
-                    snapshot_id=self.settings["snapshot_id"]
+                    snapshot_id=self.settings["snapshot_id"], filters=site_filter
                 )
 
                 data["device"] = self.client.inventory.devices.all(
@@ -331,13 +331,17 @@ class IPFabricSyncRunner(object):
                 )
 
                 data["interface"] = self.client.inventory.interfaces.all(
-                    snapshot_id=self.settings["snapshot_id"]
+                    snapshot_id=self.settings["snapshot_id"], filters=site_filter
                 )
 
                 data["inventoryitem"] = self.client.inventory.pn.all(
                     snapshot_id=self.settings["snapshot_id"],
                     filters={
-                        "and": [{"sn": ["empty", False]}, {"name": ["empty", False]}]
+                        "and": [
+                            site_filter,
+                            {"sn": ["empty", False]},
+                            {"name": ["empty", False]},
+                        ]
                     },
                 )
 
@@ -363,7 +367,7 @@ class IPFabricSyncRunner(object):
                 data[
                     "ipaddress"
                 ] = self.client.technology.addressing.managed_ip_ipv4.all(
-                    snapshot_id=self.settings["snapshot_id"]
+                    snapshot_id=self.settings["snapshot_id"], filters=site_filter
                 )
         except Exception as e:
             self.logger.log_failure(

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ipfabric_netbox
-Version: 3.2.1
+Version: 3.2.2
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 License: MIT
 Keywords: netbox,ipfabric,plugin,sync
@@ -57,19 +57,18 @@ 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.
+These are the required NetBox versions for corresponding plugin version. Any other versions won't work due to breaking changes in NetBox codebase.
 
 | Netbox Version | Plugin Version |
 |----------------|----------------|
-| 3.4            | <=1.0.11       |
-| 3.5            | <=1.0.11       |
-| 3.6            | <=1.0.11       |
-| 3.7            | >=2.0.0        |
-| 4.0            | >=3.0.0        |
-| 4.0.1          | >=3.0.1        |
-| 4.1.0          | >=3.1.0        |
-| 4.1.5          | >=3.1.1        |
-| 4.2.0          | >=3.2.0        |
+| 4.2.4 and up   | 3.2.2 and up   |
+| 4.2.0 - 4.2.3  | 3.2.0          |
+| 4.1.5 - 4.1.11 | 3.1.1 - 3.1.3  |
+| 4.1.0 - 4.1.4  | 3.1.0          |
+| 4.0.1          | 3.0.1 - 3.0.3  |
+| 4.0.0          | 3.0.0          |
+| 3.7.0 - 3.7.8  | 2.0.0 - 2.0.6  |
+| 3.4.0 - 3.6.9  | 1.0.0 - 1.0.11 |
 
 ## Screenshots
 

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

@@ -1,4 +1,4 @@
-ipfabric_netbox/__init__.py,sha256=TThmLsadpapoAIhc1dEy0uFcb35WOikGw_rErqh7yT0,315
+ipfabric_netbox/__init__.py,sha256=Hx79dSbjd4DIMkPCRqBBdEDb9t9MAVvHEk9TZHXAw3c,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
@@ -6,7 +6,7 @@ ipfabric_netbox/api/urls.py,sha256=BSQ5nqYSx0r-wnbdKGDAb5XH7BBy_0ngV_Q7vDgjMIE,9
 ipfabric_netbox/api/views.py,sha256=X02GwpDlq25_3KlxYTWyd4PnT1RCtfp7uN0zZ5Etjp8,4429
 ipfabric_netbox/choices.py,sha256=GqcnLqsFR4gnhWEwkvQbPxXYNi5SwNoIQz-J15LTMc4,4848
 ipfabric_netbox/data/transform_map.json,sha256=Xb5x8dmBPDmrVUezjvkI3Wq60TgdHXocaur3W2xZ_k8,21951
-ipfabric_netbox/exceptions.py,sha256=8XmyAqouF8ghYCpJrgSwh1gUVedBI3UPWvwJ8Aai12g,744
+ipfabric_netbox/exceptions.py,sha256=Za-RutEX9ZIi3r0Rpor1vDGwsC5foeyrfSjUKS3Cwdk,744
 ipfabric_netbox/filtersets.py,sha256=P_2VCL892pLplPnsxul27bgGgMpHaZtgn9Vg0UsWErE,3877
 ipfabric_netbox/forms.py,sha256=qtl6htAmyAIwwUoucHsqmXJME2M2SzcA69_BBiuCqs4,42942
 ipfabric_netbox/jobs.py,sha256=jfWWNA42KMyzc-EGit6LJIe-SNob4-4IQRfadQF_GRE,2862
@@ -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=M4YnnUdbUXg2wkOt1a_nsJok_K0ppfZ_fuwcg0wemtc,27187
+ipfabric_netbox/utilities/ipfutils.py,sha256=c9a_3mQ_GVksYqsCIGJSBnzOVKX1V21Jb9lrU2ASadE,27306
 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.1.dist-info/METADATA,sha256=qtRU2-RvAyfcsbHlOnaCnBwRbOD61tnRC9GLGqxrLRI,4975
-ipfabric_netbox-3.2.1.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-ipfabric_netbox-3.2.1.dist-info/RECORD,,
+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,,