Development

router/core.py

@@ -103,8 +103,8 @@ from pathlib import Path
 from validation import (
     VALID_PROTOCOLS, VALID_BLOCKLIST_FORMATS,
     int_range, domainname,
-    inject_interfaces, is_wg, is_dynamic_ip,
-    validate_config,
+    is_wg, is_dynamic_ip,
+    resolve_vlan_derived_fields, validate_config,
 )
 
 SCRIPT_DIR        = Path(__file__).parent
@@ -3079,7 +3079,7 @@ def cmd_apply(data, dry_run=False):
     dnsmasq confs, start/restart all services whose interface is up, nftables,
     timer, and boot service. Safe to run repeatedly.
     """
-    inject_interfaces(data)
+    data = resolve_vlan_derived_fields(data)
     if dry_run:
         print("[DRY RUN] --apply would perform the following actions:")
         print()