From 463cf8783cf5149b5db509007f4d1c75b2a573f4 Mon Sep 17 00:00:00 2001 From: CroneKorkN Date: Wed, 3 Dec 2025 22:30:42 +0100 Subject: [PATCH] mikrotik: more port config --- groups/os/routeros.py | 4 +++ nodes/home.switch-rack-10g.py | 15 +++++--- nodes/home.switch-rack-poe.py | 25 +++++++------ nodes/home.switch-vorratsraum-poe.py | 53 +++++++++++++++------------- nodes/home.switch-wohnzimmer-10g.py | 7 +++- 5 files changed, 63 insertions(+), 41 deletions(-) diff --git a/groups/os/routeros.py b/groups/os/routeros.py index 9a821fe..6949cab 100644 --- a/groups/os/routeros.py +++ b/groups/os/routeros.py @@ -23,6 +23,10 @@ 'rolf': '51', }, 'vlan_groups': { + 'home': { + 'untagged': 'home', + 'tagged': set(), + }, 'infra': { 'untagged': 'home', 'tagged': { diff --git a/nodes/home.switch-rack-10g.py b/nodes/home.switch-rack-10g.py index 85c7938..86932c6 100644 --- a/nodes/home.switch-rack-10g.py +++ b/nodes/home.switch-rack-10g.py @@ -16,30 +16,35 @@ 'ports': { 'sfp-sfpplus1': { 'vlan_group': 'infra', + 'comment': 'home.router', }, 'sfp-sfpplus2': { 'vlan_group': 'infra', + 'comment': 'home.server', }, 'sfp-sfpplus3': { - 'vlan_group': 'infra', + 'vlan_group': 'home', + 'comment': 'home.backups', }, 'sfp-sfpplus4': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp-sfpplus5': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp-sfpplus6': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp-sfpplus7': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp-sfpplus8': { 'vlan_group': 'infra', + 'comment': 'home.switch-vorratsraum-poe', }, 'ether1': { 'vlan_group': 'infra', + 'comment': 'home.switch-rack-poe', }, }, }, diff --git a/nodes/home.switch-rack-poe.py b/nodes/home.switch-rack-poe.py index 4ef0a6d..bb1d437 100644 --- a/nodes/home.switch-rack-poe.py +++ b/nodes/home.switch-rack-poe.py @@ -16,40 +16,43 @@ 'ports': { 'ether1': { 'vlan_group': 'infra', + 'comment': 'home.switch-rack-10g', }, 'ether2': { - 'vlan_group': 'infra', + 'vlan_group': 'home', + 'comment': 'unifi-cloudkey', }, 'ether3': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether4': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether5': { 'vlan_group': 'wokeonlan', - 'comment': 'home.backups wakeonlan', + 'comment': 'home.backups', }, 'ether6': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether7': { - 'vlan_group': 'infra', + 'vlan_group': 'home', + 'comment': 'usv', }, 'ether8': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp9': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp10': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp11': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp12': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, }, }, diff --git a/nodes/home.switch-vorratsraum-poe.py b/nodes/home.switch-vorratsraum-poe.py index 167da90..834796a 100644 --- a/nodes/home.switch-vorratsraum-poe.py +++ b/nodes/home.switch-vorratsraum-poe.py @@ -16,87 +16,92 @@ 'ports': { 'sfp-sfpplus1': { 'vlan_group': 'infra', + 'comment': 'home.switch-rack-10g', }, 'sfp-sfpplus2': { 'vlan_group': 'infra', + 'comment': 'home.switch-wohnzimmer-10g', }, 'sfp-sfpplus3': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'sfp-sfpplus4': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether1': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether2': { 'vlan_group': 'infra', + 'comment': 'switch-gartenhaus-unifi', }, 'ether3': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether4': { 'vlan_group': 'internet', + 'comment': 'fritzbox', }, 'ether5': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether6': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether7': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether8': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether9': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether10': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether11': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether12': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether13': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether14': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether15': { - 'vlan_group': 'infra', + 'vlan_group': 'home', + 'comment': 'noctua-fan', }, 'ether16': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether17': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether18': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether19': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether20': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether21': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether22': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether23': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, 'ether24': { - 'vlan_group': 'infra', + 'vlan_group': 'home', }, }, }, diff --git a/nodes/home.switch-wohnzimmer-10g.py b/nodes/home.switch-wohnzimmer-10g.py index 30b0455..1ee7851 100644 --- a/nodes/home.switch-wohnzimmer-10g.py +++ b/nodes/home.switch-wohnzimmer-10g.py @@ -16,18 +16,23 @@ 'ports': { 'ether1': { 'vlan_group': 'infra', + 'comment': 'home.switch-vorratsraum-poe', }, 'ether2': { 'vlan_group': 'infra', + 'comment': 'wohnzimmer-ap', }, 'ether3': { - 'vlan_group': 'infra', + 'vlan_group': 'home', + 'comment': 'gaming-pc', }, 'ether4': { 'vlan_group': 'infra', + 'comment': 'schreibtisch-dock', }, 'ether5': { 'vlan_group': 'infra', + 'comment': 'switch-wohnzimmer-unifi', }, }, },