Use new API to create Torus/Dragonfly/Fat-Tree clusters from XML.

[simgrid.git] / teshsuite / simdag / flatifier / flatifier.tesh

diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh
index 3f8b607..6de5246 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.tesh
+++ b/teshsuite/simdag/flatifier/flatifier.tesh
@@ -692,7 +692,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <host id="node-7.simgrid.org" speed="1000000000"/>
 >   <host id="node-8.simgrid.org" speed="1000000000"/>
 >   <host id="node-9.simgrid.org" speed="1000000000"/>
->   <router id="node-bob_cluster_router.simgrid.org"/>
 >   <link id="__loopback__" bandwidth="10000000000" latency="0.000000000" sharing_policy="FATPIPE"/>
 >   <link id="bob_cluster_link_0_loopback" bandwidth="100000000" latency="0.000000000" sharing_policy="FATPIPE"/>
 >   <link id="bob_cluster_link_10_loopback" bandwidth="100000000" latency="0.000000000" sharing_policy="FATPIPE"/>
@@ -814,9 +813,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-0.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_0_to_3_UP"/><link_ctn id="bob_cluster_link_from_3_to_9_UP"/>
 >   </route>
->   <route src="node-0.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-1.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_0_to_1_DOWN"/>
 >   </route>
@@ -853,9 +849,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-1.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_0_to_1_DOWN"/><link_ctn id="bob_cluster_link_from_0_to_3_UP"/><link_ctn id="bob_cluster_link_from_3_to_9_UP"/>
 >   </route>
->   <route src="node-1.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-10.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_9_to_10_DOWN"/><link_ctn id="bob_cluster_link_from_6_to_9_DOWN"/><link_ctn id="bob_cluster_link_from_0_to_6_DOWN"/>
 >   </route>
@@ -892,9 +885,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-10.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_9_to_10_DOWN"/>
 >   </route>
->   <route src="node-10.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-11.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_11_to_9_UP"/><link_ctn id="bob_cluster_link_from_6_to_9_DOWN"/><link_ctn id="bob_cluster_link_from_0_to_6_DOWN"/>
 >   </route>
@@ -931,9 +921,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-11.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_11_to_9_UP"/>
 >   </route>
->   <route src="node-11.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-2.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_2_to_0_UP"/>
 >   </route>
@@ -970,9 +957,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-2.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_2_to_0_UP"/><link_ctn id="bob_cluster_link_from_0_to_3_UP"/><link_ctn id="bob_cluster_link_from_3_to_9_UP"/>
 >   </route>
->   <route src="node-2.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-3.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_0_to_3_DOWN"/>
 >   </route>
@@ -1009,9 +993,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-3.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_3_to_9_UP"/>
 >   </route>
->   <route src="node-3.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-4.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_3_to_4_DOWN"/><link_ctn id="bob_cluster_link_from_0_to_3_DOWN"/>
 >   </route>
@@ -1048,9 +1029,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-4.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_3_to_4_DOWN"/><link_ctn id="bob_cluster_link_from_3_to_9_UP"/>
 >   </route>
->   <route src="node-4.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-5.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_5_to_3_UP"/><link_ctn id="bob_cluster_link_from_0_to_3_DOWN"/>
 >   </route>
@@ -1087,9 +1065,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-5.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_5_to_3_UP"/><link_ctn id="bob_cluster_link_from_3_to_9_UP"/>
 >   </route>
->   <route src="node-5.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-6.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_0_to_6_DOWN"/>
 >   </route>
@@ -1126,9 +1101,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-6.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_6_to_9_UP"/>
 >   </route>
->   <route src="node-6.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-7.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_6_to_7_DOWN"/><link_ctn id="bob_cluster_link_from_0_to_6_DOWN"/>
 >   </route>
@@ -1165,9 +1137,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-7.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_6_to_7_DOWN"/><link_ctn id="bob_cluster_link_from_6_to_9_UP"/>
 >   </route>
->   <route src="node-7.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-8.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_8_to_6_UP"/><link_ctn id="bob_cluster_link_from_0_to_6_DOWN"/>
 >   </route>
@@ -1204,9 +1173,6 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-8.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_8_to_6_UP"/><link_ctn id="bob_cluster_link_from_6_to_9_UP"/>
 >   </route>
->   <route src="node-8.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
 >   <route src="node-9.simgrid.org" dst="node-0.simgrid.org">
 >   <link_ctn id="bob_cluster_link_from_6_to_9_DOWN"/><link_ctn id="bob_cluster_link_from_0_to_6_DOWN"/>
 >   </route>
@@ -1243,47 +1209,5 @@ $ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/cluster_torus.xml "--lo
 >   <route src="node-9.simgrid.org" dst="node-9.simgrid.org">
 >   <link_ctn id="bob_cluster_link_9_loopback"/>
 >   </route>
->   <route src="node-9.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-bob_cluster_router.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-0.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-1.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-10.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-11.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-2.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-3.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-4.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-5.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-6.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-7.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-8.simgrid.org">
->   
->   </route>
->   <route src="node-bob_cluster_router.simgrid.org" dst="node-9.simgrid.org">
->   
->   </route>
 > </AS>
 > </platform>