1 files changed, 1 insertions, 67 deletions
diff --git a/src/lib/Server/Admin/Viz.py b/src/lib/Server/Admin/Viz.py
index d2eeb3370..138cc4aaf 100644
--- a/src/lib/Server/Admin/Viz.py
+++ b/src/lib/Server/Admin/Viz.py
@@ -48,7 +48,6 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
     def Visualize(self, repopath, raw=False, hosts=False,
                   bundles=False, key=False, output=False):
         '''Build visualization of groups file'''
-        groups = self.metadata.get_groups()
         if raw:
             cmd = "dd bs=4M"
             if output:
@@ -58,73 +57,13 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
             if output:
                 cmd += " -o %s" % output
         dotpipe = popen2.Popen4(cmd)
-        categories = {'default':'grey83'}
-        instances = {}
-        egroups = groups.findall("Group") + groups.findall('.//Groups/Group')
-        for group in egroups:
-            if not categories.has_key(group.get('category')):
-                categories[group.get('category')] = self.colors.pop()
-            group.set('color', categories[group.get('category')])
-        if None in categories:
-            del categories[None]
-        
         try:
             dotpipe.tochild.write("digraph groups {\n")
         except:
             print "write to dot process failed. Is graphviz installed?"
             raise SystemExit(1)
         dotpipe.tochild.write('\trankdir="LR";\n')
-
-        if hosts:
-            clients = self.metadata.clients
-            for client, profile in clients.iteritems():
-                if instances.has_key(profile):
-                    instances[profile].append(client)
-                else:
-                    instances[profile] = [client]
-            for profile, clist in instances.iteritems():
-                clist.sort()
-                dotpipe.tochild.write(
-                    '''\t"%s-instances" [ label="%s", shape="record" ];\n''' \
-                    % (profile, '|'.join(clist)))
-                dotpipe.tochild.write('''\t"%s-instances" -> "group-%s";\n''' \
-                                      % (profile, profile))
-
-        if bundles:
-            bundles = []
-            [bundles.append(bund.get('name')) \
-             for bund in groups.findall('.//Bundle')
-             if bund.get('name') not in bundles]
-            bundles.sort()
-            for bundle in bundles:
-                dotpipe.tochild.write(
-                    '''\t"bundle-%s" [ label="%s", shape="septagon"];\n''' \
-                    % (bundle, bundle))
-        gseen = []
-        for group in egroups:
-            if group.get('profile', 'false') == 'true':
-                style = "filled, bold"
-            else:
-                style = "filled"
-            gseen.append(group.get('name'))
-            dotpipe.tochild.write(
-                '\t"group-%s" [label="%s", style="%s", fillcolor=%s];\n' %
-                (group.get('name'), group.get('name'), style, group.get('color')))
-            if bundles:
-                for bundle in group.findall('Bundle'):
-                    dotpipe.tochild.write('\t"group-%s" -> "bundle-%s";\n' %
-                                          (group.get('name'), bundle.get('name')))
-        
-        gfmt = '\t"group-%s" [label="%s", style="filled", fillcolor="grey83"];\n' 
-        for group in egroups:
-            for parent in group.findall('Group'):
-                if parent.get('name') not in gseen:
-                    dotpipe.tochild.write(gfmt % (parent.get('name'),
-                                                  parent.get('name')))
-                    gseen.append(parent.get("name"))
-                dotpipe.tochild.write('\t"group-%s" -> "group-%s" ;\n' %
-                                      (group.get('name'), parent.get('name')))
-
+        dotpipe.tochild.write(self.metadata.viz(hosts, bundles, key, self.colors))
         if key:
             dotpipe.tochild.write("\tsubgraph cluster_key {\n")
             dotpipe.tochild.write('''\tstyle="filled";\n''')
@@ -133,11 +72,6 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
             dotpipe.tochild.write('''\tGroup [shape="ellipse"];\n''')
             dotpipe.tochild.write('''\tProfile [style="bold", shape="ellipse"];\n''')
             dotpipe.tochild.write('''\tHblock [label="Host1|Host2|Host3", shape="record"];\n''')
-            for category in categories:
-                dotpipe.tochild.write(
-                    '''\t"''' + category + '''" [label="''' + category + \
-                    '''", shape="record", style="filled", fillcolor=''' + \
-                    categories[category] + '''];\n''')
             dotpipe.tochild.write('''\tlabel="Key";\n''')
             dotpipe.tochild.write("\t}\n")
         dotpipe.tochild.write("}\n")