Merge pull request 'unifi_devices.json aktualisiert' (#105) from angro-patch-58 into master

Reviewed-on: Freifunk-Rhein-Sieg/ubnt-api-devices#105

.drone.yml

@@ -1,17 +0,0 @@
-kind: pipeline
-name: validate-json
-
-steps:
-- name: validate ucDevices.json
-  image: fftdf/docker-json-validate
-  commands: 
-    - jsonlint ucDevices.json
-  when:
-    event: push
-
-- name: validate Devices.json
-  image: fftdf/docker-json-validate
-  commands: 
-    - jsonlint devices.json
-  when:
-    event: push

.woodpecker.yml

@@ -0,0 +1,24 @@
+---
+platform: linux/arm64
+
+pipeline:
+  validate_Richtfunk_Devices:
+    image: git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-json-validate
+    commands: 
+      - jsonlint rifu_devices.json
+    when:
+      event: push
+
+  validate_Router_Devices:
+    image: git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-json-validate
+    commands: 
+      - jsonlint uisp_router.json
+    when:
+      event: push
+
+  validate_Unifi_Devices:
+    image: git.freifunk-rhein-sieg.net/freifunk-troisdorf/docker-json-validate
+    commands: 
+      - jsonlint unifi_devices.json
+    when:
+      event: push

rifu_devices.json

@@ -18,8 +18,8 @@
       "gateway": "6ab511de3f8e",
       "domain": "rifu",
       "location": {
-        "longitude":7.203598,
-        "latitude":50.795277
+        "longitude":7.203617,
+        "latitude":50.795295
       }
     },
     {

ucDevices.json

@@ -1,544 +0,0 @@
-{
-    "devices":[
-      {
-        "name": "NK-12-OD-Sued",
-        "mac": "18:e8:29:10:2b:ed",
-        "gateway_nexthop": "b4fbe4526b04",
-        "gateway": "fa6e1c342bb0",
-        "linked_to": "b4:fb:e4:52:6b:04",
-        "domain": "Niederkassel",
-        "location": {
-          "latitude":50.812402473,
-          "longitude":7.034801245
-        }
-      },
-      {
-        "name": "NK-13-OD-Ost",
-        "mac": "18:e8:29:10:2b:72",
-        "gateway_nexthop": "b4fbe4526b04",
-        "gateway": "fa6e1c342bb0",
-        "linked_to": "b4:fb:e4:52:6b:04",
-        "domain": "Niederkassel",
-        "location": {
-          "latitude":50.812577035,
-          "longitude":7.034913898
-        }
-      },
-      {
-        "name": "Eifelstrasse_01-1",
-        "mac": "74:83:c2:39:f3:d4",
-        "gateway_nexthop": "18e829aeb490",
-        "gateway": "02545624bdbe",
-        "linked_to": "18:e8:29:ae:b4:90",
-        "domain": "Soziale Netzwerke",
-        "location": {
-          "latitude":50.782613069,
-          "longitude":7.061321586
-        }
-      },
-      {
-        "name": "Eifelstrasse_01-2",
-        "mac": "74:83:c2:39:f5:5f",
-        "gateway_nexthop": "18e829aeb490",
-        "gateway": "02545624bdbe",
-        "linked_to": "18:e8:29:ae:b4:90",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.782638507,
-          "longitude":7.061415464
-        }
-      },
-      {
-        "name": "Eifelstrasse_01-3",
-        "mac": "74:83:c2:39:f6:61",
-        "gateway_nexthop": "18e829aeb490",
-        "gateway": "02545624bdbe",
-        "linked_to": "18:e8:29:ae:b4:90",
-        "domain": "Soziale Netzwerke",
-        "location": {
-          "latitude":50.782697015,
-          "longitude":7.061415464
-        }
-      },
-      {
-        "name": "Eifelstrasse_02-1",
-        "mac": "74:83:c2:39:f6:d3",
-        "gateway_nexthop": "18e829aeb7cc",
-        "gateway": "02545624bdbe",
-        "linked_to": "18:e8:29:ae:b7:cc",
-        "domain": "Soziale Netzwerke",
-        "location": {
-          "latitude":50.782769937,
-          "longitude":7.061506659
-        }
-      },
-      {
-        "name": "Eifelstrasse_02-2",
-        "mac": "74:83:c2:96:cb:a3",
-        "gateway_nexthop": "18e829aeb7cc",
-        "gateway": "02545624bdbe",
-        "linked_to": "18:e8:29:ae:b7:cc",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.782796222,
-          "longitude":7.061596513
-        }
-      },
-       {
-        "name": "Eifelstrasse_02-3",
-        "mac": "74:83:c2:96:c8:e6",
-        "gateway_nexthop": "18e829aeb7cc",
-        "gateway": "02545624bdbe",
-        "linked_to": "18:e8:29:ae:b7:cc",
-        "domain": "Soziale Netzwerke",
-        "location": {
-          "latitude":50.782853034,
-          "longitude":7.061601877
-        }
-      },
-       {
-        "name": "DW-01",
-        "mac": "18:e8:29:a6:c6:23",
-        "gateway_nexthop": "b4fbe4b1ac44",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "b4:fb:e4:b1:ac:44",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.825793,
-          "longitude":7.204645
-        }
-      },
-      {
-        "name": "DW-02n",
-        "mac": "e0:63:da:6d:c6:70",
-        "gateway_nexthop": "18e829a6c623",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "18:e8:29:a6:c6:23",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.825644,
-          "longitude":7.204421
-        }
-      }, 
-      {
-        "name": "DW-22.OD",
-        "mac": "e0:63:da:6d:c7:d8",
-        "gateway_nexthop": "e063da6dc670",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "e0:63:da:6d:c6:70",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.825425,
-          "longitude":7.204679
-        }
-      },
-      {
-        "name": "DW-32",
-        "mac": "e0:63:da:6d:c6:6d",
-        "gateway_nexthop": "e063da6dc670",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "e0:63:da:6d:c6:70",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.825849,
-          "longitude":7.204333
-        }
-      },      
-      {
-        "name": "WB Alte Schule Seminarraum",
-        "mac": "74:83:c2:c3:38:47",
-        "gateway_nexthop": "7483c2f5881d",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:88:1d",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.624723,
-          "longitude":7.136787
-        }
-      },
-      {
-        "name": "WB Alte Schule EG Flur",
-        "mac": "74:83:c2:c3:38:31",
-        "gateway_nexthop": "7483c2f5881d",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:88:1d",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.624610,
-          "longitude":7.136811
-        }
-      },
-      {
-        "name": "WB Alte Schule Kueche",
-        "mac": "74:83:c2:c3:39:b2",
-        "gateway_nexthop": "7483c2f5881d",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:88:1d",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.624588,
-          "longitude":7.137028
-        }
-      },
-      {
-        "name": "WB Alte Schule 1. OG Flur",
-        "mac": "74:83:c2:c3:39:88",
-        "gateway_nexthop": "7483c2f5881d",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:88:1d",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.624687,
-          "longitude":7.136886
-        }
-      },
-      {
-        "name": "WB Gereonshof Erdgeschoss",
-        "mac": "74:83:c2:c3:39:e9",
-        "gateway_nexthop": "7483c2f58187",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:81:87",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.617666,
-          "longitude":7.125552
-        }
-      },
-      {
-        "name": "WB Gereonshof 1. OG Flur",
-        "mac": "74:83:c2:c3:38:c7",
-        "gateway_nexthop": "7483c2f58187",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:81:87",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.617655,
-          "longitude":7.125458
-        }
-      },
-      {
-        "name": "WB Raiffeisenstrasse Erdgeschoss",
-        "mac": "74:83:c2:c3:3b:c5",
-        "gateway_nexthop": "7483c2f582d7",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:82:d7",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.597914,
-          "longitude":7.090805
-        }
-      },
-      {
-        "name": "WB Raiffeisenstrasse 1. OG Flur",
-        "mac": "74:83:c2:c3:3f:2c",
-        "gateway_nexthop": "7483c2f582d7",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:82:d7",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.597925,
-          "longitude":7.090739
-        }
-      },
-      {
-        "name": "WB Schützenstrasse Erdgeschoss",
-        "mac": "74:83:c2:c3:3e:e1",
-        "gateway_nexthop": "7483c2f584c9",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:84:c9",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.615445,
-          "longitude":7.061784
-        }
-      },
-      {
-        "name": "WB Schützenstrasse 1. OG Flur",
-        "mac": "74:83:c2:c3:40:91",
-        "gateway_nexthop": "7483c2f584c9",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:84:c9",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.615491,
-          "longitude":7.061806
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M+DBdAnt_NORD",
-        "mac": "18:e8:29:56:51:1b",
-        "gateway_nexthop": "18e82956511b",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "18:e8:29:56:51:1b",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.834814,
-          "longitude":7.197365
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M_N01",
-        "mac": "b4:fb:e4:96:fd:9d",
-        "gateway_nexthop": "18e82956511b",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "18:e8:29:56:51:1b",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.836508,
-          "longitude":7.197005
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M_N02",
-        "mac": "b4:fb:e4:f3:01:3e",
-        "gateway_nexthop": "18e82956511b",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "18:e8:29:56:51:1b",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.837524,
-          "longitude":7.198362
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M-PRO N03",
-        "mac": "b4:fb:e4:13:b1:3a",
-        "gateway_nexthop": "18e82956511b",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "18:e8:29:56:51:1b",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.836941,
-          "longitude":7.198271
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M-PRO Sued",
-        "mac": "b4:fb:e4:13:b2:0d",
-        "gateway_nexthop": "18e82956511b",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "18:e8:29:56:51:1b",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.834648,
-          "longitude":7.197421
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M_S01",
-        "mac": "18:e8:29:56:6a:21",
-        "gateway_nexthop": "b4fbe413b20d",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "b4:fb:e4:13:b2:0d",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.833926,
-          "longitude":7.197737
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M_S02",
-        "mac": "b4:fb:e4:96:fc:dd",
-        "gateway_nexthop": "18e829566a21",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "18:e8:29:56:6a:21",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.832971,
-          "longitude":7.198609
-        }
-      },
-      {
-        "name": "CP-Lohmar UAP-AC-M_S03",
-        "mac": "18:e8:29:56:6d:9e",
-        "gateway_nexthop": "18e829566a21",
-        "gateway": "36aacb5c7d39",
-        "linked_to": "18:e8:29:56:6a:21",
-        "domain": "Lohmar",  
-        "location": {
-          "latitude":50.832833,
-          "longitude":7.199824
-        }
-      },
-      {
-        "name": "AG-SU-Links1",
-        "mac": "b4:fb:e4:73:97:d2",
-        "gateway_nexthop": "18e829aebc4c",
-        "gateway": "92e9b3894f60",
-        "linked_to": "18:e8:29:ae:bc:4c",
-        "domain": "Siegburg",  
-        "location": {
-          "latitude":50.795307,
-          "longitude":7.203614
-        }
-      },
-      {
-        "name": "AG-SU-Rechts3",
-        "mac": "b4:fb:e4:f3:f8:52",
-        "gateway_nexthop": "18e829aebc4c",
-        "gateway": "92e9b3894f60",
-        "linked_to": "18:e8:29:ae:bc:4c",
-        "domain": "Siegburg",  
-        "location": {
-          "latitude":50.795243,
-          "longitude":7.203576
-        }
-      },
-      {
-        "name": "AG-SU-FFRS-M-Pro-NO",
-        "mac": "78:8a:20:b0:8b:a2",
-        "gateway_nexthop": "f492bfe292b9",
-        "gateway": "92e9b3894f60",
-        "linked_to": "f4:92:bf:e2:92:b9",
-        "domain": "Siegburg",  
-        "location": {
-          "latitude":50.795263,
-          "longitude":7.204228
-        }
-      },
-      {
-        "name": "AG-SU-FFRS-M-Pro-SUED",
-        "mac": "78:8a:20:b0:91:55",
-        "gateway_nexthop": "f492bfe292b9",
-        "gateway": "92e9b3894f60",
-        "linked_to": "f4:92:bf:e2:92:b9",
-        "domain": "Siegburg",  
-        "location": {
-          "latitude":50.795168,
-          "longitude":7.204150
-        }
-      },
-      {
-        "name": "IdW-AP01",
-        "mac": "74:83:c2:96:e3:7d",
-        "gateway_nexthop": "7483c2f652e6",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f6:52:e6",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.857803,
-          "longitude":7.223057
-        }
-      },
-      {
-        "name": "IdW-AP02",
-        "mac": "74:83:c2:96:e5:12",
-        "gateway_nexthop": "7483c2f652e6",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f6:52:e6",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.857838,
-          "longitude":7.223145
-        }
-      },
-      {
-        "name": "Scheiderhoehe_SH-AP01n",
-        "mac": "44:d9:e7:f6:90:62",
-        "gateway_nexthop": "7483c2f65916",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f6:59:16",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.874744,
-          "longitude":7.227942
-        }
-      },
-      {
-        "name": "Scheiderhoehe_SH-AP02",
-        "mac": "44:d9:e7:f9:ae:05",
-        "gateway_nexthop": "7483c2f65916",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f6:59:16",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.874798,
-          "longitude":7.228097
-        }
-      },
-      {
-        "name": "AdL-AP01",
-        "mac": "80:2a:a8:d6:ce:0f",
-        "gateway_nexthop": "7483c2f653ac",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f6:53:ac",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.831656,
-          "longitude":7.275797
-        }
-      },
-      {
-        "name": "AdL-AP02",
-        "mac": "44:d9:e7:f9:ab:ca",
-        "gateway_nexthop": "7483c2f653ac",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f6:53:ac",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.831624,
-          "longitude":7.275975
-        }
-      }, 
-      {
-        "name": "AdL-AP03",
-        "mac": "80:2a:a8:d6:d1:49",
-        "gateway_nexthop": "7483c2f653ac",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f6:53:ac",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.831641,
-          "longitude":7.276272
-        }
-      },     
-      {
-        "name": "Donrather Hof-01",
-        "mac": "e0:63:da:6d:c6:71",
-        "gateway_nexthop": "7483c2f5e694",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:e6:94",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.853503,
-          "longitude":7.226636
-        }
-      },
-      {
-        "name": "Donrather Hof-02",
-        "mac": "e0:63:da:6d:c8:7d",
-        "gateway_nexthop": "7483c2f5e694",
-        "gateway": "3a1213fa88ec",
-        "linked_to": "74:83:c2:f5:e6:94",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.853382,
-          "longitude":7.226770
-        }
-      },
-      {
-        "name": "ROUTEMASTER- FFRS-AC-M01",
-        "mac": "b4:fb:e4:10:8a:2a",
-        "gateway_nexthop": "b4fbe4b087c6",
-        "gateway": "02545624bdbe",
-        "linked_to": "b4:fb:e4:b0:87:c6",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.782407,
-          "longitude":7.059606
-        }
-      },
-      {
-        "name": "ROUTEMASTER- FFRS-AC-M02",
-        "mac": "b4:fb:e4:10:8a:88",
-        "gateway_nexthop": "b4fbe4b087c6",
-        "gateway": "02545624bdbe",
-        "linked_to": "b4:fb:e4:b0:87:c6",
-        "domain": "Soziale Netzwerke",  
-        "location": {
-          "latitude":50.782147,
-          "longitude":7.059630
-        }
-      }
-    ]
-  }

uisp_router.json

@@ -0,0 +1,60 @@
+
+{
+    "devices":[
+      {
+        "name": "Rathaus Uplink",
+        "mac": "18:e8:29:ad:9a:34",
+        "gateway_nexthop": "18e8292f7de6",
+        "gateway": "a28cae6ff604",
+        "domain": "tdf",
+        "location": {
+          "longitude":7.149406208,
+          "latitude":50.817093402
+        }
+      },
+        {
+        "name": "edge2-test",
+        "mac": "d0:21:f9:bb:db:d0",
+        "gateway_nexthop": "000000000001",
+        "gateway": "168f8c38748b",
+        "domain": "VPN1",
+        "location": {
+          "longitude":7.133350968,
+          "latitude":50.802853080
+        }
+      },
+      {
+        "name": "Aggertal-Hotel",
+        "mac": "d0:21:f9:bb:e7:52",
+        "gateway_nexthop": "000000000001",
+        "gateway": "168f8c38748b",
+        "domain": "VPN1",
+        "location": {
+          "longitude":7.255375,
+          "latitude":50.881177
+        }
+      },
+      {
+        "name": "Achtermann-edge4",
+        "mac": "d0:21:f9:bb:db:8e",
+        "gateway_nexthop": "000000000001",
+        "gateway": "168f8c38748b",
+        "domain": "VPN1",
+        "location": {
+          "longitude":7.122906,
+          "latitude":50.819198
+        }
+      },
+        {
+        "name": "Galerie-Troisdorf",
+        "mac": "d0:21:f9:bb:dc:06",
+        "gateway_nexthop": "000000000001",
+        "gateway": "168f8c38748b",
+        "domain": "VPN1",
+        "location": {
+          "longitude":7.155843973,
+          "latitude":50.814017575
+        }
+      }
+    ]
+  }