Adjust tests after changes in cluster tag

Minor changes in graphicator and flatifier due to internals of StarZone
compared to old ClusterZone

No timing changes in tests.

diff --git a/src/kernel/routing/StarZone.cpp b/src/kernel/routing/StarZone.cpp
index 6553327..3d27937 100644 (file)
--- a/src/kernel/routing/StarZone.cpp
+++ b/src/kernel/routing/StarZone.cpp
@@ -82,10 +82,10 @@ void StarZone::get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_n
     previous = star_node;
     for (auto const* link : routes_[src->id()].links_down) {
       xbt_node_t current = new_xbt_graph_node(graph, link->get_cname(), nodes);
-      new_xbt_graph_edge(graph, previous, current, edges);
+      new_xbt_graph_edge(graph, current, previous, edges);
       previous = current;
     }
-    new_xbt_graph_edge(graph, previous, src_node, edges);
+    new_xbt_graph_edge(graph, src_node, previous, edges);
   }
 }
 

diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh
index 87c02cd..aa134d7 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.tesh
+++ b/teshsuite/simdag/flatifier/flatifier.tesh
@@ -113,7 +113,7 @@ $ ${bindir:=.}/flatifier ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e
 >   <link_ctn id="bob_cluster_link_6_UP"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->   <link_ctn id="bob_cluster_backbone"/>
+>   
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bob0.hamburger.edu">
 >   <link_ctn id="bob_cluster_backbone"/><link_ctn id="bob_cluster_link_0_DOWN"/>
@@ -454,7 +454,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%
 >   <link_ctn id="bob_cluster_link_1_UP"/><link_ctn id="bob_cluster_backbone"/>
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="alicealice_cluster_router.crepe.fr">
->   <link_ctn id="alice_cluster_backbone"/>
+>   
 >   </route>
 >   <route src="alicealice_cluster_router.crepe.fr" dst="bobbob_cluster_router.hamburger.edu">
 >   <link_ctn id="backbone"/>
@@ -475,7 +475,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_clusters.xml "--log=root.fmt:[%10.6r]%
 >   <link_ctn id="backbone"/>
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="bobbob_cluster_router.hamburger.edu">
->   <link_ctn id="bob_cluster_backbone"/>
+>   
 >   </route>
 >   <route src="bobbob_cluster_router.hamburger.edu" dst="alice0.crepe.fr">
 >   <link_ctn id="backbone"/><link_ctn id="alice_cluster_backbone"/><link_ctn id="alice_cluster_link_0_DOWN"/>

diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh
index e75a5ff..f00d1b5 100644 (file)
--- a/tools/graphicator/graphicator.tesh
+++ b/tools/graphicator/graphicator.tesh
@@ -7,12 +7,13 @@ $ cat test.dot
 >   graph [overlap=scale]
 >   node [shape=box, style=filled]
 >   node [width=.3, height=.3, style=filled, color=skyblue]
->
+> 
 >   "bob0.hamburger.edu";
 >   "bob2.hamburger.edu";
 >   "bob3.hamburger.edu";
 >   "bob4.hamburger.edu";
 >   "bob6.hamburger.edu";
+>   "bob_cluster";
 >   "bob_cluster_backbone";
 >   "bob_cluster_link_0_DOWN";
 >   "bob_cluster_link_0_UP";
@@ -35,7 +36,6 @@ $ cat test.dot
 >   "bob_cluster_link_4_UP" -- "bob_cluster_backbone";
 >   "bob_cluster_link_6_DOWN" -- "bob_cluster_backbone";
 >   "bob_cluster_link_6_UP" -- "bob_cluster_backbone";
->   "bobbob_cluster_router.hamburger.edu" -- "bob_cluster_backbone";
 >   "bob0.hamburger.edu" -- "bob_cluster_link_0_DOWN";
 >   "bob0.hamburger.edu" -- "bob_cluster_link_0_UP";
 >   "bob2.hamburger.edu" -- "bob_cluster_link_2_DOWN";
@@ -46,6 +46,8 @@ $ cat test.dot
 >   "bob4.hamburger.edu" -- "bob_cluster_link_4_UP";
 >   "bob6.hamburger.edu" -- "bob_cluster_link_6_DOWN";
 >   "bob6.hamburger.edu" -- "bob_cluster_link_6_UP";
+>   "bob_cluster_backbone" -- "bob_cluster";
+>   "bobbob_cluster_router.hamburger.edu" -- "bob_cluster";
 > }
 
 $ rm -f test.dot