From 46c35c1089c5c8ef743b3163d9db37c22a10f84f Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Mon, 2 Sep 2013 22:23:20 +0200
Subject: {Clean,\ as a follow}\ up
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 cluster-cman.py | 26 +++++---------------------
 lib.py          |  5 ++---
 2 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/cluster-cman.py b/cluster-cman.py
index a7f2b56..8ddede2 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -397,13 +397,6 @@ graph = lambda\
         ,ltail='cluster.node_b-fence-agents'
         ,lhead='cluster.fence'
         )
-        #,Delegate\
-        #('node_b-fence_agent'
-        #,'storage-fence'
-        #,ltail='cluster.node_b-fence-agents'
-        #,lhead='cluster.storage-fence'
-        #,constraint='true'
-        #)
         # shared storage
         ]+\
         [Databus\
@@ -429,34 +422,31 @@ graph = lambda\
         ,lhead='cluster.shared-storage'
         # cluster devices layer - cluster nodes layer (fence execution)
         )]+\
-        [Kill\
+        [FencedBy\
         ('node_a-ricci'
         ,'power-fence'
         ,ltail='cluster.node_a'
         ,lhead='cluster.power-fence'
         )
-        ,Kill\
+        ,FencedBy\
         ('node_b-cluster.conf'
         ,'libvirt'
         ,ltail='cluster.node_b'
         ,lhead='cluster.power-fence'
-        #,constraint='false'
         )
-        ,Kill\
+        ,FencedBy\
         ('node_c-ricci'
         ,'libvirt'
         ,ltail='cluster.node_c'
         ,lhead='cluster.power-fence'
         ,minlen='2'
-        ,weight='5'
+        ,weight='3'
         )
-        ,Kill\
+        ,FencedBy\
         ('nas'
         ,'storage-fence'
         #,ltail='cluster.node_c'
         ,lhead='cluster.storage-fence'
-        #,minlen='2'
-        #,weight='5'
         )]
     )]
 ,_edges=\
@@ -469,7 +459,6 @@ graph = lambda\
     ('ccs'
     ,'node_a-ricci'
     ,ltail='cluster.management-cli'
-    #,constraint='false'
     )
     ,DelegateRICCIRPC\
     ('luci'
@@ -480,7 +469,6 @@ graph = lambda\
     ('ccs_sync'
     ,'node_c-ricci'
     ,ltail='cluster.management-cli'
-    #,constraint='false'
     )
     #
     # outer environment - cluster management layer
@@ -497,10 +485,6 @@ graph = lambda\
     ,DelegateCIM\
     ('wbemcli'
     ,'node_b-cimserver'
-    #,EdgeInvisible\
-    #('snmpwalk'
-    #,'power-fence'
-    #,minlen='2'
     )]
 )
 
diff --git a/lib.py b/lib.py
index 1bff402..f1d75df 100644
--- a/lib.py
+++ b/lib.py
@@ -277,12 +277,11 @@ class Delegate(LibEdge):
         super(Delegate, self).__init__(*args, **kwargs)
 
 
-class Kill(LibEdge):
+class FencedBy(LibEdge):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault('color', 'red')
         kwargs.setdefault('dir', 'back')
-        #kwargs.setdefault('constraint', 'false')
-        super(Kill, self).__init__(*args, **kwargs)
+        super(FencedBy, self).__init__(*args, **kwargs)
 
 
 # peer-to-peer (1:1 hence constraint='false')
-- 
cgit