From 9dff16bd9ced3296801bd52aa653a059dad80f26 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Thu, 5 Mar 2015 11:50:24 +1300 Subject: [PATCH] kcc: add labels to dot files Signed-off-by: Douglas Bagnall Reviewed-by: Garming Sam Reviewed-by: Andrew Bartlett --- python/samba/kcc_utils.py | 2 +- source4/scripting/bin/samba_kcc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python/samba/kcc_utils.py b/python/samba/kcc_utils.py index 599f8d91a75..67ba1c92563 100644 --- a/python/samba/kcc_utils.py +++ b/python/samba/kcc_utils.py @@ -2366,7 +2366,7 @@ def write_dot_file(basename, edge_list, label=None, destdir=None): f = NamedTemporaryFile(suffix='.dot', prefix=basename + '_', delete=False, dir=destdir) graphname = ''.join(x for x in basename if x.isalnum()) print >>f, 'graph %s {' % graphname - print >>f, 'label="%s",' % (label or graphname) + print >>f, 'label="%s";\nfontsize=20' % (label or graphname) for a, b in edge_list: print >>f, '"%s" -- "%s"' % (a, b) print >>f, '}' diff --git a/source4/scripting/bin/samba_kcc b/source4/scripting/bin/samba_kcc index 0e0275676b2..538796909c1 100755 --- a/source4/scripting/bin/samba_kcc +++ b/source4/scripting/bin/samba_kcc @@ -1688,7 +1688,7 @@ class KCC(object): process_edge_set(graph, None, internal_edges) write_dot_file('prekruskal', [(e.v1.site.site_dnstr, e.v2.site.site_dnstr) - for e in internal_edges]) + for e in internal_edges], label=label) # Phase 2: Run Kruskal's on the internal edges output_edges, components = kruskal(graph, internal_edges) @@ -1703,7 +1703,8 @@ class KCC(object): else: v.dist_to_red = v.repl_info.cost - write_dot_file('postkruskal', ((e.v1.site.site_dnstr, e.v2.site.site_dnstr) for e in internal_edges)) + write_dot_file('postkruskal', ((e.v1.site.site_dnstr, e.v2.site.site_dnstr) for e in internal_edges), + label=label) # count the components return self.copy_output_edges(graph, output_edges), components