Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Milestones
Merge Requests
4
Merge Requests
4
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
re6stnet
Commits
d07392d3
Commit
d07392d3
authored
8 months ago
by
Tom Niget
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demo: fix graph generation for empty prefixes
parent
447ff274
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
14 deletions
+10
-14
demo/demo
demo/demo
+10
-14
No files found.
demo/demo
View file @
d07392d3
...
@@ -94,6 +94,7 @@ class Re6stNode(nemu.Node):
...
@@ -94,6 +94,7 @@ class Re6stNode(nemu.Node):
def __init__(self, name, short):
def __init__(self, name, short):
super().__init__()
super().__init__()
print("Re6stNode ctor %r %r" % (name, short))
self.name = name
self.name = name
self.short = short
self.short = short
self.Popen(('sysctl', '-q',
self.Popen(('sysctl', '-q',
...
@@ -424,17 +425,16 @@ def node_by_ll(addr: str) -> tuple[Re6stNode, bool]:
...
@@ -424,17 +425,16 @@ def node_by_ll(addr: str) -> tuple[Re6stNode, bool]:
return _ll[addr]
return _ll[addr]
def route_svg(ipv4, z=4
, default=type('', (), {'short': None})
):
def route_svg(ipv4, z=4):
graph: dict[Re6stNode, dict[tuple[Re6stNode, bool], list[Re6stNode]]] = {}
graph: dict[Re6stNode, dict[tuple[Re6stNode, bool], list[Re6stNode]]] = {}
for n in nodes:
for n in nodes:
g = graph[n] = defaultdict(list)
g = graph[n] = defaultdict(list)
g: dict[tuple[Re6stNode, bool], list[Re6stNode]]
for route in n.get_routes():
for r in n.get_routes():
if (route.prefix and route.prefix.startswith('10.42.') if ipv4 else
if (r.prefix and r.prefix.startswith('10.42.') if ipv4 else
route.prefix is None or route.prefix.startswith('2001:db8:')):
r.prefix is None or r.prefix.startswith('2001:db8:')):
try:
try:
g[node_by_ll(r.nexthop)].append(
if route.prefix:
node_by_ll(r.prefix)[0] if r.prefix else default
)
g[node_by_ll(route.nexthop)].append(node_by_ll(route.prefix)[0]
)
except KeyError:
except KeyError:
pass
pass
gv = ["digraph { splines = true; edge[color=grey, labelangle=0];"]
gv = ["digraph { splines = true; edge[color=grey, labelangle=0];"]
...
@@ -442,20 +442,16 @@ def route_svg(ipv4, z=4, default=type('', (), {'short': None})):
...
@@ -442,20 +442,16 @@ def route_svg(ipv4, z=4, default=type('', (), {'short': None})):
a = 2 * math.pi / N
a = 2 * math.pi / N
edges = set()
edges = set()
for i, n in enumerate(nodes):
for i, n in enumerate(nodes):
i: int
gv.append('%s[pos="%s,%s!"];'
gv.append('%s[pos="%s,%s!"];'
% (n.name, z * math.cos(a * i), z * math.sin(a * i)))
% (n.name, z * math.cos(a * i), z * math.sin(a * i)))
l = []
l = []
for p, r in graph[n].items():
for p, r in graph[n].items():
p: tuple[Re6stNode, bool]
j = abs(nodes.index(p[0]) - i)
r: list[Re6stNode]
j: int = abs(nodes.index(p[0]) - i)
l.append((min(j, N - j), p, r))
l.append((min(j, N - j), p, r))
for j, (_, (p2, t), r) in enumerate(sorted(l, key=lambda x: x[0])):
for j, (_, (p2, t), r) in enumerate(sorted(l, key=lambda x: x[0])):
p2: Re6stNode
l2 = []
l2: list[str] = []
arrowhead = 'none'
arrowhead = 'none'
for r2 in sorted(r2.short for r2 in r):
for r2 in sorted(r2.short
or ''
for r2 in r):
if r2:
if r2:
if r2 == p2.short:
if r2 == p2.short:
r2 = '
<font
color=
"grey"
>
%s
</font>
' % r2
r2 = '
<font
color=
"grey"
>
%s
</font>
' % r2
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment