From 9f52c19b807e4961a76fa652aa5b7f660625e65e Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 8 Mar 2018 14:29:40 +1300 Subject: samba-tool viusalize: mark RODCs in distance matrix RODCs should not be replicating out, which means they look alarming when they are working properly. We label them as RODCs to reminds users that no outbound replication is expected. This results in slightly rejigged output formatting. Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- python/samba/tests/samba_tool/visualize.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'python/samba/tests') diff --git a/python/samba/tests/samba_tool/visualize.py b/python/samba/tests/samba_tool/visualize.py index 1afb210b7bd..43757e7b497 100644 --- a/python/samba/tests/samba_tool/visualize.py +++ b/python/samba/tests/samba_tool/visualize.py @@ -71,11 +71,12 @@ def samdb_from_ldif(ldif, tempdir, lp, dsa=None, tag=''): return (samdb, dburl) -def collapse_space(s): +def collapse_space(s, keep_empty_lines=False): lines = [] for line in s.splitlines(): line = ' '.join(line.strip().split()) - lines.append(line) + if line or keep_empty_lines: + lines.append(line) return '\n'.join(lines) @@ -453,6 +454,7 @@ key_0__label -> elision0 [style=invis; weight=9] EXPECTED_DISTANCE_GRAPH_WITH_KEY = """ NTDS Connections known to CN=LOCALDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com + destination ,-------- *,CN=CLIENT+ |,------- *,CN=LOCALDC+ -- cgit v1.2.3