X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/8dcf0a5124133d036f79094a9b0f26bd4cde9aef..022ced16770ece3702b75569cd8d6dd98d47690f:/Experimentations/grid64.xml

diff --git a/Experimentations/grid64.xml b/Experimentations/grid64.xml
index 2eef3b6..7544c44 100644
--- a/Experimentations/grid64.xml
+++ b/Experimentations/grid64.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
 <!-- ...................................................................... -->
 <!-- ... Platform description file for a 64 hosts grid, based on .......... -->
 <!-- ... Platform description file for GRID5000 ........................... -->
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /...............................................
+     ../ zone file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -75,7 +75,7 @@
         pastel     - toulouse | nodes=4     speed=1e9
         violette   - toulouse | nodes=4     speed=1e9
 -->
-<AS id="AS_grid5000" routing="Floyd" >
+<zone id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
    radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
@@ -142,7 +142,7 @@
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
 
-  <AS id="AS_network" routing="Floyd" >
+  <zone id="AS_network" routing="Floyd" >
 
     <router id="Lille_sw"/>
     <router id="Paris_sw"/>
@@ -231,7 +231,7 @@
     <route src="Toulouse_gw"  dst="Toulouse_sw"  ><link_ctn id="Toulouse_sw_gw"/></route>
     <route src="Toulouse_sw"  dst="Toulouse_gw"  ><link_ctn id="Toulouse_sw_gw"/></route>
 
-  </AS>
+  </zone>
 
   <link id="bordemer_gw"   bandwidth="125MBps" latency="100us"/>
   <link id="bordeplage_gw" bandwidth="125MBps" latency="100us"/>
@@ -250,39 +250,39 @@
   <link id="pastel_gw"     bandwidth="125MBps" latency="100us"/>
   <link id="violette_gw"   bandwidth="125MBps" latency="100us"/>
 
-  <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_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_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_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_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>
+  <zoneRoute src="AS_bordemer"    dst="AS_network"     gw_src="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"  gw_dst="Bordeaux_gw"    ><link_ctn id="bordemer_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_bordemer"    gw_src="Bordeaux_gw"  gw_dst="bordemer-AS_bordemer_router.bordeaux.grid5000.fr"    ><link_ctn id="bordemer_gw"/></zoneRoute>
+  <zoneRoute src="AS_bordeplage"  dst="AS_network"     gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="bordeplage_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_bordeplage"  gw_src="Bordeaux_gw"  gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr"  ><link_ctn id="bordeplage_gw"/></zoneRoute>
+  <zoneRoute src="AS_chicon"      dst="AS_network"     gw_src="chicon-AS_chicon_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chicon_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chicon"      gw_src="Lille_gw"     gw_dst="chicon-AS_chicon_router.lille.grid5000.fr"         ><link_ctn id="chicon_gw"/></zoneRoute>
+  <zoneRoute src="AS_chti"        dst="AS_network"     gw_src="chti-AS_chti_router.lille.grid5000.fr"         gw_dst="Lille_gw"       ><link_ctn id="chti_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chti"        gw_src="Lille_gw"     gw_dst="chti-AS_chti_router.lille.grid5000.fr"           ><link_ctn id="chti_gw"/></zoneRoute>
+  <zoneRoute src="AS_capricorne"  dst="AS_network"     gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr"   gw_dst="Lyon_gw"         ><link_ctn id="capricorne_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_capricorne"  gw_src="Lyon_gw"      gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr"      ><link_ctn id="capricorne_gw"/></zoneRoute>
+  <zoneRoute src="AS_sagittaire"  dst="AS_network"     gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr"   gw_dst="Lyon_gw"         ><link_ctn id="sagittaire_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_sagittaire"  gw_src="Lyon_gw"      gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr"      ><link_ctn id="sagittaire_gw"/></zoneRoute>
+  <zoneRoute src="AS_grelon"      dst="AS_network"     gw_src="grelon-AS_grelon_router.nancy.grid5000.fr"       gw_dst="Nancy_gw"       ><link_ctn id="grelon_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_grelon"      gw_src="Nancy_gw"     gw_dst="grelon-AS_grelon_router.nancy.grid5000.fr"         ><link_ctn id="grelon_gw"/></zoneRoute>
+  <zoneRoute src="AS_griffon"     dst="AS_network"     gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"      gw_dst="Nancy_gw"       ><link_ctn id="griffon_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_griffon"     gw_src="Nancy_gw"     gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr"        ><link_ctn id="griffon_gw"/></zoneRoute>
+  <zoneRoute src="AS_gdx"         dst="AS_network"     gw_src="gdx-AS_gdx_router.orsay.grid5000.fr"          gw_dst="Orsay_gw"       ><link_ctn id="gdx_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_gdx"         gw_src="Orsay_gw"     gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr"            ><link_ctn id="gdx_gw"/></zoneRoute>
+  <zoneRoute src="AS_gdx2"        dst="AS_network"     gw_src="gdx2-AS_gdx2_router.orsay.grid5000.fr"         gw_dst="Orsay_gw"       ><link_ctn id="gdx2_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_gdx2"        gw_src="Orsay_gw"     gw_dst="gdx2-AS_gdx2_router.orsay.grid5000.fr"           ><link_ctn id="gdx2_gw"/></zoneRoute>
+  <zoneRoute src="AS_paramount"   dst="AS_network"     gw_src="paramount-AS_paramount_router.rennes.grid5000.fr"    gw_dst="Rennes_gw"     ><link_ctn id="paramount_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_paramount"   gw_src="Rennes_gw"    gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr"     ><link_ctn id="paramount_gw"/></zoneRoute>
+  <zoneRoute src="AS_paraquad"    dst="AS_network"     gw_src="paraquad-AS_paraquad_router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="paraquad_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_paraquad"    gw_src="Rennes_gw"    gw_dst="paraquad-AS_paraquad_router.rennes.grid5000.fr"      ><link_ctn id="paraquad_gw"/></zoneRoute>
+  <zoneRoute src="AS_azur"        dst="AS_network"     gw_src="azur-AS_azur_router.sophia.grid5000.fr"         gw_dst="Sophia_gw"     ><link_ctn id="azur_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_azur"        gw_src="Sophia_gw"    gw_dst="azur-AS_azur_router.sophia.grid5000.fr"          ><link_ctn id="azur_gw"/></zoneRoute>
+  <zoneRoute src="AS_helios"      dst="AS_network"     gw_src="helios-AS_helios_router.sophia.grid5000.fr"       gw_dst="Sophia_gw"     ><link_ctn id="helios_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_helios"      gw_src="Sophia_gw"    gw_dst="helios-AS_helios_router.sophia.grid5000.fr"        ><link_ctn id="helios_gw"/></zoneRoute>
+  <zoneRoute src="AS_pastel"      dst="AS_network"     gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr"       gw_dst="Toulouse_gw" ><link_ctn id="pastel_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_pastel"      gw_src="Toulouse_gw"  gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr"      ><link_ctn id="pastel_gw"/></zoneRoute>
+  <zoneRoute src="AS_violette"    dst="AS_network"     gw_src="violette-AS_violette_router.toulouse.grid5000.fr"     gw_dst="Toulouse_gw" ><link_ctn id="violette_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_violette"    gw_src="Toulouse_gw"  gw_dst="violette-AS_violette_router.toulouse.grid5000.fr"    ><link_ctn id="violette_gw"/></zoneRoute>
+
+</zone>
 
 </platform>