hide neighbors without primary/secondary entry

This commit is contained in:
Nils Schneider 2012-06-15 18:23:03 +02:00
parent b1ae0dc0e2
commit c6e1cf2acd
2 changed files with 6 additions and 177 deletions

View file

@ -1,177 +0,0 @@
{ "router" : "56:e6:fc:af:43:81", "neighbor" : "56:e6:fc:98:58:f3", "label" : "1.000" }
{ "router" : "56:e6:fc:b0:43:80", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.015" }
{ "router" : "56:e6:fc:b0:43:80", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "56:e6:fc:b0:43:80", "gateway" : "3a:21:2d:d1:ed:14", "label" : "TT" }
{ "router" : "56:e6:fc:b0:43:80", "gateway" : "a0:0b:ba:cb:cb:e3", "label" : "TT" }
{ "secondary" : "56:e6:fc:af:43:81", "of" : "56:e6:fc:b0:43:80" }
{ "primary" : "56:e6:fc:b0:43:80" }
{ "router" : "56:e6:fc:af:43:bb", "neighbor" : "56:e6:fc:98:58:ab", "label" : "1.424" }
{ "router" : "56:e6:fc:b0:43:ba", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.015" }
{ "router" : "56:e6:fc:b0:43:ba", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "56:e6:fc:b0:43:ba", "gateway" : "54:e6:fc:af:43:ba", "label" : "TT" }
{ "router" : "56:e6:fc:b0:43:ba", "gateway" : "96:d6:5f:bd:7a:63", "label" : "TT" }
{ "router" : "56:e6:fc:b0:43:ba", "gateway" : "90:c1:15:89:1c:ce", "label" : "TT" }
{ "router" : "56:e6:fc:b0:43:ba", "gateway" : "00:c0:ca:57:d6:b4", "label" : "TT" }
{ "secondary" : "56:e6:fc:af:43:bb", "of" : "56:e6:fc:b0:43:ba" }
{ "primary" : "56:e6:fc:b0:43:ba" }
{ "router" : "56:e6:fc:98:58:f3", "neighbor" : "56:e6:fc:af:43:81", "label" : "1.000" }
{ "router" : "56:e6:fc:99:58:f2", "gateway" : "d4:20:6d:4e:fd:58", "label" : "TT" }
{ "router" : "56:e6:fc:99:58:f2", "gateway" : "7c:61:93:a9:86:14", "label" : "TT" }
{ "router" : "56:e6:fc:99:58:f2", "gateway" : "ea:40:68:d6:3f:3e", "label" : "TT" }
{ "router" : "56:e6:fc:99:58:f2", "gateway" : "00:0c:f1:57:93:6b", "label" : "TT" }
{ "router" : "56:e6:fc:99:58:f2", "gateway" : "54:e6:fc:98:58:f2", "label" : "TT" }
{ "router" : "56:e6:fc:99:58:f2", "gateway" : "3c:d0:f8:65:bc:f5", "label" : "TT" }
{ "router" : "56:e6:fc:99:58:f2", "gateway" : "2c:81:58:fc:4e:1b", "label" : "TT" }
{ "secondary" : "56:e6:fc:98:58:f3", "of" : "56:e6:fc:99:58:f2" }
{ "primary" : "56:e6:fc:99:58:f2" }
{ "router" : "b0:48:7a:e7:d3:64", "neighbor" : "00:25:86:e6:f1:bf", "label" : "1.000" }
{ "router" : "b0:48:7a:e7:d3:64", "neighbor" : "00:e0:29:39:34:d7", "label" : "1.000" }
{ "router" : "b2:48:7a:e7:d3:65", "neighbor" : "fa:d1:11:37:fc:39", "label" : "1.015" }
{ "router" : "b2:48:7a:e7:d3:65", "gateway" : "00:04:13:29:20:76", "label" : "TT" }
{ "router" : "b2:48:7a:e7:d3:65", "gateway" : "bc:ae:c5:5a:e8:85", "label" : "TT" }
{ "router" : "b2:48:7a:e7:d3:65", "gateway" : "1c:4b:d6:97:86:0f", "label" : "TT" }
{ "router" : "b2:48:7a:e7:d3:65", "gateway" : "00:08:9b:be:1b:14", "label" : "TT" }
{ "router" : "b2:48:7a:e7:d3:65", "gateway" : "92:8d:df:24:d7:a0", "label" : "TT" }
{ "router" : "b2:48:7a:e7:d3:65", "gateway" : "f0:de:f1:53:5b:9f", "label" : "TT" }
{ "secondary" : "b0:48:7a:e7:d3:64", "of" : "b2:48:7a:e7:d3:65" }
{ "primary" : "b2:48:7a:e7:d3:65" }
{ "router" : "92:f6:52:3f:b9:26", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "92:f6:52:3f:b9:26", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "92:f6:52:3f:b9:26", "gateway" : "8a:1b:98:8a:13:ec", "label" : "TT" }
{ "primary" : "92:f6:52:3f:b9:26" }
{ "router" : "fa:d1:11:25:9d:a2", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.015" }
{ "router" : "fa:d1:11:25:9d:a2", "neighbor" : "fa:d1:11:80:41:d4", "label" : "1.045" }
{ "router" : "fa:d1:11:25:9d:a2", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "fa:d1:11:25:9d:a2", "neighbor" : "00:25:86:e6:f1:c0", "label" : "1.000" }
{ "router" : "fa:d1:11:24:9d:a3", "gateway" : "da:91:8e:4c:4f:49", "label" : "TT" }
{ "router" : "fa:d1:11:24:9d:a3", "gateway" : "8c:64:22:59:9d:ce", "label" : "TT" }
{ "secondary" : "fa:d1:11:25:9d:a2", "of" : "fa:d1:11:24:9d:a3" }
{ "primary" : "fa:d1:11:24:9d:a3" }
{ "router" : "b2:48:7a:9a:d8:ce", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "b2:48:7a:9a:d8:ce", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "b2:48:7a:9a:d8:ce", "gateway" : "38:e7:d8:03:11:7a", "label" : "TT" }
{ "router" : "b2:48:7a:9a:d8:ce", "gateway" : "92:7d:36:3f:43:cd", "label" : "TT" }
{ "primary" : "b2:48:7a:9a:d8:ce" }
{ "router" : "fa:d1:11:24:be:44", "neighbor" : "b2:48:7a:cb:26:8e", "label" : "1.191" }
{ "router" : "fa:d1:11:25:be:42", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "fa:d1:11:25:be:42", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "fa:d1:11:25:be:42", "gateway" : "22:e7:3e:10:6b:8e", "label" : "TT" }
{ "secondary" : "fa:d1:11:24:be:44", "of" : "fa:d1:11:25:be:42" }
{ "primary" : "fa:d1:11:25:be:42" }
{ "router" : "fa:d1:11:30:1b:e3", "neighbor" : "fa:d1:11:7f:41:d5", "label" : "1.032" }
{ "router" : "fa:d1:11:30:1b:e3", "gateway" : "3e:6a:13:62:a5:5b", "label" : "TT" }
{ "router" : "fa:d1:11:30:1b:e3", "gateway" : "f8:d1:11:30:1b:e1", "label" : "TT" }
{ "primary" : "fa:d1:11:30:1b:e3" }
{ "router" : "56:e6:fc:98:58:ab", "neighbor" : "56:e6:fc:af:43:bb", "label" : "1.062" }
{ "router" : "56:e6:fc:99:58:aa", "gateway" : "ea:13:b6:5c:41:ae", "label" : "TT" }
{ "router" : "56:e6:fc:99:58:aa", "gateway" : "54:e6:fc:98:58:aa", "label" : "TT" }
{ "secondary" : "56:e6:fc:98:58:ab", "of" : "56:e6:fc:99:58:aa" }
{ "primary" : "56:e6:fc:99:58:aa" }
{ "router" : "fa:d1:11:80:41:d4", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.007" }
{ "router" : "fa:d1:11:80:41:d4", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "fa:d1:11:80:41:d4", "neighbor" : "fa:d1:11:25:9d:a2", "label" : "1.036" }
{ "router" : "fa:d1:11:7f:41:d5", "neighbor" : "fa:d1:11:30:1b:e3", "label" : "1.020" }
{ "router" : "fa:d1:11:7f:41:d5", "gateway" : "f8:d1:11:7f:41:d4", "label" : "TT" }
{ "router" : "fa:d1:11:7f:41:d5", "gateway" : "fe:7f:f7:83:c0:e5", "label" : "TT" }
{ "secondary" : "fa:d1:11:80:41:d4", "of" : "fa:d1:11:7f:41:d5" }
{ "primary" : "fa:d1:11:7f:41:d5" }
{ "router" : "56:e6:fc:99:64:9c", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.003" }
{ "router" : "56:e6:fc:99:64:9c", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "56:e6:fc:99:64:9c", "gateway" : "54:e6:fc:98:64:9c", "label" : "TT" }
{ "router" : "56:e6:fc:99:64:9c", "gateway" : "56:54:c2:34:54:0a", "label" : "TT" }
{ "primary" : "56:e6:fc:99:64:9c" }
{ "router" : "b2:48:7a:a1:16:de", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "b2:48:7a:a1:16:de", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "b2:48:7a:a1:16:de", "gateway" : "4a:d5:8a:4d:d3:2c", "label" : "TT" }
{ "primary" : "b2:48:7a:a1:16:de" }
{ "router" : "00:25:86:e6:f1:c0", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "00:25:86:e6:f1:c0", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "00:25:86:e6:f1:c0", "neighbor" : "fa:d1:11:25:9d:a2", "label" : "1.000" }
{ "router" : "00:25:86:e6:f1:bf", "neighbor" : "b0:48:7a:e7:d3:64", "label" : "1.000" }
{ "router" : "00:25:86:e6:f1:bf", "neighbor" : "00:e0:29:39:34:d7", "label" : "1.000" }
{ "router" : "00:25:86:e6:f1:bf", "gateway" : "66:44:30:0f:15:e5", "label" : "TT" }
{ "secondary" : "00:25:86:e6:f1:c0", "of" : "00:25:86:e6:f1:bf" }
{ "primary" : "00:25:86:e6:f1:bf" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "76:ea:3a:bf:22:3e", "label" : "1.015" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "fa:d1:11:80:41:d4", "label" : "1.032" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "56:e6:fc:b0:43:80", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "b2:48:7a:9a:d8:ce", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "02:22:b0:45:94:af", "label" : "1.015" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "56:e6:fc:99:64:9c", "label" : "1.032" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "fa:d1:11:25:9d:a2", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "fa:d1:11:25:95:58", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "92:f6:52:3f:b9:26", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "00:25:86:e6:f1:c0", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "fa:d1:11:25:be:42", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "b2:48:7a:a1:16:de", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "b2:48:7a:bc:50:54", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "56:e6:fc:b0:43:ba", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "neighbor" : "b2:48:7a:cc:26:8c", "label" : "1.000" }
{ "router" : "52:54:00:f3:62:d9", "gateway" : "de:66:21:dc:a9:c8", "label" : "TT" }
{ "router" : "52:54:00:f3:62:d9", "gateway" : "52:54:00:eb:bb:15", "label" : "TT" }
{ "router" : "52:54:00:f3:62:d9", "gateway" : "52:54:00:ee:5c:d5", "label" : "TT" }
{ "router" : "52:54:00:f3:62:d9", "gateway" : "52:54:00:a7:2f:8f", "label" : "TT" }
{ "router" : "52:54:00:f3:62:d9", "gateway" : "fe:54:00:a7:2f:8f", "label" : "TT" }
{ "router" : "52:54:00:f3:62:d9", "gateway" : "52:54:00:b3:2d:41", "label" : "TT" }
{ "primary" : "52:54:00:f3:62:d9" }
{ "router" : "b2:48:7a:bc:50:54", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "b2:48:7a:bc:50:54", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.003" }
{ "router" : "b2:48:7a:bc:50:54", "gateway" : "4a:32:c8:a8:3f:4d", "label" : "TT" }
{ "primary" : "b2:48:7a:bc:50:54" }
{ "router" : "b2:48:7a:cb:26:8e", "neighbor" : "fa:d1:11:24:be:44", "label" : "1.036" }
{ "router" : "b2:48:7a:cc:26:8c", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.015" }
{ "router" : "b2:48:7a:cc:26:8c", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "b2:48:7a:cc:26:8c", "gateway" : "b0:48:7a:cb:26:8c", "label" : "TT" }
{ "router" : "b2:48:7a:cc:26:8c", "gateway" : "d2:b7:58:56:f6:41", "label" : "TT" }
{ "secondary" : "b2:48:7a:cb:26:8e", "of" : "b2:48:7a:cc:26:8c" }
{ "primary" : "b2:48:7a:cc:26:8c" }
{ "router" : "02:22:b0:45:94:af", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "02:22:b0:45:94:af", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "02:22:b0:44:94:b0", "gateway" : "f2:23:10:89:62:17", "label" : "TT" }
{ "router" : "02:22:b0:44:94:b0", "gateway" : "00:22:b0:44:94:af", "label" : "TT" }
{ "secondary" : "02:22:b0:45:94:af", "of" : "02:22:b0:44:94:b0" }
{ "primary" : "02:22:b0:44:94:b0" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "fa:d1:11:80:41:d4", "label" : "1.032" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "56:e6:fc:b0:43:80", "label" : "1.015" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "b2:48:7a:9a:d8:ce", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "02:22:b0:45:94:af", "label" : "1.015" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "56:e6:fc:99:64:9c", "label" : "1.015" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "fa:d1:11:25:9d:a2", "label" : "1.007" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "fa:d1:11:25:95:58", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "92:f6:52:3f:b9:26", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "00:25:86:e6:f1:c0", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "fa:d1:11:25:be:42", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "b2:48:7a:a1:16:de", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "b2:48:7a:bc:50:54", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "56:e6:fc:b0:43:ba", "label" : "1.015" }
{ "router" : "8e:3d:c2:10:10:28", "neighbor" : "b2:48:7a:cc:26:8c", "label" : "1.000" }
{ "router" : "8e:3d:c2:10:10:28", "gateway" : "56:47:05:ac:00:2c", "label" : "TT" }
{ "router" : "8e:3d:c2:10:10:28", "gateway" : "f8:d1:11:24:76:12", "label" : "TT" }
{ "router" : "8e:3d:c2:10:10:28", "gateway" : "00:18:84:d0:34:20", "label" : "TT" }
{ "router" : "8e:3d:c2:10:10:28", "gateway" : "52:54:00:0c:bb:eb", "label" : "TT" }
{ "router" : "8e:3d:c2:10:10:28", "gateway" : "9e:1f:3c:eb:f2:ae", "label" : "TT" }
{ "router" : "8e:3d:c2:10:10:28", "gateway" : "56:47:05:ab:00:2c", "label" : "TT" }
{ "router" : "8e:3d:c2:10:10:28", "gateway" : "f4:ec:38:eb:f1:f2", "label" : "TT" }
{ "primary" : "8e:3d:c2:10:10:28" }
{ "router" : "76:ea:3a:bf:22:3e", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "76:ea:3a:be:22:40", "gateway" : "ee:a9:d0:a1:20:d5", "label" : "TT" }
{ "router" : "76:ea:3a:be:22:40", "gateway" : "76:ea:3a:be:22:3f", "label" : "TT" }
{ "secondary" : "76:ea:3a:bf:22:3e", "of" : "76:ea:3a:be:22:40" }
{ "primary" : "76:ea:3a:be:22:40" }
{ "router" : "fa:d1:11:37:fc:39", "neighbor" : "b2:48:7a:e7:d3:65", "label" : "1.000" }
{ "router" : "fa:d1:11:37:fc:39", "gateway" : "00:27:10:74:e6:88", "label" : "TT" }
{ "router" : "fa:d1:11:37:fc:39", "gateway" : "b6:9d:b0:42:a0:29", "label" : "TT" }
{ "router" : "fa:d1:11:37:fc:39", "gateway" : "00:26:b6:ac:30:22", "label" : "TT" }
{ "router" : "fa:d1:11:37:fc:39", "gateway" : "00:24:d7:ae:b0:b8", "label" : "TT" }
{ "router" : "fa:d1:11:37:fc:39", "gateway" : "00:24:d7:4f:67:c8", "label" : "TT" }
{ "primary" : "fa:d1:11:37:fc:39" }
{ "router" : "00:e0:29:39:34:d7", "neighbor" : "b0:48:7a:e7:d3:64", "label" : "1.000" }
{ "router" : "00:e0:29:39:34:d7", "neighbor" : "00:25:86:e6:f1:bf", "label" : "1.000" }
{ "router" : "00:e0:29:39:34:d7", "gateway" : "0a:3a:e5:45:f1:bb", "label" : "TT" }
{ "primary" : "00:e0:29:39:34:d7" }
{ "router" : "fa:d1:11:25:95:58", "neighbor" : "8e:3d:c2:10:10:28", "label" : "1.000" }
{ "router" : "fa:d1:11:25:95:58", "neighbor" : "52:54:00:f3:62:d9", "label" : "1.000" }
{ "router" : "fa:d1:11:25:95:58", "gateway" : "16:44:d8:37:99:cf", "label" : "TT" }
{ "primary" : "fa:d1:11:25:95:58" }

View file

@ -85,6 +85,12 @@ class NodeDB:
continue
try:
if 'neighbor' in x:
try:
node = self.maybe_node_by_mac((x['neighbor']))
except:
continue
if 'gateway' in x:
x['neighbor'] = x['gateway']