vlan interface in vlan netwrok, not in seperate list

bundles/bind/metadata.py

@@ -3,6 +3,7 @@ from json import dumps
 h = repo.libs.hashable.hashable
 repo.libs.bind.repo = repo
 
+
 defaults = {
     'apt': {
         'packages': {

bundles/network/metadata.py

@@ -51,7 +51,11 @@ def units(metadata):
                 'Network': {
                     'DHCP': network_conf.get('dhcp', 'no'),
                     'IPv6AcceptRA': network_conf.get('dhcp', 'no'),
-                    'VLAN': set(network_conf.get('vlans', set()))
+                    'VLAN': set(
+                        other_network_name
+                            for other_network_name, other_network_conf in metadata.get('network', {}).items()
+                            if other_network_conf.get('type') == 'vlan' and other_network_conf['vlan_interface'] == network_name
+                    )
                 }
             }
 

nodes/home.router.py

@@ -18,35 +18,39 @@
             'internal': {
                 'interface': 'enp1s0f0',
                 'ipv4': '10.0.0.1/24',
-                'vlans': {'iot', 'internet', 'guest', 'rolf', 'proxmox'},
                 'dhcp_server': True,
             },
             'iot': {
                 'type': 'vlan',
+                'vlan_interface': 'internal',
                 'id': 2,
                 'ipv4': '10.0.2.1/24',
                 'dhcp_server': True,
             },
             'external': {
                 'type': 'vlan',
+                'vlan_interface': 'internal',
                 'id': 3,
                 'ipv4': '10.0.99.126/24',
                 'gateway4': '10.0.99.1',
             },
             'proxmox': {
                 'type': 'vlan',
+                'vlan_interface': 'internal',
                 'id': 4,
                 'ipv4': '10.0.4.1/24',
                 'dhcp_server': True,
             },
             'guest': {
                 'type': 'vlan',
+                'vlan_interface': 'internal',
                 'id': 9,
                 'ipv4': '10.0.9.1/24',
                 'dhcp_server': True,
             },
             'rolf': { # rolf local test
                 'type': 'vlan',
+                'vlan_interface': 'internal',
                 'id': 51,
                 'ipv4': '192.168.179.1/24',
                 'dhcp_server': True,