config/switch: cleanup

This commit is contained in:
Astro 2021-11-15 03:33:22 +01:00
parent e56014dae9
commit 97c2b819a8
1 changed files with 90 additions and 239 deletions

View File

@ -3,21 +3,11 @@
switch-a1 = {
interfaces = { mgmt.type = "phys"; };
links = {
iso4 = {
ports = [ "1" ];
};
priv25 = {
ports = [ "2" "3" "4" "5" ];
};
priv31 = {
ports = [ "6" ];
};
pub = {
ports = [ "8" ];
};
switch-c1 = {
ports = [ "7" ];
};
iso4.ports = [ "1" ];
priv25.ports = [ "2" "3" "4" "5" ];
priv31.ports = [ "6" ];
pub.ports = [ "8" ];
switch-c1.ports = [ "7" ];
};
location = "Saal A";
model = "TL-SG3210";
@ -26,33 +16,15 @@
switch-b1 = {
interfaces = { mgmt.type = "phys"; };
links = {
ap23 = {
ports = [ "g10" ];
};
ap8 = {
ports = [ "g16" ];
};
c3d2 = {
ports = [ "g23" ];
};
iso1 = {
ports = [ "g2" ];
};
iso2 = {
ports = [ "g3" ];
};
iso3 = {
ports = [ "g4" ];
};
mgmt = {
ports = [ "g1" ];
};
serv = {
ports = [ "g22" ];
};
server1 = {
ports = [ "g24" ];
};
ap23.ports = [ "g10" ];
ap8.ports = [ "g16" ];
c3d2.ports = [ "g23" ];
iso1.ports = [ "g2" ];
iso2.ports = [ "g3" ];
iso3.ports = [ "g4" ];
mgmt.ports = [ "g1" ];
serv.ports = [ "g22" ];
server1.ports = [ "g24" ];
server2 = {
group = "1";
ports = [ "g12" "g38" "g39" "g40" ];
@ -85,9 +57,7 @@
group = "4";
ports = [ "g41" "g42" "g43" "g44" ];
};
switch-d1 = {
ports = [ "g34" ];
};
switch-d1.ports = [ "g34" ];
};
location = "Haus B Souterrain";
model = "linksys-srw2048";
@ -96,101 +66,47 @@
switch-b2 = {
interfaces = { mgmt.type = "phys"; };
links = {
ap1 = {
ports = [ "GigabitEthernet 1/0/8" ];
};
ap11 = {
ports = [ "GigabitEthernet 1/0/10" ];
};
ap15 = {
ports = [ "GigabitEthernet 1/0/12" ];
};
ap18 = {
ports = [ "GigabitEthernet 1/0/18" ];
};
ap24 = {
ports = [ "GigabitEthernet 1/0/34" ];
};
ap25 = {
ports = [ "GigabitEthernet 1/0/35" ];
};
ap29 = {
ports = [ "GigabitEthernet 1/0/36" ];
};
ap30 = {
ports = [ "GigabitEthernet 1/0/22" ];
};
ap35 = {
ports = [ "GigabitEthernet 1/0/23" ];
};
ap37 = {
ports = [ "GigabitEthernet 1/0/39" ];
};
ap39 = {
ports = [ "GigabitEthernet 1/0/17" ];
};
ap40 = {
ports = [ "GigabitEthernet 1/0/21" ];
};
ap41 = {
ports = [ "GigabitEthernet 1/0/37" ];
};
ap42 = {
ports = [ "GigabitEthernet 1/0/6" ];
};
ap5 = {
ports = [ "GigabitEthernet 1/0/7" ];
};
ap51 = {
ports = [ "GigabitEthernet 1/0/13" ];
};
ap53 = {
ports = [ "GigabitEthernet 1/0/15" ];
};
ap54 = {
ports = [ "GigabitEthernet 1/0/38" ];
};
ap55 = {
ports = [ "GigabitEthernet 1/0/19" ];
};
ap56 = {
ports = [ "GigabitEthernet 1/0/9" ];
};
mgmt = {
ports = [
"GigabitEthernet1/0/1"
"GigabitEthernet1/0/41"
"GigabitEthernet1/0/42"
"GigabitEthernet1/0/43"
"GigabitEthernet1/0/44"
"GigabitEthernet1/0/45"
"GigabitEthernet1/0/46"
"GigabitEthernet1/0/47"
"GigabitEthernet1/0/48"
];
};
priv1 = {
ports = [ "GigabitEthernet 1/0/3" ];
};
priv19 = {
ports = [ "GigabitEthernet 1/0/40" ];
};
priv2 = {
ports = [ "GigabitEthernet 1/0/4" ];
};
priv24 = {
ports = [ "GigabitEthernet 1/0/14" "GigabitEthernet 1/0/16" ];
};
priv3 = {
ports = [ "GigabitEthernet 1/0/5" ];
};
pub = {
ports = [
"GigabitEthernet 1/0/11"
"GigabitEthernet 1/0/20"
"GigabitEthernet 1/0/24"
];
};
ap1.ports = [ "GigabitEthernet 1/0/8" ];
ap11.ports = [ "GigabitEthernet 1/0/10" ];
ap15.ports = [ "GigabitEthernet 1/0/12" ];
ap18.ports = [ "GigabitEthernet 1/0/18" ];
ap24.ports = [ "GigabitEthernet 1/0/34" ];
ap25.ports = [ "GigabitEthernet 1/0/35" ];
ap29.ports = [ "GigabitEthernet 1/0/36" ];
ap30.ports = [ "GigabitEthernet 1/0/22" ];
ap35.ports = [ "GigabitEthernet 1/0/23" ];
ap37.ports = [ "GigabitEthernet 1/0/39" ];
ap39.ports = [ "GigabitEthernet 1/0/17" ];
ap40.ports = [ "GigabitEthernet 1/0/21" ];
ap41.ports = [ "GigabitEthernet 1/0/37" ];
ap42.ports = [ "GigabitEthernet 1/0/6" ];
ap5.ports = [ "GigabitEthernet 1/0/7" ];
ap51.ports = [ "GigabitEthernet 1/0/13" ];
ap53.ports = [ "GigabitEthernet 1/0/15" ];
ap54.ports = [ "GigabitEthernet 1/0/38" ];
ap55.ports = [ "GigabitEthernet 1/0/19" ];
ap56.ports = [ "GigabitEthernet 1/0/9" ];
mgmt.ports = [
"GigabitEthernet1/0/1"
"GigabitEthernet1/0/41"
"GigabitEthernet1/0/42"
"GigabitEthernet1/0/43"
"GigabitEthernet1/0/44"
"GigabitEthernet1/0/45"
"GigabitEthernet1/0/46"
"GigabitEthernet1/0/47"
"GigabitEthernet1/0/48"
];
priv1.ports = [ "GigabitEthernet 1/0/3" ];
priv19.ports = [ "GigabitEthernet 1/0/40" ];
priv2.ports = [ "GigabitEthernet 1/0/4" ];
priv24.ports = [ "GigabitEthernet 1/0/14" "GigabitEthernet 1/0/16" ];
priv3.ports = [ "GigabitEthernet 1/0/5" ];
pub.ports = [
"GigabitEthernet 1/0/11"
"GigabitEthernet 1/0/20"
"GigabitEthernet 1/0/24"
];
server3 = {
group = "1";
ports = [ "GigabitEthernet1/0/30" "GigabitEthernet1/0/31" ];
@ -221,36 +137,16 @@
switch-c1 = {
interfaces = { mgmt.type = "phys"; };
links = {
ap17 = {
ports = [ "19" ];
};
ap19 = {
ports = [ "17" ];
};
ap26 = {
ports = [ "18" ];
};
ap38 = {
ports = [ "7" ];
};
iso1 = {
ports = [ "9" ];
};
iso2 = {
ports = [ "10" ];
};
iso3 = {
ports = [ "11" ];
};
iso4 = {
ports = [ "12" ];
};
iso5 = {
ports = [ "13" ];
};
iso6 = {
ports = [ "14" ];
};
ap17.ports = [ "19" ];
ap19.ports = [ "17" ];
ap26.ports = [ "18" ];
ap38.ports = [ "7" ];
iso1.ports = [ "9" ];
iso2.ports = [ "10" ];
iso3.ports = [ "11" ];
iso4.ports = [ "12" ];
iso5.ports = [ "13" ];
iso6.ports = [ "14" ];
switch-a1 = {
group = "1";
ports = [ "15-16" ];
@ -259,18 +155,10 @@
group = "2";
ports = [ "21-24" ];
};
switch-dach = {
ports = [ "6" ];
};
up1 = {
ports = [ "1" ];
};
up2 = {
ports = [ "2" ];
};
up4 = {
ports = [ "4" ];
};
switch-dach.ports = [ "6" ];
up1.ports = [ "1" ];
up2.ports = [ "2" ];
up4.ports = [ "4" ];
};
location = "Turm C Keller, bei Kabelanschluessen";
model = "HP-procurve-2824";
@ -279,30 +167,15 @@
switch-c3d2-main = {
interfaces = { mgmt.type = "phys"; };
links = {
ap-test1 = {
ports = [ "4" ];
};
ap-test2 = {
ports = [ "5" ];
};
ap2 = {
ports = [ "3" ];
};
ap31 = {
ports = [ "2" ];
};
bmx = {
ports = [ "7" ];
};
c3d2 = {
ports = [ "8-20" ];
};
iso4 = {
ports = [ "6" ];
};
mgmt = {
ports = [ "1" ];
};
ap-test1.ports = [ "4" ];
ap-test2.ports = [ "5" ];
# TODO: ap33
ap2.ports = [ "3" ];
ap31.ports = [ "2" ];
bmx.ports = [ "7" ];
c3d2.ports = [ "8-20" ];
iso4.ports = [ "6" ];
mgmt.ports = [ "1" ];
switch-b1 = {
group = "1";
ports = [ "21-24" ];
@ -315,24 +188,12 @@
switch-d1 = {
interfaces = { mgmt.type = "phys"; };
links = {
ap10 = {
ports = [ "4" ];
};
ap12 = {
ports = [ "7" ];
};
ap22 = {
ports = [ "2" ];
};
ap3 = {
ports = [ "3" ];
};
ap7 = {
ports = [ "8" ];
};
ap9 = {
ports = [ "5" ];
};
ap10.ports = [ "4" ];
ap12.ports = [ "7" ];
ap22.ports = [ "2" ];
ap3.ports = [ "3" ];
ap7.ports = [ "8" ];
ap9.ports = [ "5" ];
switch-b1 = {
group = "1";
ports = [ "1" ];
@ -345,21 +206,11 @@
switch-dach = {
interfaces = { mgmt.type = "phys"; };
links = {
bmx = {
ports = [ "10-19" ];
};
mgmt = {
ports = [ "1" ];
};
serv = {
ports = [ "6-9" ];
};
switch-c1 = {
ports = [ "24" ];
};
up3 = {
ports = [ "3" ];
};
bmx.ports = [ "10-19" ];
mgmt.ports = [ "1" ];
serv.ports = [ "6-9" ];
switch-c1.ports = [ "24" ];
up3.ports = [ "3" ];
};
location = "Dach";
model = "HP-procurve-2824";