Fix bug with Exchange(modclusterd,modclusterd) edges inclusion

Reproducer of the bug:
- clean all nodes
- exchange edge between modclusterd instances remained unexpectedly

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

1 files changed, 28 insertions, 29 deletions

diff --git a/cluster-cman.py b/cluster-cman.py
index 695fc67..5f513e6 100755
--- a/cluster-cman.py
+++ b/cluster-cman.py
@@ -375,6 +375,34 @@ graph = lambda\
                 ,CmanRGManager('node_a-rgmanager'
                 )]
             )]
+        ,_edges=\
+            ["modclusterd peer-to-peer network"][:0] +\
+            [Exchange\
+            ('node_a-modclusterd'
+            ,'node_b-modclusterd'
+            ,label='port 16851\n(either direction)'
+            ,weight='1'
+            )
+            ,Exchange\
+            ('node_a-modclusterd'
+            ,'node_c-modclusterd'
+            ,label='port 16851\n(either direction)'
+            ,weight='1'
+            )
+            ,Exchange\
+            ('node_b-modclusterd'
+            ,'node_c-modclusterd'
+            ,label='port 16851\n(either direction)'
+            ,weight='1'
+            )
+            ,EdgeInvisible\
+            ('node_a-modclusterd'
+            ,'node_b-modclusterd'
+            )
+            ,EdgeInvisible\
+            ('node_b-modclusterd'
+            ,'node_c-modclusterd'
+            )]
         )
         ,SubgraphStandard('cluster.services'
         #
@@ -458,35 +486,6 @@ graph = lambda\
                 ,label='Ethernet (ifmib)/\nFibre Channel\n(brocade,…)/…'
                 )]
             )]
-        #
-        ,_edges=\
-            ["modclusterd peer-to-peer network"][:0] +\
-            [Exchange\
-            ('node_a-modclusterd'
-            ,'node_b-modclusterd'
-            ,label='port 16851\n(either direction)'
-            ,weight='1'
-            )
-            ,Exchange\
-            ('node_a-modclusterd'
-            ,'node_c-modclusterd'
-            ,label='port 16851\n(either direction)'
-            ,weight='1'
-            )
-            ,Exchange\
-            ('node_b-modclusterd'
-            ,'node_c-modclusterd'
-            ,label='port 16851\n(either direction)'
-            ,weight='1'
-            )
-            ,EdgeInvisible\
-            ('node_a-modclusterd'
-            ,'node_b-modclusterd'
-            )
-            ,EdgeInvisible\
-            ('node_b-modclusterd'
-            ,'node_c-modclusterd'
-            )]
         )]
     ,_edges=\
         [