sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-15 16:59:09 +03:00
Code Activity

samba-tool visualize: group (and colour) DCs by site

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall
2018-02-23 11:11:27 +13:00
committed by Andrew Bartlett
parent 003f24ee43
commit e646895d2d
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
python/samba/netcmd/visualize.py
View File

@ -32,6 +32,7 @@ from samba.graph import dot_graph
from samba.graph import distance_matrix, COLOUR_SETS
from ldb import SCOPE_BASE, SCOPE_SUBTREE, LdbError
import time
import re
from samba.kcc import KCC
from samba.kcc.kcc_utils import KCCError
from samba.compat import text_type
@ -158,6 +159,16 @@ class GraphCommand(Command):
return color_scheme
def get_dnstr_site(dn):
"""Helper function for sorting and grouping DNs by site, if
possible."""
m = re.search(r'CN=Servers,CN=\s*([^,]+)\s*,CN=Sites', dn)
if m:
return m.group(1)
# Oh well, let it sort by DN
return dn
def colour_hash(x):
"""Generate a randomish but consistent darkish colour based on the
given object."""
@ -316,7 +327,8 @@ class cmd_reps(GraphCommand):
utf8=utf8,
colour=color_scheme,
shorten_names=shorten_names,
generate_key=key)
generate_key=key,
grouping_function=get_dnstr_site)
s = "\n%s\n%s" % (header_strings[direction] % part, s)
self.write(s, output)
@ -512,7 +524,8 @@ class cmd_ntdsconn(GraphCommand):
utf8=utf8,
colour=color_scheme,
shorten_names=shorten_names,
generate_key=key)
generate_key=key,
grouping_function=get_dnstr_site)
self.write('\n%s\n%s\n%s' % (title, s, epilog), output)
return