cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

routeros #23

Merged
cronekorkn merged 4 commits from routeros into master 2025-07-01 11:32:28 +02:00
Conversation 0 Commits 4 Files changed 13 +10 -12
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 460f809403 - Show all commits

3
bundles/routeros/items.py
View file

@ -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', 'bridge': 'bridge',
'untagged': sorted(node.metadata.get(f'routeros/vlan_ports/{vlan_name}/untagged')), 'untagged': sorted(node.metadata.get(f'routeros/vlan_ports/{vlan_name}/untagged')),
'tagged': sorted(node.metadata.get(f'routeros/vlan_ports/{vlan_name}/tagged')), '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', 'routeros-vlan-ports',
}, },
'needs': { 'needs': {
#'routeros:/interface/bridge?name=bridge',
'tag:routeros-vlan', 'tag:routeros-vlan',
}, },
} }

4
groups/os/routeros.py
View file

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

13
nodes/home.router.py
View file

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

2
nodes/home.switch-vorratsraum-poe.py
View file

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