X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/630f6085be5dfa41c4fee13930e8a87026a75d78..90d928f994ad7bc31969effd49b3b2ff501f1009:/tools/graphicator/graphicator.tesh

diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh
index e75a5ff719..928b6abfb7 100644
--- a/tools/graphicator/graphicator.tesh
+++ b/tools/graphicator/graphicator.tesh
@@ -1,6 +1,7 @@
 #!/usr/bin/env tesh
 
-$ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/simdag/platforms/one_cluster.xml test.dot
+$ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/platforms/one_cluster.xml test.dot
+> Dumping to DOT file
 
 $ cat test.dot
 > graph test {
@@ -13,6 +14,7 @@ $ cat test.dot
 >   "bob3.hamburger.edu";
 >   "bob4.hamburger.edu";
 >   "bob6.hamburger.edu";
+>   "bob_cluster";
 >   "bob_cluster_backbone";
 >   "bob_cluster_link_0_DOWN";
 >   "bob_cluster_link_0_UP";
@@ -25,27 +27,58 @@ $ cat test.dot
 >   "bob_cluster_link_6_DOWN";
 >   "bob_cluster_link_6_UP";
 >   "bobbob_cluster_router.hamburger.edu";
->   "bob_cluster_link_0_DOWN" -- "bob_cluster_backbone";
+>   "bob_cluster_link_0_DOWN" -- "bob0.hamburger.edu";
+>   "bob_cluster_link_2_DOWN" -- "bob2.hamburger.edu";
+>   "bob_cluster_link_3_DOWN" -- "bob3.hamburger.edu";
+>   "bob_cluster_link_4_DOWN" -- "bob4.hamburger.edu";
+>   "bob_cluster_link_6_DOWN" -- "bob6.hamburger.edu";
 >   "bob_cluster_link_0_UP" -- "bob_cluster_backbone";
->   "bob_cluster_link_2_DOWN" -- "bob_cluster_backbone";
 >   "bob_cluster_link_2_UP" -- "bob_cluster_backbone";
->   "bob_cluster_link_3_DOWN" -- "bob_cluster_backbone";
 >   "bob_cluster_link_3_UP" -- "bob_cluster_backbone";
->   "bob_cluster_link_4_DOWN" -- "bob_cluster_backbone";
 >   "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";
+>   "bob_cluster_backbone" -- "bob_cluster_link_0_DOWN";
 >   "bob0.hamburger.edu" -- "bob_cluster_link_0_UP";
->   "bob2.hamburger.edu" -- "bob_cluster_link_2_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_2_DOWN";
 >   "bob2.hamburger.edu" -- "bob_cluster_link_2_UP";
->   "bob3.hamburger.edu" -- "bob_cluster_link_3_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_3_DOWN";
 >   "bob3.hamburger.edu" -- "bob_cluster_link_3_UP";
->   "bob4.hamburger.edu" -- "bob_cluster_link_4_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_4_DOWN";
 >   "bob4.hamburger.edu" -- "bob_cluster_link_4_UP";
->   "bob6.hamburger.edu" -- "bob_cluster_link_6_DOWN";
+>   "bob_cluster_backbone" -- "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
+
+$ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/platforms/one_cluster.xml test.csv
+> Dumping to CSV file
+
+$ cat test.csv
+> src,dst
+> bob_cluster_link_0_DOWN,bob0.hamburger.edu
+> bob_cluster_link_2_DOWN,bob2.hamburger.edu
+> bob_cluster_link_3_DOWN,bob3.hamburger.edu
+> bob_cluster_link_4_DOWN,bob4.hamburger.edu
+> bob_cluster_link_6_DOWN,bob6.hamburger.edu
+> bob_cluster_link_0_UP,bob_cluster_backbone
+> bob_cluster_link_2_UP,bob_cluster_backbone
+> bob_cluster_link_3_UP,bob_cluster_backbone
+> bob_cluster_link_4_UP,bob_cluster_backbone
+> bob_cluster_link_6_UP,bob_cluster_backbone
+> bob_cluster_backbone,bob_cluster_link_0_DOWN
+> bob0.hamburger.edu,bob_cluster_link_0_UP
+> bob_cluster_backbone,bob_cluster_link_2_DOWN
+> bob2.hamburger.edu,bob_cluster_link_2_UP
+> bob_cluster_backbone,bob_cluster_link_3_DOWN
+> bob3.hamburger.edu,bob_cluster_link_3_UP
+> bob_cluster_backbone,bob_cluster_link_4_DOWN
+> bob4.hamburger.edu,bob_cluster_link_4_UP
+> bob_cluster_backbone,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.csv