From: navarro <navarro@caraja.(none)>
Date: Wed, 4 Apr 2012 11:19:57 +0000 (+0200)
Subject: Made two platforms for bypass and add test to tesh
X-Git-Tag: v3_7~107
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0bdc779c0a134c2c938ef81ea8d9dd10f9219770

Made two platforms for bypass and add test to tesh
---

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 7737a2e9e7..7c10c76265 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -99,12 +99,13 @@ IF(enable_debug) # these tests need the assertion mechanism
 	ADD_TEST(tesh-simdag-parser-bogus-symmetric	${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}		--setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms 	--cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh)
 ENDIF(enable_debug)
 
+ADD_TEST(tesh-simdag-parser-bypass ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh)
+
 ADD_TEST(tesh-simdag-reinit-costs	${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite 	--cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/test_reinit_costs.tesh)
 ADD_TEST(tesh-simdag-parser	${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}		--setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms 	--cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)
 ADD_TEST(tesh-simdag-parser-sym-full		${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms 	--cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)
 ADD_TEST(tesh-simdag-flatifier		${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms 	--cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh)
 ADD_TEST(tesh-simdag-full-links		${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms 	--cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)
-ADD_TEST(tesh-simdag-parser-bypass ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_bypass.tesh)
 ADD_TEST(tesh-simdag-basic0		${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite 	--cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic0.tesh)
 ADD_TEST(tesh-simdag-basic1		${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite 	--cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic1.tesh)
 ADD_TEST(tesh-simdag-basic2		${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite 	--cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic2.tesh)
diff --git a/teshsuite/simdag/platforms/three_clusters_bypass.xml b/examples/platforms/bypassASroute.xml
similarity index 94%
rename from teshsuite/simdag/platforms/three_clusters_bypass.xml
rename to examples/platforms/bypassASroute.xml
index fcb68c9da4..3b6623c5bf 100644
--- a/teshsuite/simdag/platforms/three_clusters_bypass.xml
+++ b/examples/platforms/bypassASroute.xml
@@ -37,10 +37,10 @@
         <link_ctn id="link3"/>
      </ASroute>
      
-     <bypassRoute src="my_cluster_1" dst="my_cluster_2"
+     <bypassASroute src="my_cluster_1" dst="my_cluster_2"
      gw_src="my_cluster_1_router" 
      gw_dst="my_cluster_2_router">
         <link_ctn id="link_tmp"/>  
-     </bypassRoute>
+     </bypassASroute>
 </AS>
 </platform>
diff --git a/examples/platforms/bypass.xml b/examples/platforms/bypassRoute.xml
similarity index 100%
rename from examples/platforms/bypass.xml
rename to examples/platforms/bypassRoute.xml
diff --git a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
index c51b83c6f2..2f63a44e4e 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test_bypass.tesh
@@ -1,4 +1,8 @@
-$ ${bindir:=.}/basic_parsing_test ./three_clusters_bypass.xml FULL_LINK
+#! ./tesh
+
+p Testing a bypass ASroute
+
+$ ${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: 11
 > Route between 1 and 1
@@ -55,3 +59,98 @@ $ ${bindir:=.}/basic_parsing_test ./three_clusters_bypass.xml FULL_LINK
 >   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_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link1: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: 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_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link2: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: 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_2_link4: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_2_link3: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link AS_1_link: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link backbone: 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