burble.dn42/bird-lg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better bgpmap handling for internal routes

Browse Source
This commit is contained in:
TimStallard 2019-01-27 15:37:42 +00:00
parent 4be9730746
commit cfaf39bac7
No known key found for this signature in database
GPG Key ID: E18E975C6A734F07
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lg.py
View File

@ -521,7 +521,9 @@ def show_bgpmap():
hop_label = "" hop_label = ""
add_node(_as, fillcolor=(first and "#F5A9A9" or "white")) add_node(_as, fillcolor=("white"))
if first:
nodes[_as].set_fillcolor("#F5A9A9")
if hop_label: if hop_label:
edge = add_edge(nodes[previous_as], nodes[_as], label=hop_label, fontsize="7") edge = add_edge(nodes[previous_as], nodes[_as], label=hop_label, fontsize="7")
else: else:
@ -589,7 +591,8 @@ def build_as_tree_from_raw_bird_ouput(host, proto, text):
for rt_host, rt_ips in app.config["ROUTER_IP"].iteritems(): for rt_host, rt_ips in app.config["ROUTER_IP"].iteritems():
# Special case for internal routing # Special case for internal routing
if peer_ip in rt_ips: if peer_ip in rt_ips:
path = [rt_host] paths.append([peer_protocol_name, rt_host])
path = None
break break
else: else:
# ugly hack for good printing # ugly hack for good printing
@ -606,7 +609,13 @@ def build_as_tree_from_raw_bird_ouput(host, proto, text):
if expr3.group(1).strip(): if expr3.group(1).strip():
net_dest = expr3.group(1).strip() net_dest = expr3.group(1).strip()
if line.startswith("BGP.as_path:"): expr4 = re.search(r'^dev', line)
#handle on-link routes
if expr4:
paths.append([peer_protocol_name, net_dest])
path = None
if line.startswith("BGP.as_path:") and path:
path.extend(line.replace("BGP.as_path:", "").strip().split(" ")) path.extend(line.replace("BGP.as_path:", "").strip().split(" "))
if path: if path: