X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296..11e9d5c661bff9c0a31a60760520a6cd9172907c:/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh

diff --git a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
index 3226af8829..b7436ea9f1 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
@@ -1,10 +1,14 @@
-$ ${bindir:=.}/basic_parsing_test ./three_clusters_bypass.xml FULL_LINK
+#! ./tesh
+
+p Testing a bypass ASroute
+! output sort
+$ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassASroute.xml FULL_LINK
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
-> Workstation number: 3, link number: 8
+> Workstation number: 3, link number: 11
 > Route between 1 and 1
 >   Route size 2
->   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
->   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_1_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_1_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between 1 and 2
 >   Route size 1
@@ -12,46 +16,141 @@ $ ${bindir:=.}/basic_parsing_test ./three_clusters_bypass.xml FULL_LINK
 >   Route latency = 0.000500, route bandwidth = 1250000000.000000
 > Route between 1 and 3
 >   Route size 4
->   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_1_link_1_UP: latency = 0.000050, bandwidth = 125000000.000000
 >   Link link1: latency = 0.000500, bandwidth = 1250000000.000000
 >   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
->   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_3_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.001100, route bandwidth = 125000000.000000
 > Route between 2 and 1
 >   Route size 4
->   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_2_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
 >   Link link2: latency = 0.000500, bandwidth = 1250000000.000000
 >   Link link1: latency = 0.000500, bandwidth = 1250000000.000000
->   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_1_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.001100, route bandwidth = 125000000.000000
 > Route between 2 and 2
 >   Route size 2
->   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
->   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_2_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_2_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.000100, route bandwidth = 125000000.000000
 > Route between 2 and 3
 >   Route size 4
->   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_2_link_2_UP: latency = 0.000050, bandwidth = 125000000.000000
 >   Link link2: latency = 0.000500, bandwidth = 1250000000.000000
 >   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
->   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_3_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.001100, route bandwidth = 125000000.000000
 > Route between 3 and 1
 >   Route size 4
->   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_3_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
 >   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
 >   Link link1: latency = 0.000500, bandwidth = 1250000000.000000
->   Link my_cluster_1_link_1: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_1_link_1_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.001100, route bandwidth = 125000000.000000
 > Route between 3 and 2
 >   Route size 4
->   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_3_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
 >   Link link3: latency = 0.000500, bandwidth = 1250000000.000000
 >   Link link2: latency = 0.000500, bandwidth = 1250000000.000000
->   Link my_cluster_2_link_2: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_2_link_2_DOWN: latency = 0.000050, bandwidth = 125000000.000000
 >   Route latency = 0.001100, route bandwidth = 125000000.000000
 > Route between 3 and 3
 >   Route size 2
->   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
->   Link my_cluster_3_link_3: latency = 0.000050, bandwidth = 125000000.000000
->   Route latency = 0.000100, route bandwidth = 125000000.000000
\ No newline at end of file
+>   Link my_cluster_3_link_3_UP: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_3_link_3_DOWN: latency = 0.000050, bandwidth = 125000000.000000
+>   Route latency = 0.000100, route bandwidth = 125000000.000000
+
+p Testing a bypass route
+
+$ ${bindir:=.}/basic_parsing_test ${srcdir:=.}/examples/platforms/bypassRoute.xml FULL_LINK
+> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
+> Workstation number: 4, link number: 10
+> Route between AS_2_host1 and AS_2_host1
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
+> Route between AS_2_host1 and AS_2_host2
+>   Route size 3
+>   Link AS_2_link7: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link6: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link5: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.001500, route bandwidth = 1250000000.000000
+> Route between AS_2_host1 and AS_2_host3
+>   Route size 2
+>   Link AS_2_link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.001000, route bandwidth = 1250000000.000000
+> Route between AS_2_host1 and AS_1_host1
+>   Route size 4
+>   Link AS_2_link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.002000, route bandwidth = 1250000000.000000
+> Route between AS_2_host2 and AS_2_host1
+>   Route size 2
+>   Link AS_2_link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.001000, route bandwidth = 1250000000.000000
+> Route between AS_2_host2 and AS_2_host2
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
+> Route between AS_2_host2 and AS_2_host3
+>   Route size 2
+>   Link AS_2_link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.001000, route bandwidth = 1250000000.000000
+> Route between AS_2_host2 and AS_1_host1
+>   Route size 4
+>   Link AS_2_link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.002000, route bandwidth = 1250000000.000000
+> Route between AS_2_host3 and AS_2_host1
+>   Route size 2
+>   Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.001000, route bandwidth = 1250000000.000000
+> Route between AS_2_host3 and AS_2_host2
+>   Route size 2
+>   Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.001000, route bandwidth = 1250000000.000000
+> Route between AS_2_host3 and AS_2_host3
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
+> Route between AS_2_host3 and AS_1_host1
+>   Route size 4
+>   Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.002000, route bandwidth = 1250000000.000000
+> Route between AS_1_host1 and AS_2_host1
+>   Route size 4
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.002000, route bandwidth = 1250000000.000000
+> Route between AS_1_host1 and AS_2_host2
+>   Route size 4
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.002000, route bandwidth = 1250000000.000000
+> Route between AS_1_host1 and AS_2_host3
+>   Route size 4
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Route latency = 0.002000, route bandwidth = 1250000000.000000
+> Route between AS_1_host1 and AS_1_host1
+>   Route size 1
+>   Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000
+>   Route latency = 0.000015, route bandwidth = 498000000.000000
\ No newline at end of file