X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/023dc64543f7a3942ae941fc8b0457ea12b1454f..bdede27b55f4d7428f635ef8ade408247dcfae93:/examples/platforms/g5k.xml?ds=sidebyside

diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 46898bdc04..9d20e6c973 100644
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -35,17 +35,17 @@
 		<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=".bordeplage.grid5000.fr"
+			<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=".bordereau.grid5000.fr"
+			<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=".borderline.grid5000.fr"
+			<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"/>
@@ -56,15 +56,15 @@
 			<link   id="link_gw_bordeaux" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -72,24 +72,24 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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=".adonis.grid5000.fr"
+			<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=".edel.grid5000.fr"
+			<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=".genepi.grid5000.fr"
+			<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"/>
@@ -100,15 +100,15 @@
 			<link   id="link_gw_grenoble" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -116,38 +116,48 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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=".chicon.grid5000.fr"
+			<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_chinqchint" prefix="chinqchint-" suffix=".chinqchint.grid5000.fr"
+			<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.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -155,19 +165,19 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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=".capricorne.grid5000.fr"
+			<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=".sagittaire.grid5000.fr"
+			<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"/>
@@ -178,15 +188,15 @@
 			<link   id="link_gw_lyon" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -194,21 +204,82 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
 				symmetrical="NO">
 					<link_ctn id="link_$1dst"/>
 			</ASroute>
 
 		</AS>
 		<AS id="AS_nancy" routing="RuleBased" >
-			<cluster id="AS_graphene" prefix="graphene-" suffix=".graphene.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=".griffon.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">
@@ -217,15 +288,15 @@
 			<link   id="link_gw_nancy" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -233,19 +304,72 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
 				symmetrical="NO">
 					<link_ctn id="link_$1dst"/>
 			</ASroute>
 
 		</AS>
 		<AS id="AS_orsay" routing="RuleBased" >
-			<cluster id="AS_gdx" prefix="gdx-" suffix=".gdx.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=".netgdx.grid5000.fr"
+			<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"/>
@@ -256,15 +380,15 @@
 			<link   id="link_gw_orsay" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -272,29 +396,29 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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=".paradent.grid5000.fr"
+			<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=".paramount.grid5000.fr"
+			<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=".parapide.grid5000.fr"
+			<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=".parapluie.grid5000.fr"
+			<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"/>
@@ -305,15 +429,15 @@
 			<link   id="link_gw_rennes" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -321,24 +445,24 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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=".helios.grid5000.fr"
+			<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=".sol.grid5000.fr"
+			<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=".suno.grid5000.fr"
+			<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"/>
@@ -349,15 +473,15 @@
 			<link   id="link_gw_sophia" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -365,19 +489,19 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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=".pastel.grid5000.fr"
+			<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=".violette.grid5000.fr"
+			<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"/>
@@ -388,15 +512,15 @@
 			<link   id="link_gw_toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
 
 			<ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-				gw_src="$1src-AS_$1src_router.$1src.grid5000.fr"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				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.$1src.grid5000.fr"
+				gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
 				gw_dst="gw_$1dst"
 				symmetrical="NO">
 					<link_ctn id="link_$1src"/>
@@ -404,7 +528,7 @@
 
 			<ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
 				gw_src="gw_$1src"
-				gw_dst="$1dst-AS_$1dst_router.$1dst.grid5000.fr"
+				gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
 				symmetrical="NO">
 					<link_ctn id="link_$1dst"/>
 			</ASroute>