Development
This commit is contained in:
parent
e2573fbf12
commit
f0504f802e
8 changed files with 67 additions and 66 deletions
|
|
@ -20,7 +20,7 @@ import sys
|
|||
from datetime import datetime, timezone
|
||||
from pathlib import Path
|
||||
|
||||
from validation import derive_interface, derive_vlan_id, is_wg
|
||||
from validation import derive_interface, is_wg
|
||||
|
||||
# ===================================================================
|
||||
# Constants (mirror core.py - no import to avoid circular dependency)
|
||||
|
|
@ -295,7 +295,7 @@ def check_configurations(data):
|
|||
# --- VLAN sub-interfaces ---
|
||||
for vlan in non_wg:
|
||||
iface = derive_interface(vlan, data)
|
||||
vid = derive_vlan_id(vlan.get("subnet", ""), vlan.get("subnet_mask", 24))
|
||||
vid = vlan.get("vlan_id")
|
||||
state = _iface_operstate(iface)
|
||||
id_ = f"iface_{vlan['name']}"
|
||||
name = f"interface {iface}"
|
||||
|
|
@ -348,7 +348,7 @@ def check_configurations(data):
|
|||
# --- systemd-networkd files ---
|
||||
for vlan in non_wg:
|
||||
iface = derive_interface(vlan, data)
|
||||
vid = derive_vlan_id(vlan.get("subnet", ""), vlan.get("subnet_mask", 24))
|
||||
vid = vlan.get("vlan_id")
|
||||
net = NETWORKD_DIR / f"10-{PRODUCT_NAME}-{vlan['name']}.network"
|
||||
results.append(file_ok(f"networkd_net_{vlan['name']}",
|
||||
f"networkd {net.name}", net))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue