From 7080972eeca5ab33ead69e4f68ae0bcae01ac75b Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Thu, 20 Feb 2025 04:31:52 +0100 Subject: [PATCH] fix: don't create duplicated entries --- internal/netbox/inventory/init_items.go | 32 +++++++++++-------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/internal/netbox/inventory/init_items.go b/internal/netbox/inventory/init_items.go index ae1a27b..5e72830 100644 --- a/internal/netbox/inventory/init_items.go +++ b/internal/netbox/inventory/init_items.go @@ -946,15 +946,13 @@ func (nbi *NetboxInventory) initIPAddresses(ctx context.Context) error { ) for i := range ipAddresses { ipAddr := &ipAddresses[i] - if ipAddr.HasTag(nbi.SsotTag) { - ifaceType, ifaceName, ifaceParentName, err := nbi.getIndexValuesForIPAddress(ipAddr) - if err != nil { - return fmt.Errorf("get index values for ip address: %s", err) - } - nbi.verifyIPAddressIndexExists(ifaceType, ifaceName, ifaceParentName) - nbi.ipAddressesIndex[ifaceType][ifaceName][ifaceParentName][ipAddr.Address] = ipAddr - nbi.OrphanManager.AddItem(ipAddr) + ifaceType, ifaceName, ifaceParentName, err := nbi.getIndexValuesForIPAddress(ipAddr) + if err != nil { + return fmt.Errorf("get index values for ip address: %s", err) } + nbi.verifyIPAddressIndexExists(ifaceType, ifaceName, ifaceParentName) + nbi.ipAddressesIndex[ifaceType][ifaceName][ifaceParentName][ipAddr.Address] = ipAddr + nbi.OrphanManager.AddItem(ipAddr) } nbi.Logger.Debug( @@ -980,17 +978,15 @@ func (nbi *NetboxInventory) initMACAddresses(ctx context.Context) error { ) for i := range nbMACAddresses { macAddress := &nbMACAddresses[i] - if macAddress.HasTag(nbi.SsotTag) { - ifaceType, ifaceName, ifaceParentName, err := nbi.getIndexValuesForMACAddress( - macAddress, - ) - if err != nil { - return fmt.Errorf("get index values for mac address: %s", err) - } - nbi.verifyMACAddressIndexExists(ifaceType, ifaceName, ifaceParentName) - nbi.macAddressesIndex[ifaceType][ifaceName][ifaceParentName][macAddress.MAC] = macAddress - nbi.OrphanManager.AddItem(macAddress) + ifaceType, ifaceName, ifaceParentName, err := nbi.getIndexValuesForMACAddress( + macAddress, + ) + if err != nil { + return fmt.Errorf("get index values for mac address: %s", err) } + nbi.verifyMACAddressIndexExists(ifaceType, ifaceName, ifaceParentName) + nbi.macAddressesIndex[ifaceType][ifaceName][ifaceParentName][macAddress.MAC] = macAddress + nbi.OrphanManager.AddItem(macAddress) } nbi.Logger.Debug(