Development

docker/routlin-dash/app/pages/dhcp/action.py

@@ -1,6 +1,5 @@
 from pathlib import Path
 import copy
-import ipaddress
 
 from flask import Blueprint, request, redirect, flash
 from auth import require_level
@@ -47,25 +46,6 @@ def _parse_ip():
     return ip
 
 
-def _check_ip_conflicts(ip, vlan):
-    if ip == 'dynamic':
-        return None
-    dhcp       = vlan.get('dhcp_information', {})
-    pool_start = dhcp.get('dynamic_pool_start')
-    pool_end   = dhcp.get('dynamic_pool_end')
-    if pool_start and pool_end:
-        try:
-            if (ipaddress.IPv4Address(pool_start) <= ipaddress.IPv4Address(ip)
-                    <= ipaddress.IPv4Address(pool_end)):
-                return f'{ip} falls within the dynamic pool range ({pool_start}-{pool_end}).'
-        except Exception:
-            pass
-    identity_ips = {s['ip'] for s in vlan.get('server_identities', []) if s.get('ip')}
-    if ip in identity_ips:
-        return f'{ip} is already assigned as a server identity IP.'
-    return None
-
-
 @bp.route('/action/dhcp/addreservation_add', methods=['POST'])
 @require_level('administrator')
 def addreservation_add():
@@ -94,7 +74,7 @@ def addreservation_add():
         flash(f'The configuration has not been saved because VLAN "{vlan_name}" was not found.', 'error')
         return redirect(f'/{_PAGE}')
 
-    conflict = _check_ip_conflicts(ip, vlan)
+    conflict = validate.check_reservation_ip_conflicts(ip, vlan)
     if conflict:
         flash(f'The configuration has not been saved because {conflict}', 'error')
         return redirect(f'/{_PAGE}')
@@ -181,7 +161,7 @@ def reservations_edit():
         flash('Entry not found.', 'error')
         return redirect(f'/{_PAGE}')
 
-    conflict = _check_ip_conflicts(ip, vlans[vi])
+    conflict = validate.check_reservation_ip_conflicts(ip, vlans[vi])
     if conflict:
         flash(f'The configuration has not been saved because {conflict}', 'error')
         return redirect(f'/{_PAGE}')