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

diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 3535b37429..4776b8305e 100644
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -81,7 +81,7 @@
         pastel     - toulouse | nodes=80    power=4.389E9
         violette   - toulouse | nodes=57    power=3.586E9
 -->
-<platform version="2">
+<platform version="3">
 <AS id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
@@ -297,54 +297,54 @@
   <link id="pastel_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
   <link id="violette_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
   
-  <ASroute src="AS_bordemer"    dst="AS_network"     gw_src="bordemer-router.bordeaux.grid5000.fr"  gw_dst="Bordeaux_gw"    ><link_ctn id="bordemer_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_bordemer"    gw_src="Bordeaux_gw"  gw_dst="bordemer-router.bordeaux.grid5000.fr"    ><link_ctn id="bordemer_gw"/></ASroute>
-  <ASroute src="AS_bordeplage"  dst="AS_network"     gw_src="bordeplage-router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="bordeplage_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_bordeplage"  gw_src="Bordeaux_gw"  gw_dst="bordeplage-router.bordeaux.grid5000.fr"  ><link_ctn id="bordeplage_gw"/></ASroute>
-  <ASroute src="AS_bordereau"   dst="AS_network"     gw_src="bordereau-router.bordeaux.grid5000.fr"    gw_dst="Bordeaux_gw" ><link_ctn id="bordereau_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_bordereau"   gw_src="Bordeaux_gw"  gw_dst="bordereau-router.bordeaux.grid5000.fr"   ><link_ctn id="bordereau_gw"/></ASroute>
-  <ASroute src="AS_borderline"  dst="AS_network"     gw_src="borderline-router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="borderline_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_borderline"  gw_src="Bordeaux_gw"  gw_dst="borderline-router.bordeaux.grid5000.fr"  ><link_ctn id="borderline_gw"/></ASroute>
-  <ASroute src="AS_chicon"      dst="AS_network"     gw_src="chicon-router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chicon_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_chicon"      gw_src="Lille_gw"     gw_dst="chicon-router.lille.grid5000.fr"         ><link_ctn id="chicon_gw"/></ASroute>
-  <ASroute src="AS_chti"        dst="AS_network"     gw_src="chti-router.lille.grid5000.fr"         gw_dst="Lille_gw"       ><link_ctn id="chti_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_chti"        gw_src="Lille_gw"     gw_dst="chti-router.lille.grid5000.fr"           ><link_ctn id="chti_gw"/></ASroute>
-  <ASroute src="AS_chuque"      dst="AS_network"     gw_src="chuque-router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chuque_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_chuque"      gw_src="Lille_gw"     gw_dst="chuque-router.lille.grid5000.fr"         ><link_ctn id="chuque_gw"/></ASroute>
-  <ASroute src="AS_chinqchint"  dst="AS_network"     gw_src="chinqchint-router.lille.grid5000.fr"       gw_dst="Lille_gw"   ><link_ctn id="chinqchint_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_chinqchint"  gw_src="Lille_gw"     gw_dst="chinqchint-router.lille.grid5000.fr"     ><link_ctn id="chinqchint_gw"/></ASroute>
-  <ASroute src="AS_capricorne"  dst="AS_network"     gw_src="capricorne-router.lyon.grid5000.fr"   gw_dst="Lyon_gw"         ><link_ctn id="capricorne_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_capricorne"  gw_src="Lyon_gw"      gw_dst="capricorne-router.lyon.grid5000.fr"      ><link_ctn id="capricorne_gw"/></ASroute>
-  <ASroute src="AS_sagittaire"  dst="AS_network"     gw_src="sagittaire-router.lyon.grid5000.fr"   gw_dst="Lyon_gw"         ><link_ctn id="sagittaire_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_sagittaire"  gw_src="Lyon_gw"      gw_dst="sagittaire-router.lyon.grid5000.fr"      ><link_ctn id="sagittaire_gw"/></ASroute>
-  <ASroute src="AS_grelon"      dst="AS_network"     gw_src="grelon-router.nancy.grid5000.fr"       gw_dst="Nancy_gw"       ><link_ctn id="grelon_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_grelon"      gw_src="Nancy_gw"     gw_dst="grelon-router.nancy.grid5000.fr"         ><link_ctn id="grelon_gw"/></ASroute>
-  <ASroute src="AS_griffon"     dst="AS_network"     gw_src="griffon-router.nancy.grid5000.fr"      gw_dst="Nancy_gw"       ><link_ctn id="griffon_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_griffon"     gw_src="Nancy_gw"     gw_dst="griffon-router.nancy.grid5000.fr"        ><link_ctn id="griffon_gw"/></ASroute>
-  <ASroute src="AS_gdx"         dst="AS_network"     gw_src="gdx-router.orsay.grid5000.fr"          gw_dst="Orsay_gw"       ><link_ctn id="gdx_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_gdx"         gw_src="Orsay_gw"     gw_dst="gdx-router.orsay.grid5000.fr"            ><link_ctn id="gdx_gw"/></ASroute>
-  <ASroute src="AS_gdx2"        dst="AS_network"     gw_src="gdx2-router.orsay.grid5000.fr"         gw_dst="Orsay_gw"       ><link_ctn id="gdx2_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_gdx2"        gw_src="Orsay_gw"     gw_dst="gdx2-router.orsay.grid5000.fr"           ><link_ctn id="gdx2_gw"/></ASroute>
-  <ASroute src="AS_paramount"   dst="AS_network"     gw_src="paramount-router.rennes.grid5000.fr"    gw_dst="Rennes_gw"     ><link_ctn id="paramount_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_paramount"   gw_src="Rennes_gw"    gw_dst="paramount-router.rennes.grid5000.fr"     ><link_ctn id="paramount_gw"/></ASroute>
-  <ASroute src="AS_paraquad"    dst="AS_network"     gw_src="paraquad-router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="paraquad_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_paraquad"    gw_src="Rennes_gw"    gw_dst="paraquad-router.rennes.grid5000.fr"      ><link_ctn id="paraquad_gw"/></ASroute>
-  <ASroute src="AS_paradent"     dst="AS_network"     gw_src="paradent-router.rennes.grid5000.fr"      gw_dst="Rennes_gw"   ><link_ctn id="paradent_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_paradent"     gw_src="Rennes_gw"    gw_dst="paradent-router.rennes.grid5000.fr"     ><link_ctn id="paradent_gw"/></ASroute>
-  <ASroute src="AS_parapide"    dst="AS_network"     gw_src="parapide-router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="parapide_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_parapide"    gw_src="Rennes_gw"    gw_dst="parapide-router.rennes.grid5000.fr"      ><link_ctn id="parapide_gw"/></ASroute>
-  <ASroute src="AS_azur"        dst="AS_network"     gw_src="azur-router.sophia.grid5000.fr"         gw_dst="Sophia_gw"     ><link_ctn id="azur_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_azur"        gw_src="Sophia_gw"    gw_dst="azur-router.sophia.grid5000.fr"          ><link_ctn id="azur_gw"/></ASroute>
-  <ASroute src="AS_helios"      dst="AS_network"     gw_src="helios-router.sophia.grid5000.fr"       gw_dst="Sophia_gw"     ><link_ctn id="helios_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_helios"      gw_src="Sophia_gw"    gw_dst="helios-router.sophia.grid5000.fr"        ><link_ctn id="helios_gw"/></ASroute>
-  <ASroute src="AS_sol"         dst="AS_network"     gw_src="sol-router.sophia.grid5000.fr"          gw_dst="Sophia_gw"     ><link_ctn id="sol_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_sol"         gw_src="Sophia_gw"    gw_dst="sol-router.sophia.grid5000.fr"           ><link_ctn id="sol_gw"/></ASroute>
-  <ASroute src="AS_suno"        dst="AS_network"     gw_src="suno-router.sophia.grid5000.fr"          gw_dst="Sophia_gw"    ><link_ctn id="suno_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_suno"        gw_src="Sophia_gw"    gw_dst="suno-router.sophia.grid5000.fr"          ><link_ctn id="suno_gw"/></ASroute>
-  <ASroute src="AS_pastel"      dst="AS_network"     gw_src="pastel-router.toulouse.grid5000.fr"       gw_dst="Toulouse_gw" ><link_ctn id="pastel_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_pastel"      gw_src="Toulouse_gw"  gw_dst="pastel-router.toulouse.grid5000.fr"      ><link_ctn id="pastel_gw"/></ASroute>
-  <ASroute src="AS_violette"    dst="AS_network"     gw_src="violette-router.toulouse.grid5000.fr"     gw_dst="Toulouse_gw" ><link_ctn id="violette_gw"/></ASroute>
-  <ASroute src="AS_network"     dst="AS_violette"    gw_src="Toulouse_gw"  gw_dst="violette-router.toulouse.grid5000.fr"    ><link_ctn id="violette_gw"/></ASroute>
+  <ASroute src="AS_bordemer"    dst="AS_network"     gw_src="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"  gw_dst="Bordeaux_gw"    ><link_ctn id="bordemer_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_bordemer"    gw_src="Bordeaux_gw"  gw_dst="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"    ><link_ctn id="bordemer_gw"/></ASroute>
+  <ASroute src="AS_bordeplage"  dst="AS_network"     gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="bordeplage_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_bordeplage"  gw_src="Bordeaux_gw"  gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr"  ><link_ctn id="bordeplage_gw"/></ASroute>
+  <ASroute src="AS_bordereau"   dst="AS_network"     gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"    gw_dst="Bordeaux_gw" ><link_ctn id="bordereau_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_bordereau"   gw_src="Bordeaux_gw"  gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"   ><link_ctn id="bordereau_gw"/></ASroute>
+  <ASroute src="AS_borderline"  dst="AS_network"     gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="borderline_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_borderline"  gw_src="Bordeaux_gw"  gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr"  ><link_ctn id="borderline_gw"/></ASroute>
+  <ASroute src="AS_chicon"      dst="AS_network"     gw_src="chicon-AS_chicon_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chicon_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_chicon"      gw_src="Lille_gw"     gw_dst="chicon-AS_chicon_router.lille.grid5000.fr"         ><link_ctn id="chicon_gw"/></ASroute>
+  <ASroute src="AS_chti"        dst="AS_network"     gw_src="chti-AS_chti_router.lille.grid5000.fr"         gw_dst="Lille_gw"       ><link_ctn id="chti_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_chti"        gw_src="Lille_gw"     gw_dst="chti-AS_chti_router.lille.grid5000.fr"           ><link_ctn id="chti_gw"/></ASroute>
+  <ASroute src="AS_chuque"      dst="AS_network"     gw_src="chuque-AS_chuque_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chuque_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_chuque"      gw_src="Lille_gw"     gw_dst="chuque-AS_chuque_router.lille.grid5000.fr"         ><link_ctn id="chuque_gw"/></ASroute>
+  <ASroute src="AS_chinqchint"  dst="AS_network"     gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr"       gw_dst="Lille_gw"   ><link_ctn id="chinqchint_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_chinqchint"  gw_src="Lille_gw"     gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr"     ><link_ctn id="chinqchint_gw"/></ASroute>
+  <ASroute src="AS_capricorne"  dst="AS_network"     gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr"   gw_dst="Lyon_gw"         ><link_ctn id="capricorne_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_capricorne"  gw_src="Lyon_gw"      gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr"      ><link_ctn id="capricorne_gw"/></ASroute>
+  <ASroute src="AS_sagittaire"  dst="AS_network"     gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr"   gw_dst="Lyon_gw"         ><link_ctn id="sagittaire_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_sagittaire"  gw_src="Lyon_gw"      gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr"      ><link_ctn id="sagittaire_gw"/></ASroute>
+  <ASroute src="AS_grelon"      dst="AS_network"     gw_src="grelon-AS_grelon_router.nancy.grid5000.fr"       gw_dst="Nancy_gw"       ><link_ctn id="grelon_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_grelon"      gw_src="Nancy_gw"     gw_dst="grelon-AS_grelon_router.nancy.grid5000.fr"         ><link_ctn id="grelon_gw"/></ASroute>
+  <ASroute src="AS_griffon"     dst="AS_network"     gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"      gw_dst="Nancy_gw"       ><link_ctn id="griffon_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_griffon"     gw_src="Nancy_gw"     gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr"        ><link_ctn id="griffon_gw"/></ASroute>
+  <ASroute src="AS_gdx"         dst="AS_network"     gw_src="gdx-AS_gdx_router.orsay.grid5000.fr"          gw_dst="Orsay_gw"       ><link_ctn id="gdx_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_gdx"         gw_src="Orsay_gw"     gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr"            ><link_ctn id="gdx_gw"/></ASroute>
+  <ASroute src="AS_gdx2"        dst="AS_network"     gw_src="gdx2-AS_gdx2_router.orsay.grid5000.fr"         gw_dst="Orsay_gw"       ><link_ctn id="gdx2_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_gdx2"        gw_src="Orsay_gw"     gw_dst="gdx2-AS_gdx2_router.orsay.grid5000.fr"           ><link_ctn id="gdx2_gw"/></ASroute>
+  <ASroute src="AS_paramount"   dst="AS_network"     gw_src="paramount-AS_paramount_router.rennes.grid5000.fr"    gw_dst="Rennes_gw"     ><link_ctn id="paramount_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_paramount"   gw_src="Rennes_gw"    gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr"     ><link_ctn id="paramount_gw"/></ASroute>
+  <ASroute src="AS_paraquad"    dst="AS_network"     gw_src="paraquad-AS_paraquad_router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="paraquad_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_paraquad"    gw_src="Rennes_gw"    gw_dst="paraquad-AS_paraquad_router.rennes.grid5000.fr"      ><link_ctn id="paraquad_gw"/></ASroute>
+  <ASroute src="AS_paradent"     dst="AS_network"     gw_src="paradent-AS_paradent_router.rennes.grid5000.fr"      gw_dst="Rennes_gw"   ><link_ctn id="paradent_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_paradent"     gw_src="Rennes_gw"    gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr"     ><link_ctn id="paradent_gw"/></ASroute>
+  <ASroute src="AS_parapide"    dst="AS_network"     gw_src="parapide-AS_parapide_router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="parapide_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_parapide"    gw_src="Rennes_gw"    gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr"      ><link_ctn id="parapide_gw"/></ASroute>
+  <ASroute src="AS_azur"        dst="AS_network"     gw_src="azur-AS_azur_router.sophia.grid5000.fr"         gw_dst="Sophia_gw"     ><link_ctn id="azur_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_azur"        gw_src="Sophia_gw"    gw_dst="azur-AS_azur_router.sophia.grid5000.fr"          ><link_ctn id="azur_gw"/></ASroute>
+  <ASroute src="AS_helios"      dst="AS_network"     gw_src="helios-AS_helios_router.sophia.grid5000.fr"       gw_dst="Sophia_gw"     ><link_ctn id="helios_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_helios"      gw_src="Sophia_gw"    gw_dst="helios-AS_helios_router.sophia.grid5000.fr"        ><link_ctn id="helios_gw"/></ASroute>
+  <ASroute src="AS_sol"         dst="AS_network"     gw_src="sol-AS_sol_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"     ><link_ctn id="sol_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_sol"         gw_src="Sophia_gw"    gw_dst="sol-AS_sol_router.sophia.grid5000.fr"           ><link_ctn id="sol_gw"/></ASroute>
+  <ASroute src="AS_suno"        dst="AS_network"     gw_src="suno-AS_suno_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"    ><link_ctn id="suno_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_suno"        gw_src="Sophia_gw"    gw_dst="suno-AS_suno_router.sophia.grid5000.fr"          ><link_ctn id="suno_gw"/></ASroute>
+  <ASroute src="AS_pastel"      dst="AS_network"     gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr"       gw_dst="Toulouse_gw" ><link_ctn id="pastel_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_pastel"      gw_src="Toulouse_gw"  gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr"      ><link_ctn id="pastel_gw"/></ASroute>
+  <ASroute src="AS_violette"    dst="AS_network"     gw_src="violette-AS_violette_router.toulouse.grid5000.fr"     gw_dst="Toulouse_gw" ><link_ctn id="violette_gw"/></ASroute>
+  <ASroute src="AS_network"     dst="AS_violette"    gw_src="Toulouse_gw"  gw_dst="violette-AS_violette_router.toulouse.grid5000.fr"    ><link_ctn id="violette_gw"/></ASroute>
     
 </AS>