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

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"