feat: expand free IP discovery to 10.32.70.x - 10.32.80.x range

infra_cli/dns.py

@@ -57,23 +57,46 @@ class DNSManager:
         dns = self.exec_lxc(f"cat {self.dns_file}").stdout
         return {"hosts": hosts, "dns": dns}
 
-    def get_free_ips(self, range_start=1, range_end=254, subnet="10.32.70"):
-        """Finds free IPs in the specified range by checking both static and dynamic leases"""
-        # 1. Get all static IPs from dhcp-hosts.conf and dynamic-hosts.conf
-        static_configs = self.exec_lxc(f"cat /etc/dnsmasq.d/dhcp-hosts.conf {self.hosts_file} 2>/dev/null").stdout
-        import re
-        used_ips = set(re.findall(r'[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}', static_configs))
-        
-        # 2. Get all active dynamic leases
-        leases = self.exec_lxc("cat /var/lib/misc/dnsmasq.leases 2>/dev/null").stdout
-        used_ips.update(set(re.findall(r'[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}', leases)))
+        def get_free_ips(self, start_subnet=70, end_subnet=80):
 
-        # 3. Find first available in the agent range
-        free_ips = []
-        for i in range(range_start, range_end + 1):
-            candidate = f"{subnet}.{i}"
-            if candidate not in used_ips:
-                free_ips.append(candidate)
-            if len(free_ips) >= 10: # Just return the top 10
-                break
-        return free_ips
+            """Finds free IPs in the range 10.32.[70-80].1-254 by checking both static and dynamic leases"""
+
+            # 1. Get all static IPs from dhcp-hosts.conf and dynamic-hosts.conf
+
+            static_configs = self.exec_lxc(f"cat /etc/dnsmasq.d/dhcp-hosts.conf {self.hosts_file} 2>/dev/null").stdout
+
+            import re
+
+            used_ips = set(re.findall(r'10\.32\.[0-9]{1,3}\.[0-9]{1,3}', static_configs))
+
+            
+
+            # 2. Get all active dynamic leases
+
+            leases = self.exec_lxc("cat /var/lib/misc/dnsmasq.leases 2>/dev/null").stdout
+
+            used_ips.update(set(re.findall(r'10\.32\.[0-9]{1,3}\.[0-9]{1,3}', leases)))
+
+    
+
+            # 3. Find first available in the expanded agent range
+
+            free_ips = []
+
+            for subnet_idx in range(start_subnet, end_subnet + 1):
+
+                for host_idx in range(1, 255):
+
+                    candidate = f"10.32.{subnet_idx}.{host_idx}"
+
+                    if candidate not in used_ips:
+
+                        free_ips.append(candidate)
+
+                    if len(free_ips) >= 10: # Return top 10
+
+                        return free_ips
+
+            return free_ips
+
+