Do some renaming & styling

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

2 files changed, 35 insertions, 19 deletions

diff --git a/lib.py b/lib.py
index 778d2e3..4126999 100644
--- a/lib.py
+++ b/lib.py
@@ -66,17 +66,25 @@ class LibEdge(Edge):
 #
 
 
-class GraphNode(LibSubgraph):
+class SubgraphImportant(LibSubgraph):
     def __init__(self, *args, **kwargs):
-        kwargs.setdefault('style', 'bold')
-        super(GraphNode, self).__init__(*args, **kwargs)
+        kwargs.setdefault('fillcolor', '#eaeaea')
+        kwargs.setdefault('style', 'bold, filled, rounded')
+        super(SubgraphImportant, self).__init__(*args, **kwargs)
 
 
-class GraphSubnode(LibSubgraph):
+class SubgraphStandard(LibSubgraph):
     def __init__(self, *args, **kwargs):
-        kwargs.setdefault('fillcolor', 'azure')
-        kwargs.setdefault('style', 'filled')
-        super(GraphSubnode, self).__init__(*args, **kwargs)
+        kwargs.setdefault('fillcolor', '#f5f5f5')
+        kwargs.setdefault('style', 'filled, rounded')
+        super(SubgraphStandard, self).__init__(*args, **kwargs)
+
+
+class SubgraphInvisible(LibSubgraph):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault('style', 'invisible')
+        super(SubgraphInvisible, self).__init__(*args, **kwargs)
+
 
 
 #
@@ -87,6 +95,7 @@ class GraphSubnode(LibSubgraph):
 class Program(LibNode):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('shape', 'box')
+        kwargs.setdefault('style', 'filled')
         super(Program, self).__init__(*args, **kwargs)
 
 
@@ -97,6 +106,13 @@ class Agent(Program):
         super(Agent, self).__init__(*args, **kwargs)
 
 
+class Library(Program):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault('fillcolor', 'lavenderblush')
+        kwargs.setdefault('style', 'filled')
+        super(Library, self).__init__(*args, **kwargs)
+
+
 class Executable(Program):
     pass
 
@@ -232,6 +248,7 @@ class DelegateCIM(Delegate, CIM):
 # main-helpers
 #
 
+
 def export(fnc):
     __all__.append(fnc.__name__)
     return fnc
diff --git a/overview.py b/overview.py
index 9dc90f9..9097501 100755
--- a/overview.py
+++ b/overview.py
@@ -36,7 +36,7 @@ LibDot('Cluster.conf-related tools',
     # , ranksep='1.2',
     _subgraphs=[
         # management client
-        LibSubgraph('cluster-climgmt',
+        SubgraphStandard('cluster-climgmt',
             label='management client',
             _nodes=[
                 Program('luci'),
@@ -44,7 +44,7 @@ LibDot('Cluster.conf-related tools',
             ]
         ),
         # other monitoring
-        LibSubgraph('cluster-monitor',
+        SubgraphStandard('cluster-monitor',
             label='other monitoring',
             _nodes=[
                 Program('snmpwalk'),
@@ -52,15 +52,14 @@ LibDot('Cluster.conf-related tools',
             ]
         ),
         # nodes
-        LibSubgraph('cluster-nodes',
-            style='invis',
+        SubgraphInvisible('cluster-nodes',
             _subgraphs=[
                 # node a
-                GraphNode('cluster-node_a',
+                SubgraphImportant('cluster-node_a',
                     label='NODE A',
                     _subgraphs=[
                         # node a - management
-                        GraphSubnode('cluster-node_a-conga',
+                        SubgraphStandard('cluster-node_a-conga',
                             label='management (incomplete)',
                             _nodes=[
                                 Daemon('node_a-ricci',
@@ -72,11 +71,11 @@ LibDot('Cluster.conf-related tools',
                     ]
                 ),
                 # node b
-                GraphNode('cluster-node_b',
+                SubgraphImportant('cluster-node_b',
                     label='NODE B',
                     _subgraphs=[
                         # node b - management
-                        GraphSubnode('cluster-node_b-conga',
+                        SubgraphStandard('cluster-node_b-conga',
                             label='management',
                             _nodes=[
                                 Agent('node_b-libClusterMonitorSnmp.so', label='libClusterMonitorSnmp.so'),
@@ -94,10 +93,10 @@ LibDot('Cluster.conf-related tools',
                             ]
                         ),
                         # node b - core
-                        GraphSubnode('cluster-node_b-core',
+                        SubgraphStandard('cluster-node_b-core',
                             label='core',
                             _nodes=[
-                                LibNode('node_b-libccsconfdb', label='libccsconfdb'),
+                                Library('node_b-libccsconfdb', label='libccsconfdb'),
                                 Daemon('node_b-rgmanager', label='rgmanager'),
                                 Program('node_b-clustat', label='clustat'),
                                 Artefact('node_b-rgmanager.sk', label='/var/run/cluster/rgmanager.sk'),
@@ -125,11 +124,11 @@ LibDot('Cluster.conf-related tools',
                     ]
                 ),
                 # node c - general
-                GraphNode('cluster-node_c',
+                SubgraphImportant('cluster-node_c',
                     label='NODE C',
                     _subgraphs=[
                         # node c - management
-                        GraphSubnode('cluster-node_c-conga',
+                        SubgraphStandard('cluster-node_c-conga',
                             label='management (incomplete)',
                             _nodes=[
                                 Daemon('node_c-ricci',