X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6fcdbb58baeaadb620882793772664969d5189a..0edfb3697a16278dc71374c725b0dc700ed9e959:/examples/platforms/g5k.xml

diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 6e5df8f794..3e0d3480cc 100644
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -1,5 +1,6 @@
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 	<AS id="AS_grid5000" routing="Floyd">
 		<AS id="AS_interne" routing="Floyd">
 			<router id="lille"/>
@@ -13,15 +14,15 @@
 			<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"/>
+			<link id="Lille_Paris" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Paris_Nancy" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Paris_Rennes" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Paris_Lyon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Bordeaux_Lyon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Lyon_Grenoble" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Lyon_Marseille" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Marseille_Sophia" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
+			<link id="Marseille_Toulouse" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 		<route src="lille" dst="paris"><link_ctn id="Lille_Paris"/></route>
 		<route src="paris" dst="nancy"><link_ctn id="Paris_Nancy"/></route>
@@ -34,19 +35,19 @@
 		<route src="marseille" dst="toulouse"><link_ctn id="Marseille_Toulouse"/></route>
 		</AS>
 		<AS id="AS_bordeaux" routing="Full">
-			<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"/>
-			<link id="link_bordeplage" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr" radical="1-51" speed="5.2297E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_bordeplage" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_bordereau" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr" radical="1-93" speed="8.8925E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_bordereau" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_borderline" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr" radical="1-10" speed="13.357E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_borderline" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_bordeaux" routing="Full">
 				<router id="gw_bordeaux"/>
 			</AS>
-			<link id="link_gw_bordeaux" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_bordeaux" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_bordereau" dst="AS_bordereau" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_bordereau"/>
@@ -86,19 +87,19 @@
 
 		</AS>
 		<AS id="AS_grenoble" routing="Full">
-			<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"/>
-			<link id="link_adonis" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr" radical="1-12" speed="23.681E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_adonis" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_edel" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_edel" prefix="edel-" suffix=".grenoble.grid5000.fr" radical="1-72" speed="23.492E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_edel" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_genepi" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr" radical="1-34" speed="21.175E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_genepi" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_grenoble" routing="Full">
 				<router id="gw_grenoble"/>
 			</AS>
-			<link id="link_gw_grenoble" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_grenoble" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_adonis" dst="AS_adonis" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_adonis"/>
@@ -138,22 +139,22 @@
 
 		</AS>
 		<AS id="AS_lille" routing="Full">
-			<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"/>
-			<link id="link_chicon" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr" radical="1-26" speed="8.9618E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_chicon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_chimint" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_chimint" prefix="chimint-" suffix=".lille.grid5000.fr" radical="1-20" speed="23.531E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_chimint" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_chinqchint" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr" radical="1-46" speed="22.270E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_chinqchint" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_chirloute" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr" radical="1-8" speed="24.473E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_chirloute" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_lille" routing="Full">
 				<router id="gw_lille"/>
 			</AS>
-			<link id="link_gw_lille" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_lille" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_chinqchint" dst="AS_chinqchint" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_chinqchint"/>
@@ -209,16 +210,16 @@
 
 		</AS>
 		<AS id="AS_lyon" routing="Full">
-			<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"/>
-			<link id="link_capricorne" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr" radical="1-56" speed="4.7233E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_capricorne" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_sagittaire" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr" radical="1-79" speed="5.6693E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_sagittaire" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_lyon" routing="Full">
 				<router id="gw_lyon"/>
 			</AS>
-			<link id="link_gw_lyon" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_lyon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_sagittaire" dst="AS_sagittaire" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_sagittaire"/>
@@ -246,15 +247,15 @@
 		</AS>
 		<AS id="AS_nancy" routing="Full">
 			<AS id="AS_graphene" routing="Full">
-				<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 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 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 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 id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="1-39" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="40-74" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="75-104" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="105-144" speed="16.673E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
 
 				<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"/>
+				<link id="switch-graphene" bandwidth="1250000000Bps" latency="5E-4s"/>
 
 				<ASroute src="AS_sgraphene4" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
 					<link_ctn id="switch-graphene"/>
@@ -287,17 +288,17 @@
 					<link_ctn id="switch-graphene"/>
 				</ASroute>
 				</AS>
-			<link id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_graphene" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="AS_griffon" routing="Full">
-				<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 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 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 id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="1-29,58-60" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="30-57" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="61-92" speed="20.678E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
 
 				<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"/>
+				<link id="switch-griffon" bandwidth="1250000000Bps" latency="5E-4s"/>
 
 				<ASroute src="AS_sgriffon1" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
 					<link_ctn id="switch-griffon"/>
@@ -320,12 +321,12 @@
 					<link_ctn id="switch-griffon"/>
 				</ASroute>
 				</AS>
-			<link id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_griffon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_nancy" routing="Full">
 				<router id="gw_nancy"/>
 			</AS>
-			<link id="link_gw_nancy" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_nancy" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_graphene" dst="AS_graphene" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_graphene"/>
@@ -353,22 +354,22 @@
 		</AS>
 		<AS id="AS_orsay" routing="Full">
 			<AS id="AS_gdx" routing="Full">
-				<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 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 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 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 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 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 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 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 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 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 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 id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="1-36" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="37-72" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="73-108" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="109-144" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="145-180" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="193-216" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="217-252" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="253-288" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="289-310" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="181-186" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+				<cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="187-192" speed="4.7153E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
 
 				<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"/>
+				<link id="switch-gdx" bandwidth="1250000000Bps" latency="5E-4s"/>
 
 				<ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
 					<link_ctn id="switch-gdx"/>
@@ -527,15 +528,15 @@
 					<link_ctn id="switch-gdx"/>
 				</ASroute>
 				</AS>
-			<link id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gdx" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_netgdx" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr" radical="1-30" speed="4.7144E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_netgdx" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_orsay" routing="Full">
 				<router id="gw_orsay"/>
 			</AS>
-			<link id="link_gw_orsay" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_orsay" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_netgdx" dst="AS_netgdx" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_netgdx"/>
@@ -562,22 +563,22 @@
 
 		</AS>
 		<AS id="AS_rennes" routing="Full">
-			<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"/>
-			<link id="link_paradent" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr" radical="1-64" speed="21.496E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_paradent" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_paramount" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr" radical="1-33" speed="12.910E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_paramount" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_parapide" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr" radical="1-25" speed="30.130E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_parapide" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_parapluie" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr" radical="1-40" speed="27.391E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_parapluie" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_rennes" routing="Full">
 				<router id="gw_rennes"/>
 			</AS>
-			<link id="link_gw_rennes" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_rennes" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_paradent" dst="AS_paradent" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_paradent"/>
@@ -633,19 +634,19 @@
 
 		</AS>
 		<AS id="AS_sophia" routing="Full">
-			<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"/>
-			<link id="link_helios" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr" radical="1-56" speed="7.7318E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_helios" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_sol" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr" radical="1-50" speed="8.9388E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_sol" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_suno" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr" radical="1-45" speed="23.530E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_suno" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_sophia" routing="Full">
 				<router id="gw_sophia"/>
 			</AS>
-			<link id="link_gw_sophia" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_sophia" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_sol" dst="AS_sol" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_sol"/>
@@ -685,16 +686,16 @@
 
 		</AS>
 		<AS id="AS_toulouse" routing="Full">
-			<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"/>
-			<link id="link_pastel" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr" radical="1-80" speed="9.5674E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_pastel" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
-			<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"/>
-			<link id="link_violette" bandwidth="1.25E9" latency="1.0E-4"/>
+			<cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr" radical="1-52" speed="5.1143E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
+			<link id="link_violette" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<AS id="gw_AS_toulouse" routing="Full">
 				<router id="gw_toulouse"/>
 			</AS>
-			<link id="link_gw_toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
+			<link id="link_gw_toulouse" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
 			<ASroute src="AS_pastel" dst="AS_pastel" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="YES">
 					<link_ctn id="link_pastel"/>