Bugfix: Inventory - Fix for 2.9 assigned objects for IP addresses (#334)

Author: haxorof

plugins/inventory/nb_inventory.py

@@ -610,11 +610,19 @@ def extract_interfaces(self, host):
 
             interfaces = list(interfaces_lookup[host["id"]].values())
 
+            before_netbox_v29 = bool(self.ipaddresses_lookup)
             # Attach IP Addresses to their interface
             for interface in interfaces:
-                interface["ip_addresses"] = list(
-                    self.ipaddresses_lookup[interface["id"]].values()
-                )
+                if before_netbox_v29:
+                    interface["ip_addresses"] = list(
+                        self.ipaddresses_lookup[interface["id"]].values()
+                    )
+                else:
+                    interface["ip_addresses"] = list(
+                        self.vm_ipaddresses_lookup[interface["id"]].values()
+                        if host["is_virtual"]
+                        else self.device_ipaddresses_lookup[interface["id"]].values()
+                    )
 
             return interfaces
         except Exception:
@@ -918,20 +926,37 @@ def refresh_ipaddresses(self):
         # Construct a dictionary of lists, to allow looking up ip addresses by interface id
         # Note that interface ids share the same namespace for both devices and vms so this is a single dictionary
         self.ipaddresses_lookup = defaultdict(dict)
+        # NetBox v2.9 and onwards
+        self.vm_ipaddresses_lookup = defaultdict(dict)
+        self.device_ipaddresses_lookup = defaultdict(dict)
 
         for ipaddress in ipaddresses:
+            # As of NetBox v2.9 "assigned_object_x" replaces "interface"
+            if ipaddress.get("assigned_object_id"):
+                interface_id = ipaddress["assigned_object_id"]
+                ip_id = ipaddress["id"]
+                # We need to copy the ipaddress entry to preserve the original in case caching is used.
+                ipaddress_copy = ipaddress.copy()
+
+                if ipaddress["assigned_object_type"] == 'virtualization.vminterface':
+                    self.vm_ipaddresses_lookup[interface_id][ip_id] = ipaddress_copy
+                else:
+                    self.device_ipaddresses_lookup[interface_id][ip_id] = ipaddress_copy                # Remove "assigned_object_X" attributes, as that's redundant when ipaddress is added to an interface
+
+                del ipaddress_copy["assigned_object_id"]
+                del ipaddress_copy["assigned_object_type"]
+                del ipaddress_copy["assigned_object"]
+                continue
 
             if not ipaddress.get("interface"):
                 continue
-
             interface_id = ipaddress["interface"]["id"]
             ip_id = ipaddress["id"]
 
             # We need to copy the ipaddress entry to preserve the original in case caching is used.
             ipaddress_copy = ipaddress.copy()
 
             self.ipaddresses_lookup[interface_id][ip_id] = ipaddress_copy
-
             # Remove "interface" attribute, as that's redundant when ipaddress is added to an interface
             del ipaddress_copy["interface"]