Split objects of interest to lib_{cman, shared} + add further info

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

1 files changed, 20 insertions, 31 deletions

diff --git a/cluster-cman.py b/cluster-cman.py
index 5972a96..695fc67 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -19,8 +19,9 @@ from sys import argv
 from os.path import splitext
 from lib import LibDot, main
 from lib_subgraphs import *
-from lib_nodes import *
-from lib_edges import *
+from lib_nodes import *  # remove when possible
+from lib_edges import *  # ditto
+from lib_cman import *
 
 
 FONT = 'Inconsolata'
@@ -70,9 +71,9 @@ graph = lambda\
             #
             ,label='management client'
             ,_nodes=\
-                [Executable('luci')
-                ,Executable('ccs')
-                ,Executable('ccs_sync')
+                [CmanLuci('luci')
+                ,CmanCcs('ccs')
+                ,CmanCcsSync('ccs_sync')
             ])
         ])
         ,SubgraphInvisible('cluster.nodes'
@@ -93,19 +94,16 @@ graph = lambda\
                 #
                 ,label='management (incomplete)'
                 ,_nodes=\
-                    [Daemon('node_c-ricci'
-                    ,label='ricci'
+                    [CmanRicci('node_c-ricci'
                     )
-                    ,Daemon('node_c-modclusterd'
-                    ,label='modclusterd'
+                    ,CmanModclusterd('node_c-modclusterd'
                     )]
                 )]
             ,_nodes=\
                 [Program('node_c-kernel'
                 ,label='kernel'
                 )
-                ,Daemon('node_c-rgmanager'
-                ,label='rgmanager'
+                ,CmanRGManager('node_c-rgmanager'
                 )]
             )
             ,SubgraphImportant('cluster.node_b'
@@ -129,17 +127,13 @@ graph = lambda\
                     ,Artefact('node_b-clumond.sock'
                     ,label='/var/run/\nclumond.sock'
                     )
-                    ,Daemon('node_b-ricci'
-                    ,label='ricci'
+                    ,CmanRicci('node_b-ricci'
                     )
-                    ,Executable('node_b-cman_tool'
-                    ,label='cman_tool'
+                    ,CmanCmanTool('node_b-cman_tool'
                     )
-                    ,Daemon('node_b-modclusterd'
-                    ,label='modclusterd'
+                    ,CmanModclusterd('node_b-modclusterd'
                     )
-                    ,Executable('node_b-modcluster'
-                    ,label='modcluster'
+                    ,CmanModcluster('node_b-modcluster'
                     )
                     ,Executable('node_b-ricci-modules'
                     ,label='ricci-mod{log,\nrpm,service,\nstorage,virt}'
@@ -171,11 +165,9 @@ graph = lambda\
                     [Library('node_b-libccsconfdb'
                     ,label='libccsconfdb'
                     )
-                    ,Daemon('node_b-rgmanager'
-                    ,label='rgmanager'
+                    ,CmanRGManager('node_b-rgmanager'
                     )
-                    ,Executable('node_b-clustat'
-                    ,label='clustat'
+                    ,CmanClustat('node_b-clustat'
                     )
                     ,Artefact('node_b-rgmanager.sk'
                     ,label='/var/run/\ncluster/\nrgmanager.sk'
@@ -200,8 +192,8 @@ graph = lambda\
                 #
                 ,label='fence agents'
                 ,_nodes=\
-                    [Executable('node_b-fence_virt'
-                    ,label='virt,xvm'
+                    [SharedFenceVirt('node_b-fence_virt'
+                    ,label='virt\,xvm'
                     )
                     ,Executable('node_b-fence_others'
                     ,label='others'
@@ -371,19 +363,16 @@ graph = lambda\
                 #
                 ,label='management (incomplete)'
                 ,_nodes=\
-                    [Daemon('node_a-ricci'
-                    ,label='ricci'
+                    [CmanRicci('node_a-ricci'
                     )
-                    ,Daemon('node_a-modclusterd'
-                    ,label='modclusterd'
+                    ,CmanModclusterd('node_a-modclusterd'
                     )]
                 )]
             ,_nodes=\
                 [Program('node_a-kernel'
                 ,label='kernel'
                 )
-                ,Daemon('node_a-rgmanager'
-                ,label='rgmanager'
+                ,CmanRGManager('node_a-rgmanager'
                 )]
             )]
         )