ipfabric_netbox 3.2.1__tar.gz → 3.2.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ipfabric_netbox
-Version: 3.2.1
+Version: 3.2.3
 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 → ipfabric_netbox-3.2.3}/README.md

@@ -28,19 +28,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 → ipfabric_netbox-3.2.3}/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.3"
     base_url = "ipfabric"
     min_version = "4.2.4"
 

{ipfabric_netbox-3.2.1 → ipfabric_netbox-3.2.3}/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-3.2.1 → ipfabric_netbox-3.2.3}/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,14 +331,21 @@ 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
                 )
 
+                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": [{"sn": ["empty", False]}, {"name": ["empty", False]}]
-                    },
+                    filters=inventory_item_filter,
                 )
 
                 data["vlan"] = self.client.technology.vlans.site_summary.all(
@@ -363,7 +370,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 → ipfabric_netbox-3.2.3}/pyproject.toml

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