Merge pull request #17 from pawnar29/patch-1

Fix vrf data being ignored when importing to Netbox
Changed the way scan processor is comparing the ip address to include vrf in case of duplicate ip

Author: LoH-lu

netbox_import.py

@@ -95,7 +95,7 @@ def parse_tags(tags_string: str) -> List[Dict[str, str]]:
 def process_row(row: Dict[str, str], pbar: tqdm, netbox_instance: pynetbox.api) -> None:
     """
     Process a single row from the CSV file and update/create IP addresses in Netbox.
-    
+        
     Args:
         row (Dict[str, str]): Dictionary representing a single row from the CSV file
         pbar (tqdm): Progress bar instance
@@ -114,12 +114,28 @@ def process_row(row: Dict[str, str], pbar: tqdm, netbox_instance: pynetbox.api)
         tags_list = parse_tags(row['tags'])
         logger.debug(f"Parsed tags for {address}: {tags_list}")
 
-        # Prepare tenant and VRF data
+        # Prepare tenant data
         tenant_data = {'name': row['tenant']} if row['tenant'] != 'N/A' else None
-        vrf_data = {'name': row['VRF']} if row['VRF'] != 'N/A' else None
-
-        # Get existing address
-        existing_address = netbox_instance.ipam.ip_addresses.get(address=address)
+        
+        # Look up VRF by name
+        vrf_data = None
+        if row['VRF'] != 'N/A':
+            try:
+                vrf = netbox_instance.ipam.vrfs.get(name=row['VRF'])
+                if vrf:
+                    # Convert VRF object to a dictionary with just the ID
+                    vrf_data = {'id': vrf.id}
+                    logger.debug(f"Found VRF {row['VRF']} with ID {vrf.id}")
+                else:
+                    logger.warning(f"VRF {row['VRF']} not found in Netbox")
+            except Exception as e:
+                logger.error(f"Error looking up VRF {row['VRF']}: {str(e)}")
+
+        # Get existing address - use the VRF ID
+        existing_address = netbox_instance.ipam.ip_addresses.get(
+            address=address, 
+            vrf_id=vrf_data['id'] if vrf_data else None
+        )
 
         if existing_address:
             _update_existing_address(

scan_processor.py

@@ -135,13 +135,13 @@ def get_latest_files(dir_path: str, num_files: int = 2) -> List[str]:
 
 def read_csv(file_path: str) -> Dict[str, Dict[str, str]]:
     """
-    Read a CSV file and return a dictionary with addresses as keys.
+    Read a CSV file and return a dictionary with address_vrf combinations as keys.
 
     Args:
         file_path: The path to the CSV file
 
     Returns:
-        Dictionary with addresses as keys and corresponding row data as values
+        Dictionary with address_vrf combinations as keys and corresponding row data as values
         
     Raises:
         FileNotFoundError: If the file doesn't exist
@@ -155,9 +155,12 @@ def read_csv(file_path: str) -> Dict[str, Dict[str, str]]:
         with open(file_path, 'r', encoding='utf-8') as file:
             reader = csv.DictReader(file)
             for row in reader:
+                # Create composite key using address and VRF
                 address = row['address']
-                data[address] = row
-                logger.debug(f"Processed row for address: {address}")
+                vrf = row['VRF']
+                composite_key = f"{address}_{vrf}"
+                data[composite_key] = row
+                logger.debug(f"Processed row for address: {address} in VRF: {vrf}")
 
         logger.info(f"Successfully read {len(data)} records from {file_path}")
         return data