From 76a435e03badf34e47f18a338eade603bf119fd4 Mon Sep 17 00:00:00 2001
From: navarro <navarro@caraja.(none)>
Date: Thu, 29 Mar 2012 14:59:22 +0200
Subject: [PATCH] Try to clean platform files containing in examples/platform/
 .

---
 buildtools/Cmake/AddTests.cmake               |   6 +-
 examples/msg/chord/chord.tesh                 |   2 +-
 examples/msg/chord/chord_crosstraffic.tesh    |   2 +-
 examples/msg/ns3/One_cluster.xml              |  19 -
 examples/msg/ns3/Two_clusters.xml             |  44 --
 examples/msg/ns3/ns3.tesh                     |  10 +-
 examples/platforms/Two_clusters.xml           |  26 -
 .../{One_cluster.xml => cluster.xml}          |   0
 ..._one_host.xml => cluster_and_one_host.xml} |   2 +-
 ...o_backbone.xml => cluster_no_backbone.xml} |   0
 ...{gdx.xml => cluster_routing_rulebased.xml} |   0
 examples/platforms/clusters_routing_full.xml  |  43 ++
 .../platforms/{tag_config.xml => config.xml}  |   0
 .../{ => content}/storage_content.txt         |   0
 examples/platforms/g5k.xml                    | 132 +++-
 examples/platforms/g5k_cabinets.xml           | 565 ------------------
 examples/platforms/nancy.xml                  | 106 ----
 examples/platforms/storage.xml                |   6 +-
 .../platforms/Evaluate_get_route_time.c       |   2 +-
 19 files changed, 181 insertions(+), 784 deletions(-)
 delete mode 100644 examples/msg/ns3/One_cluster.xml
 delete mode 100644 examples/msg/ns3/Two_clusters.xml
 delete mode 100644 examples/platforms/Two_clusters.xml
 rename examples/platforms/{One_cluster.xml => cluster.xml} (100%)
 rename examples/platforms/{One_cluster_one_host.xml => cluster_and_one_host.xml} (94%)
 rename examples/platforms/{One_cluster_no_backbone.xml => cluster_no_backbone.xml} (100%)
 rename examples/platforms/{gdx.xml => cluster_routing_rulebased.xml} (100%)
 create mode 100644 examples/platforms/clusters_routing_full.xml
 rename examples/platforms/{tag_config.xml => config.xml} (100%)
 rename examples/platforms/{ => content}/storage_content.txt (100%)
 delete mode 100644 examples/platforms/g5k_cabinets.xml
 delete mode 100644 examples/platforms/nancy.xml

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 4ef863a4ba..7737a2e9e7 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -382,9 +382,9 @@ endif(HAVE_RAWCTX)
 endif(HAVE_GTNETS)
 
 if(HAVE_NS3)
-ADD_TEST(msg-ns3-thread	    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:thread		--setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg 	--cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
-ADD_TEST(msg-ns3-ucontext	${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:ucontext		--setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg 	--cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
-ADD_TEST(msg-ns3-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:raw    		--setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg 	--cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+ADD_TEST(msg-ns3-thread	    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:thread		--setenv srcdir=${CMAKE_HOME_DIRECTORY}	--cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+ADD_TEST(msg-ns3-ucontext	${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:ucontext		--setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
+ADD_TEST(msg-ns3-raw        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}	--cfg contexts/factory:raw    		--setenv srcdir=${CMAKE_HOME_DIRECTORY}	--cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/ns3/ns3.tesh)
 endif(HAVE_NS3)
 
 IF(HAVE_TRACING)
diff --git a/examples/msg/chord/chord.tesh b/examples/msg/chord/chord.tesh
index 5de61ff503..5409bf62f0 100644
--- a/examples/msg/chord/chord.tesh
+++ b/examples/msg/chord/chord.tesh
@@ -439,7 +439,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../msg_platfo
 > [652.548539] (0:@) Simulated time: 652.549
 
 ! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/One_cluster.xml ${srcdir:=.}/chord10.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant
+$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/cluster.xml ${srcdir:=.}/chord10.xml --cfg=network/crosstraffic:0 --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant
 > [   0.000000] (0:@) Configuration change: Set 'network/crosstraffic' to '0'
 > [   0.000000] (0:@) Configuration change: Set 'network/model' to 'Constant'
 > [   0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s)
diff --git a/examples/msg/chord/chord_crosstraffic.tesh b/examples/msg/chord/chord_crosstraffic.tesh
index 6cd2c1e400..e778dbc281 100644
--- a/examples/msg/chord/chord_crosstraffic.tesh
+++ b/examples/msg/chord/chord_crosstraffic.tesh
@@ -438,7 +438,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT -nb_bits=6 ${srcdir:=.}/../msg_platfo
 > [652.548539] (0:@) Simulated time: 652.549
 
 ! output sort
-$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/One_cluster.xml ${srcdir:=.}/chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant
+$ $SG_TEST_EXENV ${bindir:=.}/chord$EXEEXT ${srcdir:=.}/../../platforms/cluster.xml ${srcdir:=.}/chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant
 > [   0.000000] (0:@) Configuration change: Set 'network/model' to 'Constant'
 > [   0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [   0.000000] (10:node@c-9.me) Joining the ring with id 2015253, knowing node 1319738
diff --git a/examples/msg/ns3/One_cluster.xml b/examples/msg/ns3/One_cluster.xml
deleted file mode 100644
index 51716429d1..0000000000
--- a/examples/msg/ns3/One_cluster.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<!--              _________
-				|	       |
-				|  router  |
-	____________|__________|_____________ backbone
-	  |   |   |              |     |   |  	
-    l0|	l1|	l2|            l7|  l6 |   | l9
-      |	  |	  |   ........   |     |   |
-      |                                |
-   c-0.me                             c-9.me	
--->
-<platform version="3">
-<AS  id="AS0"  routing="Full">
-  <cluster id="my_cluster_1" prefix="c-" suffix=".me"
-  		radical="0-9"	power="1000000000"    bw="125000000"     lat="5E-5"
-        bb_bw="2250000000" bb_lat="5E-4"/>
-</AS>
-</platform>
diff --git a/examples/msg/ns3/Two_clusters.xml b/examples/msg/ns3/Two_clusters.xml
deleted file mode 100644
index efc5e100df..0000000000
--- a/examples/msg/ns3/Two_clusters.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-
-<!--
-					  __________________________________________________
-                  ____|_____											|
-				|	       |											|
-				|  router1 |											|
-	____________|__________|_____________ csma1							|
-	  |   |   |              |     |   |  								|backbone
-    l0|	l1|	l2|            l7|   l8|   | l9 							|
-      |	  |	  |   ........   |     |   |								|
-      |                                |								|
-   c-0.me                             c-9.me	                        |
-                     ___________________________________________________|
-				  ___|______
-				|	       |
-				|  router2 |
-	____________|__________|_____________ csma2
-	 |    |    |               |     |   |  	
- l10 | l11|	   |            l17|  l18|   | l19
-     |	  |	   |   ........    |     |   |
-     |                                   |
-   c-10.me                              c-19.me	
--->
-<AS  id="AS0"  routing="Full">
-  <cluster id="my_cluster_1" prefix="c-" suffix=".me"
-  		radical="0-9"	power="1000000000"    bw="125000000"     lat="5E-5"
-        bb_bw="2250000000" bb_lat="5E-4"/>
-		
-  <cluster id="my_cluster_2" prefix="c-" suffix=".me"
- 	    radical="10-19" power="1000000000"	bw="125000000"	lat="5E-5"
- 	    bb_bw="2250000000" bb_lat="5E-4"/>  
-       
-     <link id="backbone" bandwidth="1250000000" latency="5E-4"/>  
- 	
-     <ASroute src="my_cluster_1" dst="my_cluster_2" 
-	 gw_src="c-my_cluster_1_router.me" 
-	 gw_dst="c-my_cluster_2_router.me">
- 		<link_ctn id="backbone"/>
-     </ASroute>   
-</AS>
-</platform>
diff --git a/examples/msg/ns3/ns3.tesh b/examples/msg/ns3/ns3.tesh
index f9770e3ec5..d1e4bc55d5 100644
--- a/examples/msg/ns3/ns3.tesh
+++ b/examples/msg/ns3/ns3.tesh
@@ -2,14 +2,14 @@
 
 p 3hosts 2links
 
-$ ns3/ns3 ${srcdir:=.}/ns3/3hosts_2links_p.xml ${srcdir:=.}/ns3/3hosts_2links_d.xml --cfg=network/model:NS3
+$ ns3/ns3 ${srcdir:=.}/examples/msg/ns3/3hosts_2links_p.xml ${srcdir:=.}/examples/msg/ns3/3hosts_2links_d.xml --cfg=network/model:NS3
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [c:slave:(2) 0.700000] [msg_test/INFO] FLOW[1] : Receive 100 bytes from a to c
 
 p 6hosts 3links
 
-$ ns3/ns3 ${srcdir:=.}/ns3/3links-p.xml ${srcdir:=.}/ns3/3links-d.xml --cfg=network/model:NS3
+$ ns3/ns3 ${srcdir:=.}/examples/msg/ns3/3links-p.xml ${srcdir:=.}/examples/msg/ns3/3links-d.xml --cfg=network/model:NS3
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [C1:slave:(2) 0.104428] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from S1 to C1
@@ -17,7 +17,7 @@ $ ns3/ns3 ${srcdir:=.}/ns3/3links-p.xml ${srcdir:=.}/ns3/3links-d.xml --cfg=netw
 > [C3:slave:(6) 2.082380] [msg_test/INFO] FLOW[3] : Receive 2000000 bytes from S3 to C3
 
 
-$ ns3/ns3 ${srcdir:=.}/ns3/3links-p.xml ${srcdir:=.}/ns3/3links-d-timer.xml --cfg=network/model:NS3
+$ ns3/ns3 ${srcdir:=.}/examples/msg/ns3/3links-p.xml ${srcdir:=.}/examples/msg/ns3/3links-d-timer.xml --cfg=network/model:NS3
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [C1:slave:(2) 0.104428] [msg_test/INFO] FLOW[1] : Receive 100000 bytes from S1 to C1
@@ -28,14 +28,14 @@ $ ns3/ns3 ${srcdir:=.}/ns3/3links-p.xml ${srcdir:=.}/ns3/3links-d-timer.xml --cf
 
 p One cluster
 
-$ ns3/ns3 ${srcdir:=.}/ns3/One_cluster.xml ${srcdir:=.}/ns3/One_cluster-d.xml --cfg=network/model:NS3
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/ns3/One_cluster-d.xml --cfg=network/model:NS3
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [c-6.me:slave:(2) 0.006614] [msg_test/INFO] FLOW[1] : Receive 100 bytes from c-2.me to c-6.me
 
 p Two clusters
 
-$ ns3/ns3 ${srcdir:=.}/ns3/Two_clusters.xml ${srcdir:=.}/ns3/Two_clusters-d.xml --cfg=network/model:NS3
+$ ns3/ns3 ${srcdir:=.}/examples/platforms/clusters_routing_full.xml ${srcdir:=.}/examples/msg/ns3/Two_clusters-d.xml --cfg=network/model:NS3
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'NS3'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [c-16.me:slave:(2) 0.012453] [msg_test/INFO] FLOW[1] : Receive 100 bytes from c-3.me to c-16.me
diff --git a/examples/platforms/Two_clusters.xml b/examples/platforms/Two_clusters.xml
deleted file mode 100644
index fc63a075a1..0000000000
--- a/examples/platforms/Two_clusters.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-<AS  id="AS0"  routing="Full">
-  <cluster id="my_cluster_1" prefix="c-" suffix=".me"
-  		radical="0-149"	power="1000000000"    bw="125000000"     lat="5E-5"
-        bb_bw="2250000000" bb_lat="5E-4"/>
-		
-  <cluster id="my_cluster_2" prefix="c-" suffix=".me"
- 	    radical="150-299" power="1000000000"	bw="125000000"	lat="5E-5"
- 	    bb_bw="2250000000" bb_lat="5E-4"/>  
-       
-     <link id="backbone" bandwidth="1250000000" latency="5E-4"/>  
- 	
-     <ASroute src="my_cluster_1" dst="my_cluster_2" 
-	 gw_src="c-my_cluster_1_router.me" 
-	 gw_dst="c-my_cluster_2_router.me">
- 		<link_ctn id="backbone"/>
-     </ASroute>   
-     <ASroute src="my_cluster_2" dst="my_cluster_1" 
-	 gw_src="c-my_cluster_2_router.me" 
-	 gw_dst="c-my_cluster_1_router.me">
- 		<link_ctn id="backbone"/>
-     </ASroute> 
-</AS>
-</platform>
diff --git a/examples/platforms/One_cluster.xml b/examples/platforms/cluster.xml
similarity index 100%
rename from examples/platforms/One_cluster.xml
rename to examples/platforms/cluster.xml
diff --git a/examples/platforms/One_cluster_one_host.xml b/examples/platforms/cluster_and_one_host.xml
similarity index 94%
rename from examples/platforms/One_cluster_one_host.xml
rename to examples/platforms/cluster_and_one_host.xml
index 1966d43694..a789fcb9ab 100644
--- a/examples/platforms/One_cluster_one_host.xml
+++ b/examples/platforms/cluster_and_one_host.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 
 <platform version="3">
-<AS  id="AS0"  routing="Floyd">
+<AS  id="AS0"  routing="bob">
     
   <cluster id="my_cluster_1" prefix="c-" suffix=""
   		radical="0-1"	power="1000000000"    bw="125000000"     lat="5E-5"
diff --git a/examples/platforms/One_cluster_no_backbone.xml b/examples/platforms/cluster_no_backbone.xml
similarity index 100%
rename from examples/platforms/One_cluster_no_backbone.xml
rename to examples/platforms/cluster_no_backbone.xml
diff --git a/examples/platforms/gdx.xml b/examples/platforms/cluster_routing_rulebased.xml
similarity index 100%
rename from examples/platforms/gdx.xml
rename to examples/platforms/cluster_routing_rulebased.xml
diff --git a/examples/platforms/clusters_routing_full.xml b/examples/platforms/clusters_routing_full.xml
new file mode 100644
index 0000000000..4598d7c8d6
--- /dev/null
+++ b/examples/platforms/clusters_routing_full.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+
+<!--                  _________________________________________
+                 ____|_____                                    |
+                |          |                                   |
+                |  router1 |                                   |
+    ____________|__________|_____________ backbone1            |
+      |   |   |              |     |   |                       | backbone
+    l0|	l1| l2|            l7|   l8|   |l9                     |
+      |   |   |   ........   |     |   |                       |
+      |                                |                       |
+    c-0.me                             c-9.me                  |
+                     __________________________________________|
+                 ___|______
+                |          |
+                |  router2 |
+    ____________|__________|_____________ backbone2
+      |   |   |              |     |   |  	
+   l10|l11|l12|           l17| l18 |   | l19
+      |   |   |   ........   |     |   |
+      |                                |
+   c-10.me                             c-19.me	
+-->
+
+<AS id="AS0" routing="Full">
+	<cluster id="my_cluster_1" prefix="c-" suffix=".me" radical="0-9"
+		power="1000000000" bw="125000000" lat="5E-5" bb_bw="2250000000"
+		bb_lat="5E-4" />
+
+	<cluster id="my_cluster_2" prefix="c-" suffix=".me" radical="10-19"
+		power="1000000000" bw="125000000" lat="5E-5" bb_bw="2250000000"
+		bb_lat="5E-4" />
+
+	<link id="backbone" bandwidth="1250000000" latency="5E-4" />
+
+	<ASroute src="my_cluster_1" dst="my_cluster_2" gw_src="c-my_cluster_1_router.me"
+		gw_dst="c-my_cluster_2_router.me">
+		<link_ctn id="backbone" />
+	</ASroute>
+</AS>
+</platform>
diff --git a/examples/platforms/tag_config.xml b/examples/platforms/config.xml
similarity index 100%
rename from examples/platforms/tag_config.xml
rename to examples/platforms/config.xml
diff --git a/examples/platforms/storage_content.txt b/examples/platforms/content/storage_content.txt
similarity index 100%
rename from examples/platforms/storage_content.txt
rename to examples/platforms/content/storage_content.txt
diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 664ae30233..9d20e6c973 100644
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -211,14 +211,75 @@
 
 		</AS>
 		<AS id="AS_nancy" routing="RuleBased" >
-			<cluster id="AS_graphene" prefix="graphene-" suffix=".nancy.grid5000.fr"
-				radical="1-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+			<AS id="AS_graphene" routing="RuleBased" >
+				<cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr"
+					radical="1-39" power="16.673E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr"
+					radical="40-74" power="16.673E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr"
+					radical="75-104" power="16.673E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr"
+					radical="105-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+
+				<AS id="gw_AS_graphene" routing="Full">
+					<router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
+				</AS>
+				<link id="switch-graphene" bandwidth="1250000000" latency="5E-4"/>
+
+				<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
+				 gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
+				 gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+					<link_ctn id="switch-graphene"/>
+				</ASroute>
+				<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
+				 gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
+				 gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+					<link_ctn id="switch-graphene"/>
+				</ASroute>
+				<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
+				 gw_src="graphene-AS_graphene_router.nancy.grid5000.fr"
+				 gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+					<link_ctn id="switch-graphene"/>
+				</ASroute>
+			</AS>
 			<link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
 
-			<cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
-				radical="1-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+			<AS id="AS_griffon" routing="RuleBased" >
+				<cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
+					radical="1-29,58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
+					radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr"
+					radical="61-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+
+				<AS id="gw_AS_griffon" routing="Full">
+					<router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
+				</AS>
+				<link id="switch-griffon" bandwidth="1250000000" latency="5E-4"/>
+
+				<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
+				 gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
+				 gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+					<link_ctn id="switch-griffon"/>
+				</ASroute>
+				<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
+				 gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
+				 gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+					<link_ctn id="switch-griffon"/>
+				</ASroute>
+				<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
+				 gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"
+				 gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+					<link_ctn id="switch-griffon"/>
+				</ASroute>
+			</AS>
 			<link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<AS id="gw_AS_nancy" routing="Full">
@@ -250,9 +311,62 @@
 
 		</AS>
 		<AS id="AS_orsay" routing="RuleBased" >
-			<cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
-				radical="1-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+			<AS id="AS_gdx" routing="RuleBased" >
+				<cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="1-36" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="37-72" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="73-108" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="109-144" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="145-180" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="193-216" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="217-252" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="253-288" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="289-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="181-186" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+				<cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
+					radical="187-192" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
+					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+
+				<AS id="gw_AS_gdx" routing="Full">
+					<router id="gdx-AS_gdx_router.orsay.grid5000.fr"/>
+				</AS>
+				<link id="switch-gdx" bandwidth="1250000000" latency="5E-4"/>
+
+				<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
+				 gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
+				 gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+					<link_ctn id="switch-gdx"/>
+				</ASroute>
+				<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
+				 gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
+				 gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+					<link_ctn id="switch-gdx"/>
+				</ASroute>
+				<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
+				 gw_src="gdx-AS_gdx_router.orsay.grid5000.fr"
+				 gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+					<link_ctn id="switch-gdx"/>
+				</ASroute>
+			</AS>
 			<link   id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr"
diff --git a/examples/platforms/g5k_cabinets.xml b/examples/platforms/g5k_cabinets.xml
deleted file mode 100644
index 9d20e6c973..0000000000
--- a/examples/platforms/g5k_cabinets.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-	<AS id="AS_grid5000" routing="Floyd" >
-		<AS id="AS_interne" routing="Floyd">
-			<router id="lille"/>
-			<router id="paris"/>
-			<router id="nancy"/>
-			<router id="rennes"/>
-			<router id="lyon"/>
-			<router id="bordeaux"/>
-			<router id="grenoble"/>
-			<router id="marseille"/>
-			<router id="toulouse"/>
-			<router id="sophia"/>
-
-			<link id="Lille_Paris"        bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Paris_Nancy"        bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Paris_Rennes"       bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Paris_Lyon"         bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Bordeaux_Lyon"      bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Lyon_Grenoble"      bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Lyon_Marseille"     bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Marseille_Sophia"   bandwidth="1.25E9" latency="1.0E-4"/>
-			<link id="Marseille_Toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-
-		<route src="lille"     dst="paris"     ><link_ctn id="Lille_Paris"/></route>
-		<route src="paris"     dst="nancy"     ><link_ctn id="Paris_Nancy"/></route>
-		<route src="paris"     dst="rennes"    ><link_ctn id="Paris_Rennes"/></route>
-		<route src="paris"     dst="lyon"      ><link_ctn id="Paris_Lyon"/></route>
-		<route src="bordeaux"  dst="lyon"      ><link_ctn id="Bordeaux_Lyon"/></route>
-		<route src="lyon"      dst="grenoble"  ><link_ctn id="Lyon_Grenoble"/></route>
-		<route src="lyon"      dst="marseille" ><link_ctn id="Lyon_Marseille"/></route>
-		<route src="marseille" dst="sophia"    ><link_ctn id="Marseille_Sophia"/></route>
-		<route src="marseille" dst="toulouse"  ><link_ctn id="Marseille_Toulouse"/></route>
-		</AS>
-		<AS id="AS_bordeaux" routing="RuleBased" >
-			<cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
-				radical="1-51" power="5.2297E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_bordeplage" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
-				radical="1-93" power="8.8925E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_bordereau" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
-				radical="1-10" power="13.357E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_borderline" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_bordeaux" routing="Full">
-				<router id="gw_bordeaux"/>
-			</AS>
-			<link   id="link_gw_bordeaux" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_grenoble" routing="RuleBased" >
-			<cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr"
-				radical="1-12" power="23.681E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_adonis" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_edel" prefix="edel-" suffix=".grenoble.grid5000.fr"
-				radical="1-72" power="23.492E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_edel" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr"
-				radical="1-34" power="21.175E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_genepi" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_grenoble" routing="Full">
-				<router id="gw_grenoble"/>
-			</AS>
-			<link   id="link_gw_grenoble" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_lille" routing="RuleBased" >
-			<cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-				radical="1-26" power="8.9618E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_chicon" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_chimint" prefix="chimint-" suffix=".lille.grid5000.fr"
-				radical="1-20" power="23.531E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_chimint" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
-				radical="1-46" power="22.270E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_chinqchint" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr"
-				radical="1-8" power="24.473E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_chirloute" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_lille" routing="Full">
-				<router id="gw_lille"/>
-			</AS>
-			<link   id="link_gw_lille" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_lyon" routing="RuleBased" >
-			<cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-				radical="1-56" power="4.7233E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_capricorne" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-				radical="1-79" power="5.6693E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_sagittaire" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_lyon" routing="Full">
-				<router id="gw_lyon"/>
-			</AS>
-			<link   id="link_gw_lyon" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_nancy" routing="RuleBased" >
-			<AS id="AS_graphene" routing="RuleBased" >
-				<cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr"
-					radical="1-39" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr"
-					radical="40-74" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr"
-					radical="75-104" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr"
-					radical="105-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-
-				<AS id="gw_AS_graphene" routing="Full">
-					<router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
-				</AS>
-				<link id="switch-graphene" bandwidth="1250000000" latency="5E-4"/>
-
-				<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				 gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-				 gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
-					<link_ctn id="switch-graphene"/>
-				</ASroute>
-				<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				 gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-				 gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
-					<link_ctn id="switch-graphene"/>
-				</ASroute>
-				<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				 gw_src="graphene-AS_graphene_router.nancy.grid5000.fr"
-				 gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
-					<link_ctn id="switch-graphene"/>
-				</ASroute>
-			</AS>
-			<link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="AS_griffon" routing="RuleBased" >
-				<cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-					radical="1-29,58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-					radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-					radical="61-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-
-				<AS id="gw_AS_griffon" routing="Full">
-					<router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
-				</AS>
-				<link id="switch-griffon" bandwidth="1250000000" latency="5E-4"/>
-
-				<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				 gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-				 gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
-					<link_ctn id="switch-griffon"/>
-				</ASroute>
-				<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				 gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-				 gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
-					<link_ctn id="switch-griffon"/>
-				</ASroute>
-				<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				 gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"
-				 gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
-					<link_ctn id="switch-griffon"/>
-				</ASroute>
-			</AS>
-			<link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_nancy" routing="Full">
-				<router id="gw_nancy"/>
-			</AS>
-			<link   id="link_gw_nancy" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_orsay" routing="RuleBased" >
-			<AS id="AS_gdx" routing="RuleBased" >
-				<cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="1-36" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="37-72" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="73-108" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="109-144" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="145-180" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="193-216" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="217-252" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="253-288" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="289-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="181-186" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-				<cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-					radical="187-192" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-					bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-
-				<AS id="gw_AS_gdx" routing="Full">
-					<router id="gdx-AS_gdx_router.orsay.grid5000.fr"/>
-				</AS>
-				<link id="switch-gdx" bandwidth="1250000000" latency="5E-4"/>
-
-				<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				 gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-				 gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
-					<link_ctn id="switch-gdx"/>
-				</ASroute>
-				<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				 gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-				 gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
-					<link_ctn id="switch-gdx"/>
-				</ASroute>
-				<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				 gw_src="gdx-AS_gdx_router.orsay.grid5000.fr"
-				 gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
-					<link_ctn id="switch-gdx"/>
-				</ASroute>
-			</AS>
-			<link   id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr"
-				radical="1-30" power="4.7144E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_netgdx" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_orsay" routing="Full">
-				<router id="gw_orsay"/>
-			</AS>
-			<link   id="link_gw_orsay" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_rennes" routing="RuleBased" >
-			<cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
-				radical="1-64" power="21.496E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_paradent" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-				radical="1-33" power="12.910E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_paramount" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
-				radical="1-25" power="30.130E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_parapide" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr"
-				radical="1-40" power="27.391E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_parapluie" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_rennes" routing="Full">
-				<router id="gw_rennes"/>
-			</AS>
-			<link   id="link_gw_rennes" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_sophia" routing="RuleBased" >
-			<cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-				radical="1-56" power="7.7318E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_helios" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
-				radical="1-50" power="8.9388E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_sol" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
-				radical="1-45" power="23.530E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_suno" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_sophia" routing="Full">
-				<router id="gw_sophia"/>
-			</AS>
-			<link   id="link_gw_sophia" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<AS id="AS_toulouse" routing="RuleBased" >
-			<cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-				radical="1-80" power="9.5674E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_pastel" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-				radical="1-52" power="5.1143E9" bw="1.25E8" lat="1.0E-4"
-				bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-			<link   id="link_violette" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<AS id="gw_AS_toulouse" routing="Full">
-				<router id="gw_toulouse"/>
-			</AS>
-			<link   id="link_gw_toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-
-			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-				symmetrical="YES">
-					<link_ctn id="link_$1src"/>
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-			<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-				gw_dst="gw_$1dst"
-				symmetrical="NO">
-					<link_ctn id="link_$1src"/>
-			</ASroute>
-
-			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-				symmetrical="NO">
-					<link_ctn id="link_$1dst"/>
-			</ASroute>
-
-		</AS>
-		<ASroute src="AS_toulouse" dst="AS_interne" gw_src="gw_toulouse" gw_dst="toulouse" symmetrical="YES">
-			<link_ctn id="link_gw_toulouse"/>
-		</ASroute>
-		<ASroute src="AS_sophia" dst="AS_interne" gw_src="gw_sophia" gw_dst="sophia" symmetrical="YES">
-			<link_ctn id="link_gw_sophia"/>
-		</ASroute>
-		<ASroute src="AS_rennes" dst="AS_interne" gw_src="gw_rennes" gw_dst="rennes" symmetrical="YES">
-			<link_ctn id="link_gw_rennes"/>
-		</ASroute>
-		<ASroute src="AS_orsay" dst="AS_interne" gw_src="gw_orsay" gw_dst="paris" symmetrical="YES">
-			<link_ctn id="link_gw_orsay"/>
-		</ASroute>
-		<ASroute src="AS_nancy" dst="AS_interne" gw_src="gw_nancy" gw_dst="nancy" symmetrical="YES">
-			<link_ctn id="link_gw_nancy"/>
-		</ASroute>
-		<ASroute src="AS_lyon" dst="AS_interne" gw_src="gw_lyon" gw_dst="lyon" symmetrical="YES">
-			<link_ctn id="link_gw_lyon"/>
-		</ASroute>
-		<ASroute src="AS_lille" dst="AS_interne" gw_src="gw_lille" gw_dst="lille" symmetrical="YES">
-			<link_ctn id="link_gw_lille"/>
-		</ASroute>
-		<ASroute src="AS_grenoble" dst="AS_interne" gw_src="gw_grenoble" gw_dst="grenoble" symmetrical="YES">
-			<link_ctn id="link_gw_grenoble"/>
-		</ASroute>
-		<ASroute src="AS_bordeaux" dst="AS_interne" gw_src="gw_bordeaux" gw_dst="bordeaux" symmetrical="YES">
-			<link_ctn id="link_gw_bordeaux"/>
-		</ASroute>
-	</AS>
-</platform>
diff --git a/examples/platforms/nancy.xml b/examples/platforms/nancy.xml
deleted file mode 100644
index f21a9b160a..0000000000
--- a/examples/platforms/nancy.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-
-<AS id="AS_nancy" routing="RuleBased" >
-	<AS id="AS_graphene" routing="RuleBased" >
-		<cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr"
-			radical="1-39" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-			bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-		<cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr"
-			radical="40-74" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-			bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-		<cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr"
-			radical="75-104" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-			bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-		<cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr"
-			radical="105-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-			bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-
-		<AS id="gw_AS_graphene" routing="Full">
-			<router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
-		</AS>
-		<link id="switch-graphene" bandwidth="1250000000" latency="5E-4"/>
-
-		<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-		 gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-		 gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
-			<link_ctn id="switch-graphene"/>
-		</ASroute>
-		<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-		 gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-		 gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
-			<link_ctn id="switch-graphene"/>
-		</ASroute>
-		<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-		 gw_src="graphene-AS_graphene_router.nancy.grid5000.fr"
-		 gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
-			<link_ctn id="switch-graphene"/>
-		</ASroute>
-	</AS>
-	<link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
-
-	<AS id="AS_griffon" routing="RuleBased" >
-		<cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-			radical="1-29;58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-			bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-		<cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-			radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-			bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-		<cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-			radical="61-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-			bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-
-		<AS id="gw_AS_griffon" routing="Full">
-			<router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
-		</AS>
-		<link id="switch-griffon" bandwidth="1250000000" latency="5E-4"/>
-
-		<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-		 gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-		 gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
-			<link_ctn id="switch-griffon"/>
-		</ASroute>
-		<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-		 gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-		 gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
-			<link_ctn id="switch-griffon"/>
-		</ASroute>
-		<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-		 gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"
-		 gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
-			<link_ctn id="switch-griffon"/>
-		</ASroute>
-	</AS>
-	<link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
-
-	<AS id="gw_AS_nancy" routing="Full">
-		<router id="gw_nancy"/>
-	</AS>
-	<link   id="link_gw_nancy" bandwidth="1.25E9" latency="1.0E-4"/>
-
-	<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-		gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-		gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-		symmetrical="YES">
-			<link_ctn id="link_$1src"/>
-			<link_ctn id="link_$1dst"/>
-	</ASroute>
-
-	<ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-		gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-		gw_dst="gw_$1dst"
-		symmetrical="NO">
-			<link_ctn id="link_$1src"/>
-	</ASroute>
-
-	<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-		gw_src="gw_$1src"
-		gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-		symmetrical="NO">
-			<link_ctn id="link_$1dst"/>
-	</ASroute>
-
-</AS>
-
-</platform>
diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 91ef5077c1..db881dc33e 100644
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -9,19 +9,19 @@
 
 	<AS id="AS0" routing="Full">
 
-		<storage_type id="samsung" model="RAID5" content="storage_content.txt">
+		<storage_type id="samsung" model="RAID5" content="content/storage_content.txt">
 			<prop id="Bwrite" value="30000000" /> <!-- 30Mo/s -->
 			<prop id="Bread" value="100000000" /> <!-- 100Mo/s -->
 			<prop id="Bconnexion" value="6000000000" /> <!-- 6Go/s -->
 		</storage_type>
 
-		<storage_type id="crucial" model="SSD" content="storage_content.txt">
+		<storage_type id="crucial" model="SSD" content="content/storage_content.txt">
 			<prop id="Bwrite" value="30000000" />
 			<prop id="Bread" value="100000000" />
 			<prop id="Bconnexion" value="6000000000" />
 		</storage_type>
 
-		<storage_type id="wdigital" model="RAID0" content="storage_content.txt">
+		<storage_type id="wdigital" model="RAID0" content="content/storage_content.txt">
 			<prop id="Bwrite" value="30000000" />
 			<prop id="Bread" value="100000000" />
 			<prop id="Bconnexion" value="6000000000" />
diff --git a/teshsuite/simdag/platforms/Evaluate_get_route_time.c b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
index 02720c58d4..0994999f34 100644
--- a/teshsuite/simdag/platforms/Evaluate_get_route_time.c
+++ b/teshsuite/simdag/platforms/Evaluate_get_route_time.c
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-//for i in $(seq 1 100); do teshsuite/simdag/platforms/evaluate_get_route_time ../examples/platforms/One_cluster.xml 1 2> /tmp/null ; done
+//for i in $(seq 1 100); do teshsuite/simdag/platforms/evaluate_get_route_time ../examples/platforms/cluster.xml 1 2> /tmp/null ; done
 
 
 #include <stdio.h>
-- 
2.20.1