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

diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 6e62453683..14b5b708c6 100644
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -24,23 +24,33 @@
       <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="lille" dst="paris">
+        <link_ctn id="Lille_Paris"/>
+      </route>
       <route src="paris" dst="nancy">
-        <link_ctn id="Paris_Nancy"/></route>
+        <link_ctn id="Paris_Nancy"/>
+      </route>
       <route src="paris" dst="rennes">
-        <link_ctn id="Paris_Rennes"/></route>
+        <link_ctn id="Paris_Rennes"/>
+      </route>
       <route src="paris" dst="lyon">
-        <link_ctn id="Paris_Lyon"/></route>
+        <link_ctn id="Paris_Lyon"/>
+      </route>
       <route src="bordeaux" dst="lyon">
-        <link_ctn id="Bordeaux_Lyon"/></route>
+        <link_ctn id="Bordeaux_Lyon"/>
+      </route>
       <route src="lyon" dst="grenoble">
-        <link_ctn id="Lyon_Grenoble"/></route>
+        <link_ctn id="Lyon_Grenoble"/>
+      </route>
       <route src="lyon" dst="marseille">
-        <link_ctn id="Lyon_Marseille"/></route>
+        <link_ctn id="Lyon_Marseille"/>
+      </route>
       <route src="marseille" dst="sophia">
-        <link_ctn id="Marseille_Sophia"/></route>
+        <link_ctn id="Marseille_Sophia"/>
+      </route>
       <route src="marseille" dst="toulouse">
-        <link_ctn id="Marseille_Toulouse"/></route>
+        <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" speed="5.2297E9f" bw="1.25E8Bps" lat="1.0E-4s" bb_bw="1.25E9Bps" bb_lat="1.0E-4s"/>
@@ -58,13 +68,16 @@
       <link id="link_gw_bordeaux" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_bordeplage" dst="AS_bordereau" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr">
-         <link_ctn id="link_bordeplage"/><link_ctn id="link_bordereau"/>
+        <link_ctn id="link_bordeplage"/>
+        <link_ctn id="link_bordereau"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="AS_bordereau" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr">
-        <link_ctn id="link_borderline"/><link_ctn id="link_bordereau"/>
+        <link_ctn id="link_borderline"/>
+        <link_ctn id="link_bordereau"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="AS_bordeplage" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr">
-        <link_ctn id="link_borderline"/><link_ctn id="link_bordeplage"/>
+        <link_ctn id="link_borderline"/>
+        <link_ctn id="link_bordeplage"/>
       </ASroute>
 
       <ASroute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
@@ -74,7 +87,7 @@
         <link_ctn id="link_bordeplage"/>
       </ASroute>
       <ASroute src="AS_borderline" dst="gw_AS_bordeaux" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux">
-          <link_ctn id="link_borderline"/>
+        <link_ctn id="link_borderline"/>
       </ASroute>
    </AS>
 
@@ -144,7 +157,8 @@
         <link_ctn id="link_chinqchint"/>
       </ASroute>
       <ASroute src="AS_chimint" dst="AS_chirloute" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr">
-        <link_ctn id="link_chimint"/><link_ctn id="link_chirloute"/>
+        <link_ctn id="link_chimint"/>
+        <link_ctn id="link_chirloute"/>
       </ASroute>
  
       <ASroute src="AS_chicon" dst="AS_chinqchint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr">
@@ -187,14 +201,15 @@
       <link id="link_gw_lyon" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_capricorne" dst="AS_sagittaire" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr">
-          <link_ctn id="link_capricorne"/><link_ctn id="link_sagittaire"/>
+        <link_ctn id="link_capricorne"/>
+        <link_ctn id="link_sagittaire"/>
       </ASroute>
 
       <ASroute src="AS_sagittaire" dst="gw_AS_lyon" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="gw_lyon">
-          <link_ctn id="link_sagittaire"/>
+        <link_ctn id="link_sagittaire"/>
       </ASroute>
       <ASroute src="AS_capricorne" dst="gw_AS_lyon" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="gw_lyon">
-          <link_ctn id="link_capricorne"/>
+        <link_ctn id="link_capricorne"/>
       </ASroute>
     </AS>
 
@@ -266,9 +281,11 @@
 
         <ASroute src="AS_sgriffon1" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
           <link_ctn id="switch-griffon"/>
-        </ASroute><ASroute src="AS_sgriffon2" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+        </ASroute>
+        <ASroute src="AS_sgriffon2" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
           <link_ctn id="switch-griffon"/>
-        </ASroute><ASroute src="AS_sgriffon3" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+        </ASroute>
+        <ASroute src="AS_sgriffon3" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
           <link_ctn id="switch-griffon"/>
         </ASroute>
         </AS>
@@ -280,14 +297,15 @@
       <link id="link_gw_nancy" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_griffon" dst="AS_graphene" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
-          <link_ctn id="link_griffon"/><link_ctn id="link_graphene"/>
+        <link_ctn id="link_griffon"/>
+        <link_ctn id="link_graphene"/>
       </ASroute>
 
       <ASroute src="AS_graphene" dst="gw_AS_nancy" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="gw_nancy">
-          <link_ctn id="link_graphene"/>
+        <link_ctn id="link_graphene"/>
       </ASroute>
       <ASroute src="AS_griffon" dst="gw_AS_nancy" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="gw_nancy">
-          <link_ctn id="link_griffon"/>
+        <link_ctn id="link_griffon"/>
       </ASroute>
     </AS>
 
@@ -521,13 +539,15 @@
       <link id="link_gw_orsay" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_gdx" dst="AS_netgdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr">
-          <link_ctn id="link_gdx"/><link_ctn id="link_netgdx"/>
+        <link_ctn id="link_gdx"/>
+        <link_ctn id="link_netgdx"/>
       </ASroute>
 
       <ASroute src="AS_netgdx" dst="gw_AS_orsay" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="gw_orsay">
-          <link_ctn id="link_netgdx"/>
-      </ASroute><ASroute src="AS_gdx" dst="gw_AS_orsay" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gw_orsay">
-          <link_ctn id="link_gdx"/>
+        <link_ctn id="link_netgdx"/>
+      </ASroute>
+      <ASroute src="AS_gdx" dst="gw_AS_orsay" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gw_orsay">
+        <link_ctn id="link_gdx"/>
       </ASroute>
     </AS>
 
@@ -550,34 +570,41 @@
       <link id="link_gw_rennes" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_parapluie" dst="AS_paradent" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr">
-          <link_ctn id="link_parapluie"/><link_ctn id="link_paradent"/>
+        <link_ctn id="link_parapluie"/>
+        <link_ctn id="link_paradent"/>
       </ASroute>
       <ASroute src="AS_parapide" dst="AS_paradent" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr">
-          <link_ctn id="link_parapide"/><link_ctn id="link_paradent"/>
+        <link_ctn id="link_parapide"/>
+        <link_ctn id="link_paradent"/>
       </ASroute>
       <ASroute src="AS_parapide" dst="AS_parapluie" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr">
-          <link_ctn id="link_parapide"/><link_ctn id="link_parapluie"/>
+        <link_ctn id="link_parapide"/>
+        <link_ctn id="link_parapluie"/>
       </ASroute>
       <ASroute src="AS_paramount" dst="AS_paradent" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr">
-          <link_ctn id="link_paramount"/><link_ctn id="link_paradent"/>
-      </ASroute><ASroute src="AS_paramount" dst="AS_parapluie" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr">
-          <link_ctn id="link_paramount"/><link_ctn id="link_parapluie"/>
+        <link_ctn id="link_paramount"/>
+        <link_ctn id="link_paradent"/>
+      </ASroute>
+      <ASroute src="AS_paramount" dst="AS_parapluie" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr">
+        <link_ctn id="link_paramount"/>
+        <link_ctn id="link_parapluie"/>
       </ASroute>
       <ASroute src="AS_paramount" dst="AS_parapide" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr">
-          <link_ctn id="link_paramount"/><link_ctn id="link_parapide"/>
+        <link_ctn id="link_paramount"/>
+        <link_ctn id="link_parapide"/>
       </ASroute>
 
       <ASroute src="AS_paradent" dst="gw_AS_rennes" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_paradent"/>
+        <link_ctn id="link_paradent"/>
       </ASroute>
       <ASroute src="AS_parapluie" dst="gw_AS_rennes" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_parapluie"/>
+        <link_ctn id="link_parapluie"/>
       </ASroute>
       <ASroute src="AS_parapide" dst="gw_AS_rennes" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_parapide"/>
+        <link_ctn id="link_parapide"/>
       </ASroute>
       <ASroute src="AS_paramount" dst="gw_AS_rennes" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="gw_rennes">
-          <link_ctn id="link_paramount"/>
+        <link_ctn id="link_paramount"/>
       </ASroute>
     </AS>
 
@@ -597,23 +624,26 @@
       <link id="link_gw_sophia" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_helios" dst="AS_sol" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr">
-          <link_ctn id="link_helios"/><link_ctn id="link_sol"/>
+        <link_ctn id="link_helios"/>
+        <link_ctn id="link_sol"/>
       </ASroute>
       <ASroute src="AS_suno" dst="AS_sol" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr">
-          <link_ctn id="link_suno"/><link_ctn id="link_sol"/>
+        <link_ctn id="link_suno"/>
+        <link_ctn id="link_sol"/>
       </ASroute>
       <ASroute src="AS_suno" dst="AS_helios" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr">
-          <link_ctn id="link_suno"/><link_ctn id="link_helios"/>
+        <link_ctn id="link_suno"/>
+        <link_ctn id="link_helios"/>
       </ASroute>
 
       <ASroute src="AS_sol" dst="gw_AS_sophia" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="gw_sophia">
-          <link_ctn id="link_sol"/>
+        <link_ctn id="link_sol"/>
       </ASroute>
       <ASroute src="AS_helios" dst="gw_AS_sophia" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="gw_sophia">
-          <link_ctn id="link_helios"/>
+        <link_ctn id="link_helios"/>
       </ASroute>
       <ASroute src="AS_suno" dst="gw_AS_sophia" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="gw_sophia">
-          <link_ctn id="link_suno"/>
+        <link_ctn id="link_suno"/>
       </ASroute>
     </AS>
 
@@ -630,16 +660,17 @@
       <link id="link_gw_toulouse" bandwidth="1.25E9Bps" latency="1.0E-4s"/>
 
       <ASroute src="AS_violette" dst="AS_pastel" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr">
-          <link_ctn id="link_violette"/>
-          <link_ctn id="link_pastel"/>
+        <link_ctn id="link_violette"/>
+        <link_ctn id="link_pastel"/>
       </ASroute>
 
       <ASroute src="AS_pastel" dst="gw_AS_toulouse" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="gw_toulouse">
-          <link_ctn id="link_pastel"/>
-      </ASroute><ASroute src="AS_violette" dst="gw_AS_toulouse" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="gw_toulouse">
-          <link_ctn id="link_violette"/>
+        <link_ctn id="link_pastel"/>
       </ASroute>
-   </AS>
+      <ASroute src="AS_violette" dst="gw_AS_toulouse" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="gw_toulouse">
+        <link_ctn id="link_violette"/>
+      </ASroute>
+    </AS>
 
     <ASroute src="AS_toulouse" dst="AS_interne" gw_src="gw_toulouse" gw_dst="toulouse">
       <link_ctn id="link_gw_toulouse"/>