Rename net_if from router_neighbor table to netif
This includes various changes throughout the code. Additionally, some fields are reordered. This requires a change of the MySQL table router_neighbor! Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
parent
39d9ddc9d0
commit
55dc7b4ad5
|
@ -117,8 +117,8 @@ def crawl(router):
|
||||||
continue
|
continue
|
||||||
neighbour = {
|
neighbour = {
|
||||||
"mac": o_mac.lower(),
|
"mac": o_mac.lower(),
|
||||||
|
"netif": o_out_if,
|
||||||
"quality": int(o_link_quality),
|
"quality": int(o_link_quality),
|
||||||
"net_if": o_out_if,
|
|
||||||
}
|
}
|
||||||
try:
|
try:
|
||||||
neighbour_router = db.routers.find_one({"netifs.mac": neighbour["mac"]})
|
neighbour_router = db.routers.find_one({"netifs.mac": neighbour["mac"]})
|
||||||
|
|
|
@ -126,8 +126,8 @@ mysql.execute("""
|
||||||
CREATE TABLE router_neighbor (
|
CREATE TABLE router_neighbor (
|
||||||
`router` mediumint(8) UNSIGNED NOT NULL,
|
`router` mediumint(8) UNSIGNED NOT NULL,
|
||||||
`mac` char(17) COLLATE utf8_unicode_ci NOT NULL,
|
`mac` char(17) COLLATE utf8_unicode_ci NOT NULL,
|
||||||
|
`netif` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
|
||||||
`quality` smallint(6) NOT NULL,
|
`quality` smallint(6) NOT NULL,
|
||||||
`net_if` varchar(15) COLLATE utf8_unicode_ci NOT NULL,
|
|
||||||
`type` varchar(10) COLLATE utf8_unicode_ci DEFAULT 'l2'
|
`type` varchar(10) COLLATE utf8_unicode_ci DEFAULT 'l2'
|
||||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
|
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci
|
||||||
""")
|
""")
|
||||||
|
|
|
@ -221,14 +221,14 @@ def import_nodewatcher_xml(mysql, mac, xml, banned, netifdict):
|
||||||
|
|
||||||
nbdata = []
|
nbdata = []
|
||||||
for n in router_update["neighbours"]:
|
for n in router_update["neighbours"]:
|
||||||
nbdata.append((router_id,n["mac"],n["quality"],n["net_if"],n["type"],))
|
nbdata.append((router_id,n["mac"],n["netif"],n["quality"],n["type"],))
|
||||||
|
|
||||||
mysql.executemany("""
|
mysql.executemany("""
|
||||||
INSERT INTO router_neighbor (router, mac, quality, net_if, type)
|
INSERT INTO router_neighbor (router, mac, netif, quality, type)
|
||||||
VALUES (%s, %s, %s, %s, %s)
|
VALUES (%s, %s, %s, %s, %s)
|
||||||
ON DUPLICATE KEY UPDATE
|
ON DUPLICATE KEY UPDATE
|
||||||
|
netif=VALUES(netif),
|
||||||
quality=VALUES(quality),
|
quality=VALUES(quality),
|
||||||
net_if=VALUES(net_if),
|
|
||||||
type=VALUES(type)
|
type=VALUES(type)
|
||||||
""",nbdata)
|
""",nbdata)
|
||||||
|
|
||||||
|
@ -669,8 +669,8 @@ def parse_nodewatcher_xml(xml):
|
||||||
continue
|
continue
|
||||||
neighbour = {
|
neighbour = {
|
||||||
"mac": o_mac.lower(),
|
"mac": o_mac.lower(),
|
||||||
|
"netif": o_out_if,
|
||||||
"quality": int(o_link_quality),
|
"quality": int(o_link_quality),
|
||||||
"net_if": o_out_if,
|
|
||||||
"type": "l2"
|
"type": "l2"
|
||||||
}
|
}
|
||||||
router_update["neighbours"].append(neighbour)
|
router_update["neighbours"].append(neighbour)
|
||||||
|
@ -691,8 +691,8 @@ def get_l3_neighbours(tree):
|
||||||
out_if = neighbour.xpath("outgoing_interface/text()")[0]
|
out_if = neighbour.xpath("outgoing_interface/text()")[0]
|
||||||
neighbour = {
|
neighbour = {
|
||||||
"mac": get_mac_from_v6_link_local(v6_fe80).lower(),
|
"mac": get_mac_from_v6_link_local(v6_fe80).lower(),
|
||||||
|
"netif": out_if,
|
||||||
"quality": -1,
|
"quality": -1,
|
||||||
"net_if": out_if,
|
|
||||||
"type": "l3"
|
"type": "l3"
|
||||||
}
|
}
|
||||||
l3_neighbours.append(neighbour)
|
l3_neighbours.append(neighbour)
|
||||||
|
|
|
@ -54,7 +54,7 @@ def get_nearest_router():
|
||||||
""",(lat,lng,lat,))
|
""",(lat,lng,lat,))
|
||||||
|
|
||||||
res_router["neighbours"] = mysql.fetchall("""
|
res_router["neighbours"] = mysql.fetchall("""
|
||||||
SELECT nb.mac, nb.quality, nb.net_if, r.hostname, r.id
|
SELECT nb.mac, nb.netif, nb.quality, r.hostname, r.id
|
||||||
FROM router_neighbor AS nb
|
FROM router_neighbor AS nb
|
||||||
INNER JOIN (
|
INNER JOIN (
|
||||||
SELECT router, mac FROM router_netif GROUP BY mac, router
|
SELECT router, mac FROM router_netif GROUP BY mac, router
|
||||||
|
|
|
@ -107,7 +107,7 @@ def router_info(dbid):
|
||||||
mac = n["mac"]
|
mac = n["mac"]
|
||||||
|
|
||||||
router["neighbours"] = mysql.fetchall("""
|
router["neighbours"] = mysql.fetchall("""
|
||||||
SELECT nb.mac, nb.quality, nb.net_if, r.hostname, r.id
|
SELECT nb.mac, nb.netif, nb.quality, r.hostname, r.id
|
||||||
FROM router_neighbor AS nb
|
FROM router_neighbor AS nb
|
||||||
LEFT JOIN (
|
LEFT JOIN (
|
||||||
SELECT router, mac FROM router_netif GROUP BY mac, router
|
SELECT router, mac FROM router_netif GROUP BY mac, router
|
||||||
|
|
|
@ -109,7 +109,7 @@ function neighbour_graph(neighbours) {
|
||||||
var k;
|
var k;
|
||||||
for(k=0; k<neighbours.length; k++) {
|
for(k=0; k<neighbours.length; k++) {
|
||||||
if(label == neighbours[k].name && k != j) {
|
if(label == neighbours[k].name && k != j) {
|
||||||
label += "@" + neighbours[j].net_if;
|
label += "@" + neighbours[j].netif;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -153,7 +153,7 @@ map.on('click', function(pos) {
|
||||||
popup_html += "<tr style=\"background-color: "+tr_color+";\">";
|
popup_html += "<tr style=\"background-color: "+tr_color+";\">";
|
||||||
popup_html += '<td><a href="'+url_router_info+neighbour.id+'" title="'+escapeHTML(neighbour.mac)+'">'+escapeHTML(neighbour.hostname)+'</a></td>';
|
popup_html += '<td><a href="'+url_router_info+neighbour.id+'" title="'+escapeHTML(neighbour.mac)+'">'+escapeHTML(neighbour.hostname)+'</a></td>';
|
||||||
popup_html += "<td>"+neighbour.quality+"</td>";
|
popup_html += "<td>"+neighbour.quality+"</td>";
|
||||||
popup_html += "<td>"+escapeHTML(neighbour.net_if)+"</td>";
|
popup_html += "<td>"+escapeHTML(neighbour.netif)+"</td>";
|
||||||
popup_html += "</tr>";
|
popup_html += "</tr>";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -208,7 +208,7 @@
|
||||||
<td>{%- if neighbour.hostname -%}<a href="{{ url_for('router_info', dbid=neighbour.id) }}">{{ neighbour.hostname }}</a>{%- else -%}---{%- endif -%}</td>
|
<td>{%- if neighbour.hostname -%}<a href="{{ url_for('router_info', dbid=neighbour.id) }}">{{ neighbour.hostname }}</a>{%- else -%}---{%- endif -%}</td>
|
||||||
<td>{{ neighbour.mac }}</td>
|
<td>{{ neighbour.mac }}</td>
|
||||||
<td>{{ neighbour.quality }}</td>
|
<td>{{ neighbour.quality }}</td>
|
||||||
<td>{{ neighbour.net_if }}</td>
|
<td>{{ neighbour.netif }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
</table>
|
</table>
|
||||||
|
@ -344,7 +344,7 @@
|
||||||
var neigh_stats = {{ neighstats|statbson2json|safe }};
|
var neigh_stats = {{ neighstats|statbson2json|safe }};
|
||||||
var neighbours = [
|
var neighbours = [
|
||||||
{%- for neighbour in router.neighbours %}
|
{%- for neighbour in router.neighbours %}
|
||||||
{"name": "{{ neighbour.hostname or neighbour.mac }}", "mac": "{{ neighbour.mac }}", "net_if": "{{ neighbour.net_if }}"},
|
{"name": "{{ neighbour.hostname or neighbour.mac }}", "mac": "{{ neighbour.mac }}", "netif": "{{ neighbour.netif }}"},
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
];
|
];
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
Loading…
Reference in New Issue