Split switches to Ethernet and Fibre Channel

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

1 files changed, 36 insertions, 17 deletions

diff --git a/cluster-cman.py b/cluster-cman.py
index 8c14ae7..797ad2b 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -302,17 +302,25 @@ graph = lambda\
         # cluster services layer
         #
         )
-        ,SubgraphStandard('cluster.shared-devices'
+        ,SubgraphStandard('cluster.networking'
         #
-        # shared devices (storage and switch/es)
+        # networking (storage and switch/es)
         #
-        ,label='shared devices'
+        ,label='managed devices'
+        ,_subgraphs=\
+            [SubgraphStandard('cluster.switch'
+                ,label='switch'
+                ,_nodes=\
+                    [StorageDevice('switch-fc'
+                    ,label='FC'
+                    )
+                    ,StorageDevice('switch-ethernet'
+                    ,label='Ethernet'
+                    )]
+            )]
         ,_nodes=\
             [StorageDevice('nas'
             ,label='NAS'
-            )
-            ,StorageDevice('switch'
-            ,label='switch'
             )]
         )
         ,SubgraphStandard('cluster.fence'
@@ -347,7 +355,7 @@ graph = lambda\
                 )]
             ,_nodes=\
                 [FenceDevice('direct-fence'
-                ,label='control card\n(drac,ilo,…)\n/power control\n(apc,…)'
+                ,label='control card\n(drac,…)/power\ncontrol (apc,…)'
                 )]
             )
             ,SubgraphStandard('cluster.storage-based-fence'
@@ -360,7 +368,7 @@ graph = lambda\
                 ,label='blocking writes\n(scsi)/attesting\nliveness (sanlock)'
                 )]
             )
-            ,SubgraphStandard('cluster.link-based-fence'
+            ,SubgraphStandard('cluster.switch-based-fence'
             #
             # switch-based fencing
             #
@@ -413,6 +421,7 @@ graph = lambda\
         ,Delegate\
         ('node_b-fence_agent'
         ,'direct-fence'
+        ,label='telnet,\nssh,\nsoap,\n…'
         ,ltail='cluster.node_b-fence-agents'
         ,lhead='cluster.fence'
         )
@@ -424,21 +433,24 @@ graph = lambda\
         # this has to be enabled as using kernel instead of ricci
         # destroys the intended depiction :-/
         ,ltail='cluster.node_a'
-        ,lhead='cluster.shared-devices'
-        ,headport='e'
+        ,lhead='cluster.networking'
+        #,headport='e'
+        #,constraint='false'
         )
         ,Databus\
         ('node_b-io'
-        ,'nas'
+        ,'switch-ethernet'
         #,ltail='cluster.node_b'
-        ,lhead='cluster.shared-devices'
-        ,headport='n'
+        ,lhead='cluster.networking'
+        #,headport='n'
+        #,constraint='false'
         )
         ,Databus\
         ('node_c-kernel'
         ,'nas'
         #,ltail='cluster.node_c'
-        ,lhead='cluster.shared-devices'
+        ,lhead='cluster.networking'
+        #,constraint='false'
         # cluster devices layer - cluster nodes layer (fence execution)
         )]+\
         [FencedBy\
@@ -462,10 +474,17 @@ graph = lambda\
         ,weight='3'
         )
         ,FencedBy\
-        ('switch'
+        ('switch-ethernet'
         ,'switch-based-fence'
-        #,ltail='cluster.node_c'
-        ,lhead='cluster.storage-based-fence'
+        ,ltail='cluster.switch'
+        ,lhead='cluster.switch-based-fence'
+        )
+        ,FencedBy\
+        ('nas'
+        ,'switch-fc'
+        #,ltail='cluster.switch'
+        #,lhead='cluster.switch-based-fence'
+        ,constraint='false'
         )
         ,FencedBy\
         ('nas'