summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2018-06-01 17:14:32 +1200
committerAndrew Bartlett <abartlet@samba.org>2018-06-10 19:02:20 +0200
commit04a773f30fdb7d03c0526ca1f73353ce5f0d29d5 (patch)
tree2444390aa3bed457489a86359baa5041503019af /python
parentc3ad137eb6bdbdc99cc2cc615ca3378a19b6cfa9 (diff)
downloadsamba-04a773f30fdb7d03c0526ca1f73353ce5f0d29d5.tar.gz
samba-04a773f30fdb7d03c0526ca1f73353ce5f0d29d5.tar.bz2
samba-04a773f30fdb7d03c0526ca1f73353ce5f0d29d5.zip
samba-tool visualize ntdsconn: properly sort/group vertices
The vertex is now a tuple, with the RODC state added. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'python')
-rw-r--r--python/samba/netcmd/visualize.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/python/samba/netcmd/visualize.py b/python/samba/netcmd/visualize.py
index e8fff9407ed..bfd7d3bf341 100644
--- a/python/samba/netcmd/visualize.py
+++ b/python/samba/netcmd/visualize.py
@@ -188,6 +188,12 @@ def get_dnstr_site(dn):
return dn
+def get_dnstrlist_site(t):
+ """Helper function for sorting and grouping lists of (DN, ...) tuples
+ by site, if possible."""
+ return get_dnstr_site(t[0])
+
+
def colour_hash(x):
"""Generate a randomish but consistent darkish colour based on the
given object."""
@@ -586,13 +592,12 @@ class cmd_ntdsconn(GraphCommand):
for e in source_denies:
epilog.append(' %s -> %s\n' % e)
-
s = distance_matrix(vertices, graph_edges,
utf8=utf8,
colour=color_scheme,
shorten_names=shorten_names,
generate_key=key,
- grouping_function=get_dnstr_site,
+ grouping_function=get_dnstrlist_site,
row_comments=rodc_status)
epilog = ''.join(epilog)