2017-09-11 Technik/Richtfunk/Geraetekonfiguration/FF-DO-BB-*.cfg (Umkonfiguration nach Umbau auf L.A.-Dach (neue P2P-Verbindung LA<->B31), VLANs 302X fuer Messung der RiFu-Strecke mit ID 2X (incl. Änderungen MSTI 2,3), SNMP für ersten Einsatz des snmp_exporters)

Ignore-this: d564bf8694e13a613f725d57c8e09aa7

Technik/Richtfunk/Geraetekonfiguration/FF-DO-BB-Braunschweiger1-sw1.cfg

@@ -1,6 +1,6 @@
 !TL-SG3210
 #
-vlan 700,2005,2010,2020-2021,3007,4001-4010
+vlan 700,2005,2010,2020-2021,2023,3007,3020-3021,3023,4001-4010
 #
 vlan 700
 name "L.A.-DHCP"
@@ -12,14 +12,26 @@ vlan 2010
 name "Mesh local"
 #
 vlan 2020
-name "RundstrahlerR5AC"
+name "Mesh LA-Rund"
 #
 vlan 2021
-name "LA-L8-NB5AC"
+name "Mesh LA-L8"
+#
+vlan 2023
+name "Mesh LA-B31"
 #
 vlan 3007
 name "mesh-7-lan"
 #
+vlan 3020
+name "Messung LA-Rund"
+#
+vlan 3021
+name "Messung LA-L8"
+#
+vlan 3023
+name "Messung LA-B31"
+#
 vlan 4001
 name "/dev/null port 1"
 #
@@ -60,9 +72,9 @@ mac address-table aging-time 300
 logging buffer 6
 no logging file flash
 #
-enable secret 5 $1$B0B2B>B8G9E6J4J6D2H8D9@=D9H/A>L2$'}./
+enable secret 5 $1$...
 #
-system-time ntp UTC+01:00 172.24.4.10 172.24.1.10 1
+system-time ntp UTC+01:00 172.24.4.10 172.24.1.11 1
 system-time dst predefined Europe
 #
 spanning-tree
@@ -70,11 +82,11 @@ spanning-tree mode mstp
 spanning-tree mst configuration
   name FF-DO-BB
   instance 1 vlan 2005,
-  instance 2 vlan 2020-2021,
-  instance 3 vlan 3007,
+  instance 2 vlan 700,2020-2021,2023,3007,3021,3023,
+  instance 3 vlan 3020,
 #
 #
-user name admin privilege admin secret 5 $1$B0B2B>B8G9E6J4J6D2H8D9@=D9H/A>L2$'}./
+user name admin privilege admin secret 5 $1$...
 #
 #
 #
@@ -87,17 +99,18 @@ ip ssh server
 interface gigabitEthernet 1/0/1
   switchport mode general
   switchport general allowed vlan 2005 untagged
-  switchport general allowed vlan 700,2020,3007 tagged
+  switchport general allowed vlan 700,2020,3007,3020 tagged
   switchport pvid 2005
   description "FF-DO-BB-B1-NB1"
   spanning-tree
+  spanning-tree common-config point-to-point close
   spanning-tree mst instance 1 port-priority 128 cost 1000
   spanning-tree mst instance 2 port-priority 128 cost 1000
 #
 interface gigabitEthernet 1/0/2
   switchport mode general
   switchport general allowed vlan 2005 untagged
-  switchport general allowed vlan 700,2020,3007 tagged
+  switchport general allowed vlan 700,2020,3007,3020 tagged
   switchport pvid 2005
   description "FF-DO-BB-B1-NB2"
   spanning-tree
@@ -105,21 +118,24 @@ interface gigabitEthernet 1/0/2
 #
 interface gigabitEthernet 1/0/3
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,3007,4003
+  switchport trunk allowed vlan 2005,2010,2020,3007,3020,4003
   switchport pvid 4003
   description "Trunk"
   spanning-tree
 #
 interface gigabitEthernet 1/0/4
   switchport mode trunk
-  switchport trunk allowed vlan 2005,3007,4004
+  switchport trunk allowed vlan 2005,3007,3020,4004
   switchport pvid 4004
   description "FF-DO-neu"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/5
   switchport access vlan 2005
   description "Management"
+  speed 10
+  duplex half
   spanning-tree
   spanning-tree common-config portfast enable
 #
@@ -127,15 +143,17 @@ interface gigabitEthernet 1/0/6
   switchport access vlan 2010
   description "Mesh local"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/7
   switchport access vlan 2020
   description "FF-DO-alt"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/8
   switchport mode trunk
-  switchport trunk allowed vlan 700,2005,2010,2020,3007,4008
+  switchport trunk allowed vlan 700,2005,2010,3007,3020,4008
   switchport pvid 4008
   description "Trunk 3. OG Cu"
   speed 1000
@@ -147,7 +165,7 @@ interface gigabitEthernet 1/0/8
 #
 interface gigabitEthernet 1/0/9
   switchport mode trunk
-  switchport trunk allowed vlan 700,2005,2010,2020,3007,4008
+  switchport trunk allowed vlan 700,2005,2010,3007,3020,4008
   switchport pvid 4008
   description "Trunk 3. OG SiO2"
   speed 1000

Technik/Richtfunk/Geraetekonfiguration/FF-DO-BB-Braunschweiger1-sw2.cfg

@@ -1,6 +1,6 @@
 !TL-SG3210
 #
-vlan 700,2005,2010,2020-2021,3007,4001-4010
+vlan 700,2005,2010,2020-2021,2023,3007,3020-3021,3023,4001-4010
 #
 vlan 700
 name "L.A.-DHCP"
@@ -12,14 +12,26 @@ vlan 2010
 name "Mesh local"
 #
 vlan 2020
-name "RundstrahlerR5AC"
+name "Mesh LA-Rund"
 #
 vlan 2021
-name "LA-L8-NB5AC"
+name "Mesh LA-L8"
+#
+vlan 2023
+name "Mesh LA-B31"
 #
 vlan 3007
 name "mesh-7-lan"
 #
+vlan 3020
+name "Messung LA-Rund"
+#
+vlan 3021
+name "Messung LA-L8"
+#
+vlan 3023
+name "Messung LA-B31"
+#
 vlan 4001
 name "/dev/null port 1"
 #
@@ -60,9 +72,9 @@ mac address-table aging-time 300
 logging buffer 6
 no logging file flash
 #
-enable secret 5 $1$B0B2B>B8G9E6J4J6D2H8D9@=D9H/A>L2$'}./
+enable secret 5 $1$...
 #
-system-time ntp UTC+01:00 172.24.4.10 172.24.1.10 1
+system-time ntp UTC+01:00 172.24.4.10 172.24.1.11 1
 system-time dst predefined Europe
 #
 spanning-tree
@@ -70,11 +82,11 @@ spanning-tree mode mstp
 spanning-tree mst configuration
   name FF-DO-BB
   instance 1 vlan 2005,
-  instance 2 vlan 2020-2021,
-  instance 3 vlan 3007,
+  instance 2 vlan 700,2020-2021,2023,3007,3021,3023,
+  instance 3 vlan 3020,
 #
 #
-user name admin privilege admin secret 5 $1$B0B2B>B8G9E6J4J6D2H8D9@=D9H/A>L2$'}./
+user name admin privilege admin secret 5 $1$...
 #
 #
 #
@@ -87,24 +99,29 @@ ip ssh server
 interface gigabitEthernet 1/0/1
   switchport access vlan 700
   description "L.A.-DHCP"
+  spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/2
   switchport access vlan 700
   description "L.A.-DHCP"
+  spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/3
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,3007,4003
+  switchport trunk allowed vlan 2005,2010,3007,3020,4003
   switchport pvid 4003
   description "Trunk"
   spanning-tree
 #
 interface gigabitEthernet 1/0/4
   switchport mode trunk
-  switchport trunk allowed vlan 2005,3007,4004
+  switchport trunk allowed vlan 2005,3007,3020,4004
   switchport pvid 4004
   description "FF-DO-neu"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/5
   switchport access vlan 2005
@@ -116,15 +133,17 @@ interface gigabitEthernet 1/0/6
   switchport access vlan 2010
   description "Mesh local"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/7
   switchport access vlan 2010
   description "Mesh local"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/8
   switchport mode trunk
-  switchport trunk allowed vlan 700,2005,2010,2020,3007,4008
+  switchport trunk allowed vlan 700,2005,2010,3007,3020,4008
   switchport pvid 4008
   description "Trunk Dach Cu"
   speed 1000
@@ -136,7 +155,7 @@ interface gigabitEthernet 1/0/8
 #
 interface gigabitEthernet 1/0/9
   switchport mode trunk
-  switchport trunk allowed vlan 700,2005,2010,2020,3007,4008
+  switchport trunk allowed vlan 700,2005,2010,3007,3020,4008
   switchport pvid 4008
   description "Trunk Dach SiO2"
   speed 1000

Technik/Richtfunk/Geraetekonfiguration/FF-DO-BB-Braunschweiger31-sw1.cfg

@@ -1,6 +1,9 @@
 !TL-SG3210
 #
-vlan 2005,2010,2020-2021,3007,4001-4010
+vlan 700,2005,2010,2020-2021,2023,3007,3020-3021,3023,4001-4010
+#
+vlan 700
+name "LA-Hausnetz"
 #
 vlan 2005
 name "Management"
@@ -9,14 +12,26 @@ vlan 2010
 name "Mesh local"
 #
 vlan 2020
-name "RundstrahlerR5AC"
+name "Mesh LA-Rund"
 #
 vlan 2021
-name "LA-L8-NB5AC"
+name "Mesh LA-L8"
+#
+vlan 2023
+name "Mesh LA-B31"
 #
 vlan 3007
 name "mesh-7-lan"
 #
+vlan 3020
+name "Messung LA-Rund"
+#
+vlan 3021
+name "Messung LA-L8"
+#
+vlan 3023
+name "Messung LA-B31"
+#
 vlan 4001
 name "/dev/null port 1"
 #
@@ -59,7 +74,7 @@ no logging file flash
 #
 enable secret 5 $1$...
 #
-system-time ntp UTC+01:00 172.24.3.10 172.24.1.10 1
+system-time ntp UTC+01:00 172.24.3.10 172.24.1.11 1
 system-time dst predefined Europe
 #
 spanning-tree
@@ -67,8 +82,8 @@ spanning-tree mode mstp
 spanning-tree mst configuration
   name FF-DO-BB
   instance 1 vlan 2005,
-  instance 2 vlan 2020-2021,
-  instance 3 vlan 3007,
+  instance 2 vlan 700,2020-2021,2023,3007,3021,3023,
+  instance 3 vlan 3020,
 #
 #
 user name admin privilege admin secret 5 $1$...
@@ -78,16 +93,20 @@ user name admin privilege admin secret 5 $1$...
 #
 #
 #
+snmp-server
+snmp-server community "..." read-only "viewDefault"
 #
 ip ssh server 
 #
 interface gigabitEthernet 1/0/1
   switchport mode general
   switchport general allowed vlan 2005 untagged
-  switchport general allowed vlan 2020,3007 tagged
+  switchport general allowed vlan 2020,3007,3020 tagged
   switchport pvid 2005
   description "FF-DO-BB-B31-NB1"
   spanning-tree
+  spanning-tree common-config int-cost 50000
+  spanning-tree common-config point-to-point close
   spanning-tree mst instance 3 port-priority 128 cost 1000
 #
 interface gigabitEthernet 1/0/2
@@ -95,17 +114,18 @@ interface gigabitEthernet 1/0/2
 #
 interface gigabitEthernet 1/0/3
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,3007,4003
+  switchport trunk allowed vlan 2005,2010,3007,3020,3023,4003
   switchport pvid 4003
   description "Trunk-Dose-6"
   spanning-tree
 #
 interface gigabitEthernet 1/0/4
   switchport mode trunk
-  switchport trunk allowed vlan 2005,3007,4004
+  switchport trunk allowed vlan 2005,3007,3020,3023,4004
   switchport pvid 4004
   description "FF-DO-neu"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/5
   switchport access vlan 2005
@@ -117,15 +137,17 @@ interface gigabitEthernet 1/0/6
   switchport access vlan 2010
   description "Mesh local"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/7
   switchport access vlan 2020
   description "FF-DO-alt"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/8
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,3007,4008
+  switchport trunk allowed vlan 2005,2010,2020,2023,3007,3020,3023,4008
   switchport pvid 4008
   description "Trunk Dach Cu"
   speed 1000
@@ -137,7 +159,7 @@ interface gigabitEthernet 1/0/8
 #
 interface gigabitEthernet 1/0/9
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,3007,4008
+  switchport trunk allowed vlan 2005,2010,2020,2023,3007,3020,3023,4008
   switchport pvid 4008
   description "Trunk Dach SiO2"
   speed 1000

Technik/Richtfunk/Geraetekonfiguration/FF-DO-BB-Braunschweiger31-sw2.cfg

@@ -1,6 +1,9 @@
 !TL-SG2008
 #
-vlan 2005,2010,2020-2021,3007,4001-4008
+vlan 700,2005,2010,2020-2021,2023,3007,3020-3021,3023,4001-4008
+#
+vlan 700
+name "LA-Hausnetz"
 #
 vlan 2005
 name "Management"
@@ -9,14 +12,50 @@ vlan 2010
 name "Mesh local"
 #
 vlan 2020
-name "RundstrahlerR5AC"
+name "Mesh LA-Rund"
 #
 vlan 2021
-name "LA-L8-NB5AC"
+name "Mesh LA-L8"
+#
+vlan 2023
+name "Mesh LA-B31"
 #
 vlan 3007
 name "mesh-7-lan"
 #
+vlan 3020
+name "Messung LA-Rund"
+#
+vlan 3021
+name "Messung LA-L8"
+#
+vlan 3023
+name "Messung LA-B31"
+#
+vlan 4001
+name "/dev/null port 1"
+#
+vlan 4002
+name "/dev/null port 2"
+#
+vlan 4003
+name "/dev/null port 3"
+#
+vlan 4004
+name "/dev/null port 4"
+#
+vlan 4005
+name "/dev/null port 5"
+#
+vlan 4006
+name "/dev/null port 6"
+#
+vlan 4007
+name "/dev/null port 7"
+#
+vlan 4008
+name "/dev/null port 8"
+#
 #
 #
 #
@@ -26,7 +65,7 @@ mac address-table aging-time 300
 #
 #
 #
-system-time ntp UTC+01:00 172.24.255.10 172.24.1.10 1
+system-time ntp UTC+01:00 172.24.3.10 172.24.1.11 1
 system-time dst predefined Europe
 #
 spanning-tree
@@ -34,8 +73,8 @@ spanning-tree mode mstp
 spanning-tree mst configuration
   name FF-DO-BB
   instance 1 vlan 2005,
-  instance 2 vlan 2020-2021,
-  instance 3 vlan 3007,
+  instance 2 vlan 700,2020-2021,2023,3007,3021,3023,
+  instance 3 vlan 3020,
 #
 #
 user name admin privilege admin secret 5 $1$...
@@ -67,7 +106,7 @@ interface gigabitEthernet 1/0/2
 #
 interface gigabitEthernet 1/0/3
   switchport general allowed vlan 4003 untagged
-  switchport general allowed vlan 2005,2010,2020,3007 tagged
+  switchport general allowed vlan 2005,2010,3007,3020,3023 tagged
   switchport pvid 4003
   description "Trunk Dose 6"
   
@@ -75,7 +114,7 @@ interface gigabitEthernet 1/0/3
 #
 interface gigabitEthernet 1/0/4
   switchport general allowed vlan 4004 untagged
-  switchport general allowed vlan 2005,3007 tagged
+  switchport general allowed vlan 2005,3007,3020,3023 tagged
   switchport pvid 4004
   description "FF-DO-neu"
   
@@ -96,6 +135,7 @@ interface gigabitEthernet 1/0/6
   description "Dose 9 EG"
   
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/7
   switchport general allowed vlan 2010 untagged
@@ -103,6 +143,7 @@ interface gigabitEthernet 1/0/7
   description "Dose 13 3.OG"
   
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/8
   switchport general allowed vlan 2010 untagged
@@ -110,6 +151,7 @@ interface gigabitEthernet 1/0/8
   description "Dose 11 1.OG"
   
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 ip management-vlan 2005
 interface vlan 2005

Technik/Richtfunk/Geraetekonfiguration/FF-DO-BB-Braunschweiger31-sw3.cfg

@@ -1,6 +1,9 @@
 !TL-SG3210
 #
-vlan 2005,2010,2020-2021,3007,4001-4010
+vlan 700,2005,2010,2020-2021,2023,3007,3020-3021,3023,4001-4010
+#
+vlan 700
+name "LA-Hausnetz"
 #
 vlan 2005
 name "Management"
@@ -14,9 +17,21 @@ name "RundstrahlerR5AC"
 vlan 2021
 name "LA-L8-NB5AC"
 #
+vlan 2023
+name "Mesh LA-B31"
+#
 vlan 3007
 name "mesh-7-lan"
 #
+vlan 3020
+name "Messung LA-Rund"
+#
+vlan 3021
+name "Messung LA-L8"
+#
+vlan 3023
+name "Messung LA-B31"
+#
 vlan 4001
 name "/dev/null port 1"
 #
@@ -59,7 +74,7 @@ no logging file flash
 #
 enable secret 5 $1$...
 #
-system-time ntp UTC+01:00 172.24.3.10 172.24.1.10 1
+system-time ntp UTC+01:00 172.24.3.10 172.24.1.11 1
 system-time dst predefined Europe
 #
 spanning-tree
@@ -67,8 +82,8 @@ spanning-tree mode mstp
 spanning-tree mst configuration
   name FF-DO-BB
   instance 1 vlan 2005,
-  instance 2 vlan 2020-2021,
-  instance 3 vlan 3007,
+  instance 2 vlan 700,2020-2021,2023,3007,3021,3023,
+  instance 3 vlan 3020,
 #
 #
 user name admin privilege admin secret 5 $1$...
@@ -78,16 +93,19 @@ user name admin privilege admin secret 5 $1$...
 #
 #
 #
+snmp-server
+snmp-server community "..." read-only "viewDefault"
 #
 ip ssh server 
 #
 interface gigabitEthernet 1/0/1
   switchport mode general
   switchport general allowed vlan 2005 untagged
-  switchport general allowed vlan 2020,3007 tagged
+  switchport general allowed vlan 2020,2023,3007,3023 tagged
   switchport pvid 2005
   description "FF-DO-BB-B31-NB2"
   spanning-tree
+  spanning-tree common-config point-to-point open
   spanning-tree mst instance 1 port-priority 128 cost 1000
   spanning-tree mst instance 2 port-priority 128 cost 1000
 #
@@ -104,7 +122,7 @@ interface gigabitEthernet 1/0/2
 #
 interface gigabitEthernet 1/0/3
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,3007,4003
+  switchport trunk allowed vlan 2005,2010,2020,2023,3007,3020,3023,4003
   switchport pvid 4003
   description "Trunk 2.OG Cu"
   speed 1000
@@ -115,10 +133,11 @@ interface gigabitEthernet 1/0/3
 #
 interface gigabitEthernet 1/0/4
   switchport mode trunk
-  switchport trunk allowed vlan 2005,3007,4004
+  switchport trunk allowed vlan 2005,3007,3020,3023,4004
   switchport pvid 4004
   description "FF-DO-neu"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/5
   switchport access vlan 2005
@@ -130,22 +149,25 @@ interface gigabitEthernet 1/0/6
   switchport access vlan 2010
   description "FF-DO-B31-West"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/7
   switchport access vlan 2010
   description "FF-DO-B31-Ost"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/8
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,4008
+  switchport trunk allowed vlan 2005,2010,2020,2023,4008
   switchport pvid 4008
   description "FF-DO-BB-B31-krn"
   spanning-tree
+  spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/9
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020,3007,4003
+  switchport trunk allowed vlan 2005,2010,2020,2023,3007,3020,3023,4003
   switchport pvid 4003
   description "Trunk 2.OG SiO2"
   speed 1000

Technik/Richtfunk/Geraetekonfiguration/FF-DO-BB-LA-sw1.cfg

@@ -1,6 +1,6 @@
 !TL-SG3210
 #
-vlan 400,700,2005,2010,2020-2021,3007,4001-4010
+vlan 400,700,2005,2010,2020-2021,2023,3007,3020-3021,3023,4001-4010
 #
 vlan 400
 name "transAS35675"
@@ -15,14 +15,26 @@ vlan 2010
 name "Mesh local"
 #
 vlan 2020
-name "RundstrahlerR5AC"
+name "Mesh LA-Rund"
 #
 vlan 2021
-name "Mesh L8"
+name "Mesh LA-L8"
+#
+vlan 2023
+name "Mesh LA-B31"
 #
 vlan 3007
 name "mesh-7-lan"
 #
+vlan 3020
+name "Messung LA-Rund"
+#
+vlan 3021
+name "Messung LA-L8"
+#
+vlan 3023
+name "Messung LA-B31"
+#
 vlan 4001
 name "/dev/null port 1"
 #
@@ -63,7 +75,7 @@ mac address-table aging-time 300
 logging buffer 6
 no logging file flash
 #
-enable secret 5 $1$O9G3O<C>H1M1K;E1M6N6O1O3N5L0E<N9/({}%
+enable secret 5 $1$...
 #
 system-time ntp UTC+01:00 172.24.1.11 172.24.2.10 1
 system-time dst predefined Europe
@@ -77,51 +89,57 @@ spanning-tree mst instance 3 priority 28672
 spanning-tree mst configuration
   name FF-DO-BB
   instance 1 vlan 2005,
-  instance 2 vlan 2020-2021,
-  instance 3 vlan 3007,
+  instance 2 vlan 700,2020-2021,2023,3007,3021,3023,
+  instance 3 vlan 3020,
 #
 #
-user name admin privilege admin secret 5 $1$O9G3O<C>H1M1K;E1M6N6O1O3N5L0E<N9/({}%
+user name admin privilege admin secret 5 $1$...
 #
 #
 #
 #
 #
 #
+snmp-server
+snmp-server community "..." read-only "viewDefault"
 #
 ip ssh server 
 #
 interface gigabitEthernet 1/0/1
   switchport mode general
   switchport general allowed vlan 2005 untagged
-  switchport general allowed vlan 700,2020,3007 tagged
+  switchport general allowed vlan 700,2020,3007,3020 tagged
   switchport pvid 2005
   description "FF-DO-BB-LA-Rund"
   speed 1000
   duplex full
   spanning-tree
+  spanning-tree common-config point-to-point close
   spanning-tree mst instance 2 port-priority 128 cost 1000
 #
 interface gigabitEthernet 1/0/2
   switchport mode general
   switchport general allowed vlan 2005 untagged
-  switchport general allowed vlan 700,2021,3007 tagged
+  switchport general allowed vlan 700,2021,3007,3021 tagged
   switchport pvid 2005
   description "FF-DO-BB-LA-L8"
   spanning-tree
   spanning-tree mst instance 2 port-priority 128 cost 1000
 #
 interface gigabitEthernet 1/0/3
-  switchport mode trunk
-  switchport trunk allowed vlan 2005,4003
-  switchport pvid 4003
-  description "port 3 unused"
-  shutdown
+  switchport mode general
+  switchport general allowed vlan 2005 untagged
+  switchport general allowed vlan 700,2020,2023,3007,3023 tagged
+  switchport pvid 2005
+  description "FF-DO-BB-LA-B31"
+  duplex full
+  spanning-tree
+  spanning-tree mst instance 2 port-priority 128 cost 1000
 #
 interface gigabitEthernet 1/0/4
   switchport mode general
   switchport general allowed vlan 700 untagged
-  switchport general allowed vlan 400,2005,3007 tagged
+  switchport general allowed vlan 400,2005,3007,3020-3021,3023 tagged
   switchport pvid 700
   description "FF-neu APU"
   spanning-tree
@@ -134,11 +152,8 @@ interface gigabitEthernet 1/0/5
   spanning-tree common-config portfast enable
 #
 interface gigabitEthernet 1/0/6
-  switchport mode general
-  switchport general allowed vlan 700 untagged
-  switchport general allowed vlan 400,2005,3007 tagged
-  switchport pvid 700
-  description "ALIX"
+  switchport access vlan 2010
+  description "FF-DO-LA-West"
   spanning-tree
   spanning-tree common-config portfast enable
 #
@@ -150,7 +165,7 @@ interface gigabitEthernet 1/0/7
 #
 interface gigabitEthernet 1/0/8
   switchport mode trunk
-  switchport trunk allowed vlan 2005,2010,2020-2021,4008
+  switchport trunk allowed vlan 2005,2010,2020-2021,2023,4008
   switchport pvid 4008
   description "FF-DO-BB-LA-kern"
   spanning-tree