bundles/routeros/items.py

@@ -62,7 +62,7 @@ for vlan_name, vlan_id in node.metadata.get('routeros/vlans').items():
         },
     }
 
-    routeros[f"/interface/bridge/vlan?vlan-ids={vlan_id}"] = {
+    routeros[f"/interface/bridge/vlan?vlan-ids={vlan_id}&dynamic=false"] = {
         'bridge': 'bridge',
         'untagged': sorted(node.metadata.get(f'routeros/vlan_ports/{vlan_name}/untagged')),
         'tagged': sorted(node.metadata.get(f'routeros/vlan_ports/{vlan_name}/tagged')),
@@ -71,7 +71,6 @@ for vlan_name, vlan_id in node.metadata.get('routeros/vlans').items():
             'routeros-vlan-ports',
         },
         'needs': {
-            #'routeros:/interface/bridge?name=bridge',
             'tag:routeros-vlan',
         },
     }

groups/os/routeros.py

@@ -32,6 +32,10 @@
                         'rolf',
                     },
                 },
+                'internet': {
+                    'untagged': 'internet',
+                    'tagged': set(),
+                },
             },
             'vlan_ports': {},
         },

nodes/home.router.py

@@ -14,16 +14,10 @@
     'metadata': {
         'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c',
         'network': {
-            'external': {
-                'interface': 'enp2s0',
-                'ipv4': '10.0.99.126/24',
-                'gateway4': '10.0.99.1',
-                'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal', 'proxmox'},
-            },
             'internal': {
-                'type': 'vlan',
-                'id': 1,
+                'interface': 'enp1s0f0',
                 'ipv4': '10.0.0.1/24',
+                'vlans': {'iot', 'internet', 'guest', 'rolf', 'proxmox'},
                 'dhcp_server': True,
             },
             'iot': {
@@ -35,7 +29,8 @@
             'internet': {
                 'type': 'vlan',
                 'id': 3,
-                'ipv4': '10.0.3.1/24',
+                'ipv4': '10.0.99.126/24',
+                'gateway4': '10.0.99.1',
             },
             'proxmox': {
                 'type': 'vlan',

nodes/home.switch-vorratsraum-poe.py

@@ -35,7 +35,7 @@
                     'vlan_group': 'infra',
                 },
                 'ether4': {
-                    'vlan_group': 'infra',
+                    'vlan_group': 'internet',
                 },
                 'ether5': {
                     'vlan_group': 'infra',