metrics: adjustments and removal of unnecessary settings

freifunk-berlin · Nov 11, 2024 · 487eee9 · 487eee9
1 parent 783f78f
commit 487eee9
Show file tree

Hide file tree

Showing 49 changed files with 45 additions and 130 deletions.
diff --git a/locations/bilgi.yml b/locations/bilgi.yml
@@ -32,7 +32,6 @@ networks:
     mesh_ap: bilgi-core
     mesh_radio: 11a_standard
     mesh_iface: mesh
-    mesh_metric: 1024
 
   - vid: 21
     role: mesh
@@ -42,7 +41,6 @@ networks:
     mesh_ap: bilgi-core
     mesh_radio: 11g_standard
     mesh_iface: mesh
-    mesh_metric: 1024
 
   - vid: 40
     role: dhcp

diff --git a/locations/chris.yml b/locations/chris.yml
@@ -105,7 +105,6 @@ networks:
     name: 11s_n_2ghz
     prefix: 10.230.18.167/32
     ipv6_subprefix: -7
-    mesh_metric: 1024
     mesh_ap: chris-n-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh
@@ -115,7 +114,6 @@ networks:
     name: 11s_o_2ghz
     prefix: 10.230.18.169/32
     ipv6_subprefix: -9
-    mesh_metric: 1024
     mesh_ap: chris-o-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh
@@ -125,7 +123,6 @@ networks:
     name: 11s_s_2ghz
     prefix: 10.230.18.170/32
     ipv6_subprefix: -10
-    mesh_metric: 1024
     mesh_ap: chris-s-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh
@@ -135,7 +132,6 @@ networks:
     name: 11s_w_2ghz
     prefix: 10.230.18.171/32
     ipv6_subprefix: -11
-    mesh_metric: 1024
     mesh_ap: chris-w-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh

diff --git a/locations/colbe15.yml b/locations/colbe15.yml
@@ -28,7 +28,6 @@ networks:
     name: mesh_scharni
     prefix: 10.31.52.237/32
     ipv6_subprefix: -3
-    mesh_metric: 2048
     mesh_ap: colbe15-ap1
     mesh_radio: 11a_standard
     mesh_iface: mesh

diff --git a/locations/cralle.yml b/locations/cralle.yml
@@ -65,8 +65,7 @@ networks:
     name: mesh_2ghz
     prefix: 10.31.113.89/32
     ipv6_subprefix: -2
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: cralle-core
     mesh_radio: 11g_standard

diff --git a/locations/dragonkiez-adlerhalle.yml b/locations/dragonkiez-adlerhalle.yml
@@ -67,8 +67,7 @@ networks:
     name: mesh_2ghz
     prefix: 10.31.23.32/32
     ipv6_subprefix: -3
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: dragonkiez-adlerhalle
     mesh_radio: 11g_standard

diff --git a/locations/dragonkiez-dorfplatz.yml b/locations/dragonkiez-dorfplatz.yml
@@ -74,8 +74,7 @@ networks:
     name: mesh_2ghz
     prefix: 10.31.28.245/32
     ipv6_subprefix: -3
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: dragonkiez-dorfplatz
     mesh_radio: 11g_standard
@@ -97,8 +96,7 @@ networks:
     name: mesh2_ap1
     prefix: 10.31.28.247/32
     ipv6_subprefix: -5
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: dragonkiez-dorfplatz-ap1
     mesh_radio: 11g_standard

diff --git a/locations/dragonkiez-kiezraum.yml b/locations/dragonkiez-kiezraum.yml
@@ -68,8 +68,7 @@ networks:
     name: mesh_2ghz
     prefix: 10.31.92.242/32
     ipv6_subprefix: -3
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: dragonkiez-kiezraum
     mesh_radio: 11g_standard

diff --git a/locations/dragonkiez-rathausblock-miami.yml b/locations/dragonkiez-rathausblock-miami.yml
@@ -79,8 +79,7 @@ networks:
     name: mesh2_ap1
     prefix: 10.31.30.25/32
     ipv6_subprefix: -3
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: dragonkiez-rathausblock-miami-ap1
     mesh_radio: 11g_standard
@@ -102,8 +101,7 @@ networks:
     name: mesh2_ap2
     prefix: 10.31.30.27/32
     ipv6_subprefix: -5
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: dragonkiez-rathausblock-miami-ap2
     mesh_radio: 11g_standard

diff --git a/locations/e16outdoor.yml b/locations/e16outdoor.yml
@@ -77,8 +77,7 @@ networks:
     name: mesh_11s_2ghz
     prefix: 10.31.142.33/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: e16outdoor-core
     mesh_radio: 11g_standard

diff --git a/locations/eberswalder7.yml b/locations/eberswalder7.yml
@@ -55,8 +55,7 @@ networks:
     name: mesh_11s_2g
     prefix: 10.31.238.210/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.5']
     mesh_ap: eberswalder7-core
     mesh_radio: 11g_standard

diff --git a/locations/elsekiehl.yml b/locations/elsekiehl.yml
@@ -66,8 +66,7 @@ networks:
     name: mesh_11s_2ghz
     prefix: 10.31.179.33/32
     ipv6_subprefix: -2
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: elsekiehl-core
     mesh_radio: 11g_standard

diff --git a/locations/fffw-lebenshilfe.yml b/locations/fffw-lebenshilfe.yml
@@ -56,7 +56,6 @@ networks:
     name: mesh_nno
     prefix: 10.30.96.43/32
     ipv6_subprefix: -1
-    mesh_metric: 1024
     mesh_ap: fffw-lebenshilfe-nno-ap-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh
@@ -66,7 +65,6 @@ networks:
     name: mesh_nw
     prefix: 10.30.96.44/32
     ipv6_subprefix: -2
-    mesh_metric: 1024
     mesh_ap: fffw-lebenshilfe-nw-ap-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh
@@ -76,7 +74,6 @@ networks:
     name: mesh_sso
     prefix: 10.30.96.45/32
     ipv6_subprefix: -3
-    mesh_metric: 1024
     mesh_ap: fffw-lebenshilfe-sso-ap-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh
@@ -86,7 +83,6 @@ networks:
     name: mesh_ono
     prefix: 10.30.96.46/32
     ipv6_subprefix: -4
-    mesh_metric: 1024
     mesh_ap: fffw-lebenshilfe-ono-ap-2ghz
     mesh_radio: 11g_standard
     mesh_iface: mesh

diff --git a/locations/funkigel.yml b/locations/funkigel.yml
@@ -64,8 +64,7 @@ networks:
     name: mesh_2g
     prefix: 10.248.9.210/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2.4 GHz worse than 5 GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2.4 GHz worse than 5 GHz
     mesh_metric_lqm: ['default 0.5']
     mesh_ap: funkigel
     mesh_radio: 11g_standard

diff --git a/locations/gruni73.yml b/locations/gruni73.yml
@@ -98,7 +98,6 @@ networks:
     name: mesh_11s_o5
     prefix: 10.31.156.40/32
     ipv6_subprefix: -6
-    mesh_metric: 1024
     mesh_ap: gruni73-nf-o-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh
@@ -109,7 +108,6 @@ networks:
     name: mesh_11s_s5
     prefix: 10.31.156.41/32
     ipv6_subprefix: -7
-    mesh_metric: 1024
     mesh_ap: gruni73-nf-s-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh
@@ -120,7 +118,6 @@ networks:
     name: mesh_11s_w5
     prefix: 10.31.156.42/32
     ipv6_subprefix: -8
-    mesh_metric: 1024
     mesh_ap: gruni73-nf-w-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh

diff --git a/locations/habersaath.yml b/locations/habersaath.yml
@@ -103,7 +103,6 @@ networks:
     mesh_ap: habersaath-w-nf-5ghz
     mesh_radio: 11a_standard
     mesh_iface: mesh
-    mesh_metric: 1024
     mesh_metric_lqm:
       - default 0.12   # Penalty so local uplink is preferred
 

diff --git a/locations/hds.yml b/locations/hds.yml
@@ -51,7 +51,6 @@ networks:
     name: wireless0
     prefix: 10.36.166.190/32
     ipv6_subprefix: -1
-    mesh_metric: 1024
     mesh_ap: hds-ffraum
     mesh_radio: 11a_standard
     mesh_iface: mesh
@@ -61,7 +60,6 @@ networks:
     name: wireless1
     prefix: 10.36.166.191/32
     ipv6_subprefix: -2
-    mesh_metric: 1024
     mesh_ap: hds-ffraum
     mesh_radio: 11g_standard
     mesh_iface: mesh

diff --git a/locations/hirschhof.yml b/locations/hirschhof.yml
@@ -32,8 +32,7 @@ networks:
     name: mesh_5ghz
     prefix: 10.31.159.128/32
     ipv6_subprefix: -20
-    # make mesh_metric(s) for 2GHz omni worse than 2GHz directional
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz omni worse than 2GHz directional
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: hirschhof-core
     mesh_radio: 11a_standard
@@ -45,8 +44,7 @@ networks:
     name: mesh_2ghz
     prefix: 10.31.159.129/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz omni worse than 5GHz omni
-    mesh_metric: 2048
+    # make mesh_metric for 2GHz omni worse than 5GHz omni
     mesh_metric_lqm: ['default 0.6']
     mesh_ap: hirschhof-core
     mesh_radio: 11g_standard
@@ -58,7 +56,7 @@ networks:
     name: mesh_k12
     prefix: 10.31.159.130/32
     ipv6_subprefix: -22
-    # adjust mesh_metric(s) to prefer this route
+    # adjust mesh_metric to prefer this route
     mesh_metric: 512
     mesh_ap: hirschhof-k12
     mesh_radio: 11g_standard

diff --git a/locations/huette.yml b/locations/huette.yml
@@ -44,8 +44,7 @@ networks:
   #   name: mesh_11s_2ghz
   #   prefix: 10.31.114.2/32
   #   ipv6_subprefix: -21
-  #   # make mesh_metric(s) for 2GHz worse than 5GHz
-  #   mesh_metric: 1024
+  #   # make mesh_metric for 2GHz worse than 5GHz
   #   mesh_metric_lqm: ['default 0.8']
   #   mesh_ap: huette-core
   #   mesh_radio: 11g_standard

diff --git a/locations/ilr.yml b/locations/ilr.yml
@@ -117,8 +117,7 @@ networks:
     name: mesh_2ghz
     prefix: 10.31.214.19/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: ilr-core
     mesh_radio: 11g_standard

diff --git a/locations/jup.yml b/locations/jup.yml
@@ -65,8 +65,8 @@ networks:
     name: mesh_bht
     prefix: 10.31.147.128/32
     ipv6_subprefix: -1
-    mesh_metric: 2048
-    mesh_metric_lqm: ['default 0.25']
+    mesh_metric: 1024
+    mesh_metric_lqm: ['default 0.5']
     ptp: true
 
   - vid: 11

diff --git a/locations/k11.yml b/locations/k11.yml
@@ -42,8 +42,7 @@ networks:
     name: mesh_2ghz
     prefix: 10.31.185.129/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: k11-core
     mesh_radio: 11g_standard

diff --git a/locations/k12-h1-h3n.yml b/locations/k12-h1-h3n.yml
@@ -41,8 +41,7 @@ networks:
     name: mesh_core_2g
     prefix: 10.248.19.241/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: k12-h1-h3n
     mesh_radio: 11g_standard

diff --git a/locations/k12-h1.yml b/locations/k12-h1.yml
@@ -42,8 +42,7 @@ networks:
     name: mesh_core_2g
     prefix: 10.31.226.146/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: k12-h1-core
     mesh_radio: 11g_standard
@@ -55,7 +54,7 @@ networks:
     name: mesh_lan
     prefix: 10.31.226.147/32
     ipv6_subprefix: -30
-    # adjust mesh_metric(s) to prefer this
+    # adjust mesh_metric to prefer this
     mesh_metric: 128
 
   # DHCP with filtering and isolation

diff --git a/locations/k12-h2.yml b/locations/k12-h2.yml
@@ -71,8 +71,7 @@ networks:
     name: mesh_core_2g
     prefix: 10.31.158.130/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: k12-h2-core
     mesh_radio: 11g_standard
@@ -94,8 +93,7 @@ networks:
     name: mesh_h1s_2g
     prefix: 10.31.158.132/32
     ipv6_subprefix: -23
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: k12-h2-h1s
     mesh_radio: 11g_standard
@@ -107,7 +105,7 @@ networks:
     name: mesh_cpe
     prefix: 10.31.158.133/32
     ipv6_subprefix: -24
-    # adjust mesh_metric(s) to prefer this route
+    # adjust mesh_metric to prefer this route
     mesh_metric: 256
     mesh_ap: k12-h2-cpe
     mesh_radio: 11a_standard
@@ -119,7 +117,7 @@ networks:
     name: mesh_lan
     prefix: 10.31.226.134/32
     ipv6_subprefix: -30
-    # adjust mesh_metric(s) to prefer this route
+    # adjust mesh_metric to prefer this route
     mesh_metric: 128
 
   # DHCP

diff --git a/locations/k12-h3-v0s.yml b/locations/k12-h3-v0s.yml
@@ -42,8 +42,7 @@ networks:
     name: mesh_core_2g
     prefix: 10.31.227.145/32
     ipv6_subprefix: -21
-    # make mesh_metric(s) for 2GHz worse than 5GHz
-    mesh_metric: 1024
+    # make mesh_metric for 2GHz worse than 5GHz
     mesh_metric_lqm: ['default 0.8']
     mesh_ap: k12-h3-v0s
     mesh_radio: 11g_standard