modified: module/netbox/object_classes.py

Author: Noah418

module/netbox/object_classes.py

@@ -2150,18 +2150,6 @@ def resolve_relations(self):
     def update(self, data=None, read_from_netbox=False, source=None):
         object_type = data.get("assigned_object_type")
         assigned_object = data.get("assigned_object_id")
-        
-        # Skip IP assignments when the IP is assigned to FHRP groups when config option
-        # skip_fhrp_group_ips is set to True, or if the IP is manually assigned to an FHRP group (no source)
-        if source is not None:
-            if source.source_type == "vmware":
-                config_relation = source.get_object_relation(assigned_object, "skip_fhrp_group_ips")
-                if config_relation == True and object_type == "ipam.fhrpgroup":
-                    log.debug(f"IP address with id '{assigned_object}' assigned to FHRP group. Skipping.")
-                    return
-        elif object_type == "ipam.fhrpgroup":
-            log.debug(f"IP address with id '{assigned_object}' assigned to FHRP group. It was manually created. Skipping.")
-            return
 
         # used to track changes in object primary IP assignments
         previous_ip_device_vm = None
@@ -2173,6 +2161,19 @@ def update(self, data=None, read_from_netbox=False, source=None):
 
             # get current device to make sure to unset primary ip before moving IP address
             previous_ip_device_vm = self.get_device_vm()
+
+            # Skip IP assignments when the IP is already assigned to FHRP groups when config option
+            # skip_fhrp_group_ips is set to True, or if the IP is manually assigned to an FHRP group (no source)
+            if source is not None:
+                if source.source_type == "vmware":
+                    config_relation = source.get_object_relation(assigned_object, "skip_fhrp_group_ips")
+                    if config_relation == True and grab(previous_ip_device_vm, "data.assigned_object_type") == "ipam.fhrpgroup":
+                        log.debug(f"IP address with id '{assigned_object}' assigned to FHRP group. Skipping.")
+                        return
+            elif grab(previous_ip_device_vm, "data.assigned_object_type") == "ipam.fhrpgroup":
+                log.debug(f"IP address with id '{assigned_object}' assigned to FHRP group. It was manually created. Skipping.")
+                return
+            
             if grab(previous_ip_device_vm, "data.primary_ip4") is self:
                 is_primary_ipv4_of_previous_device = True
             if grab(previous_ip_device_vm, "data.primary_ip6") is self:
@@ -2213,7 +2214,7 @@ def get_interface(self):
         o_id = self.data.get("assigned_object_id")
         o_type = self.data.get("assigned_object_type")
 
-        if isinstance(o_id, (NBInterface, NBVMInterface)):
+        if isinstance(o_id, (NBInterface, NBVMInterface, NBFHRPGroupItem)):
             return o_id
 
         if o_type is None or not isinstance(o_id, int):
@@ -2235,6 +2236,8 @@ def get_device_vm(self):
             return o_interface.data.get("device")
         elif isinstance(o_interface, NBVMInterface):
             return o_interface.data.get("virtual_machine")
+        elif isinstance(o_interface, NBFHRPGroupItem):
+            return o_interface.data.get("fhrp_group")
 
     def remove_interface_association(self):
         o_id = self.data.get("assigned_object_id")