]> AND Private Git Repository - loba.git/commitdiff
Logo AND Algorithmique Numérique Distribuée

Private GIT Repository
Update XML files to version 4.1. sg_v3_16
authorArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Mon, 30 Apr 2018 19:36:19 +0000 (21:36 +0200)
committerArnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Mon, 30 Apr 2018 19:36:28 +0000 (21:36 +0200)
17 files changed:
Dep.xml
Experimentations/cluster1024.xml
Experimentations/cluster16.xml
Experimentations/cluster256.xml
Experimentations/cluster4096.xml
Experimentations/cluster64.xml
Experimentations/g5k.xml
Experimentations/grid1024.xml
Experimentations/grid16.xml
Experimentations/grid256.xml
Experimentations/grid4096.xml
Experimentations/grid64.xml
Plat.xml
cluster1000.xml
deployment.xml
machines1000.xml
platform.xml

diff --git a/Dep.xml b/Dep.xml
index 1afd9b3b320ae8d98e276dcb80e0b48a6113b055..ce693ddabb79c3340d1b12c4416f03d90347575a 100644 (file)
--- a/Dep.xml
+++ b/Dep.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="1" function="simulation_main">
+<platform version="4.1">
+  <actor host="1" function="simulation_main">
     <argument value="777"/>
     <argument value="2"/>
     <argument value="3"/>
@@ -52,8 +52,8 @@
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="2" function="simulation_main">
+  </actor>
+  <actor host="2" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="3"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="3" function="simulation_main">
+  </actor>
+  <actor host="3" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="4" function="simulation_main">
+  </actor>
+  <actor host="4" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="5" function="simulation_main">
+  </actor>
+  <actor host="5" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="6" function="simulation_main">
+  </actor>
+  <actor host="6" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="7" function="simulation_main">
+  </actor>
+  <actor host="7" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="8" function="simulation_main">
+  </actor>
+  <actor host="8" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="9" function="simulation_main">
+  </actor>
+  <actor host="9" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="10" function="simulation_main">
+  </actor>
+  <actor host="10" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="11" function="simulation_main">
+  </actor>
+  <actor host="11" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="12" function="simulation_main">
+  </actor>
+  <actor host="12" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="13" function="simulation_main">
+  </actor>
+  <actor host="13" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="14" function="simulation_main">
+  </actor>
+  <actor host="14" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="15" function="simulation_main">
+  </actor>
+  <actor host="15" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="16" function="simulation_main">
+  </actor>
+  <actor host="16" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="17" function="simulation_main">
+  </actor>
+  <actor host="17" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="18" function="simulation_main">
+  </actor>
+  <actor host="18" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="19" function="simulation_main">
+  </actor>
+  <actor host="19" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="20" function="simulation_main">
+  </actor>
+  <actor host="20" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="21" function="simulation_main">
+  </actor>
+  <actor host="21" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="22" function="simulation_main">
+  </actor>
+  <actor host="22" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="23" function="simulation_main">
+  </actor>
+  <actor host="23" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="24" function="simulation_main">
+  </actor>
+  <actor host="24" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="25" function="simulation_main">
+  </actor>
+  <actor host="25" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="26" function="simulation_main">
+  </actor>
+  <actor host="26" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="27" function="simulation_main">
+  </actor>
+  <actor host="27" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="28" function="simulation_main">
+  </actor>
+  <actor host="28" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="29" function="simulation_main">
+  </actor>
+  <actor host="29" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="30" function="simulation_main">
+  </actor>
+  <actor host="30" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="31" function="simulation_main">
+  </actor>
+  <actor host="31" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="32" function="simulation_main">
+  </actor>
+  <actor host="32" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="33" function="simulation_main">
+  </actor>
+  <actor host="33" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="34" function="simulation_main">
+  </actor>
+  <actor host="34" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="35" function="simulation_main">
+  </actor>
+  <actor host="35" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="36" function="simulation_main">
+  </actor>
+  <actor host="36" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="37" function="simulation_main">
+  </actor>
+  <actor host="37" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="38" function="simulation_main">
+  </actor>
+  <actor host="38" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="39" function="simulation_main">
+  </actor>
+  <actor host="39" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="40" function="simulation_main">
+  </actor>
+  <actor host="40" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="41" function="simulation_main">
+  </actor>
+  <actor host="41" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="42" function="simulation_main">
+  </actor>
+  <actor host="42" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="43" function="simulation_main">
+  </actor>
+  <actor host="43" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="44" function="simulation_main">
+  </actor>
+  <actor host="44" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="45" function="simulation_main">
+  </actor>
+  <actor host="45" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="46" function="simulation_main">
+  </actor>
+  <actor host="46" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="47" function="simulation_main">
+  </actor>
+  <actor host="47" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="48"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="48" function="simulation_main">
+  </actor>
+  <actor host="48" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="47"/>
     <argument value="49"/>
     <argument value="50"/>
-  </process>
-  <process host="49" function="simulation_main">
+  </actor>
+  <actor host="49" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="47"/>
     <argument value="48"/>
     <argument value="50"/>
-  </process>
-  <process host="50" function="simulation_main">
+  </actor>
+  <actor host="50" function="simulation_main">
     <argument value="0"/>
     <argument value="1"/>
     <argument value="2"/>
     <argument value="47"/>
     <argument value="48"/>
     <argument value="49"/>
-  </process>
+  </actor>
 </platform>
index 2c673127554477142ab4d755c8f0ef30e130c67e..f68435f8121f6a2288a3903865fbbc936e92b8c3 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
+<platform version="4.1">
+<zone  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-101023"
         speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
-</AS>
+</zone>
 </platform>
index 18dcf1fd82b91666cc5e415e833f2e218bf793ba..8d2382c990160488ace4aa70b3c051b415cc3c5f 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
+<platform version="4.1">
+<zone  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100015"
         speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
-</AS>
+</zone>
 </platform>
index 59a8455761dadb73be20d2b7a803a0f101e6484d..8e3381f8cccd3bba29a4c4365d165fb390046774 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
+<platform version="4.1">
+<zone  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100255"
         speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
-</AS>
+</zone>
 </platform>
index 7491cd2dc2ad0d45a5eba9e84f437ae648669a5b..be76986942155601fa0e6d7902361cac250e627a 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
+<platform version="4.1">
+<zone  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-104095"
         speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
-</AS>
+</zone>
 </platform>
index a55848e6aea0e6a27d30242d465a3344c95078eb..fc2d8de7678f102b679c92f8188138e4b167b1b0 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
+<platform version="4.1">
+<zone  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100063"
         speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
-</AS>
+</zone>
 </platform>
index 75eae066ff5a281a9312f551f04d8b894002e9cc..b3e4d6c37fefdb9cfa5838a8d1bf4e3c47ad2a74 100644 (file)
@@ -1,12 +1,12 @@
 <?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 GRID5000 ........................... -->
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /...............................................
+     ../ zone file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -82,7 +82,7 @@
         pastel     - toulouse | nodes=80    speed=4.389E9
         violette   - toulouse | nodes=57    speed=3.586E9
 -->
-<AS id="AS_grid5000" routing="Floyd" >
+<zone id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
    radical="1-48" speed="3.542Gf" bw="125MBps" lat="100us"
    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"/>
     <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"/>
   <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_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>
+  <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_bordereau"   dst="AS_network"     gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"    gw_dst="Bordeaux_gw" ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_bordereau"   gw_src="Bordeaux_gw"  gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"   ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_borderline"  dst="AS_network"     gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="borderline_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_borderline"  gw_src="Bordeaux_gw"  gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr"  ><link_ctn id="borderline_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_chuque"      dst="AS_network"     gw_src="chuque-AS_chuque_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chuque"      gw_src="Lille_gw"     gw_dst="chuque-AS_chuque_router.lille.grid5000.fr"         ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_chinqchint"  dst="AS_network"     gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr"       gw_dst="Lille_gw"   ><link_ctn id="chinqchint_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chinqchint"  gw_src="Lille_gw"     gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr"     ><link_ctn id="chinqchint_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_paradent"     dst="AS_network"     gw_src="paradent-AS_paradent_router.rennes.grid5000.fr"      gw_dst="Rennes_gw"   ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_paradent"     gw_src="Rennes_gw"    gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr"     ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_parapide"    dst="AS_network"     gw_src="parapide-AS_parapide_router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="parapide_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_parapide"    gw_src="Rennes_gw"    gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr"      ><link_ctn id="parapide_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_sol"         dst="AS_network"     gw_src="sol-AS_sol_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"     ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_sol"         gw_src="Sophia_gw"    gw_dst="sol-AS_sol_router.sophia.grid5000.fr"           ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_suno"        dst="AS_network"     gw_src="suno-AS_suno_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"    ><link_ctn id="suno_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_suno"        gw_src="Sophia_gw"    gw_dst="suno-AS_suno_router.sophia.grid5000.fr"          ><link_ctn id="suno_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>
index 7a0db508d3efee7f847a44f992977f767707e893..06e77c14c34ce5efaf625e0bd7fa11cf70ac8725 100644 (file)
@@ -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 1024 hosts grid, based on ........ -->
 <!-- ... Platform description file for GRID5000 ........................... -->
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /...............................................
+     ../ zone file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -83,7 +83,7 @@
         pastel     - toulouse | nodes=43    speed=1e9
         violette   - toulouse | nodes=42    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-43" speed="1Gf" bw="125MBps" lat="100us"
    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"/>
     <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"/>
   <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_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>
+  <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_bordereau"   dst="AS_network"     gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"    gw_dst="Bordeaux_gw" ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_bordereau"   gw_src="Bordeaux_gw"  gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"   ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_borderline"  dst="AS_network"     gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="borderline_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_borderline"  gw_src="Bordeaux_gw"  gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr"  ><link_ctn id="borderline_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_chuque"      dst="AS_network"     gw_src="chuque-AS_chuque_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chuque"      gw_src="Lille_gw"     gw_dst="chuque-AS_chuque_router.lille.grid5000.fr"         ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_chinqchint"  dst="AS_network"     gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr"       gw_dst="Lille_gw"   ><link_ctn id="chinqchint_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chinqchint"  gw_src="Lille_gw"     gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr"     ><link_ctn id="chinqchint_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_paradent"     dst="AS_network"     gw_src="paradent-AS_paradent_router.rennes.grid5000.fr"      gw_dst="Rennes_gw"   ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_paradent"     gw_src="Rennes_gw"    gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr"     ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_parapide"    dst="AS_network"     gw_src="parapide-AS_parapide_router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="parapide_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_parapide"    gw_src="Rennes_gw"    gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr"      ><link_ctn id="parapide_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_sol"         dst="AS_network"     gw_src="sol-AS_sol_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"     ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_sol"         gw_src="Sophia_gw"    gw_dst="sol-AS_sol_router.sophia.grid5000.fr"           ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_suno"        dst="AS_network"     gw_src="suno-AS_suno_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"    ><link_ctn id="suno_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_suno"        gw_src="Sophia_gw"    gw_dst="suno-AS_suno_router.sophia.grid5000.fr"          ><link_ctn id="suno_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>
index e279fee1bbf9dd84ee354cc070455a91cda72ed0..0b7c4c6a206677486d703d179d7f2d6419ca28fe 100644 (file)
@@ -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 16 hosts grid, based on .......... -->
 <!-- ... Platform description file for GRID5000 ........................... -->
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /...............................................
+     ../ zone file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -63,7 +63,7 @@
         grelon     - nancy    | nodes=4     speed=1e9
         azur       - sophia   | 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"
@@ -82,7 +82,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"/>
     <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"/>
   <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_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_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_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>
+  <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_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_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_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>
 
-</AS>
+</zone>
 
 </platform>
index 2ec975e185f00d4887ed715e68c790b3147dcb86..92fafc69021fd44bfc6be7de5959b736e2a94ae7 100644 (file)
@@ -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 256 hosts grid, based on ......... -->
 <!-- ... Platform description file for GRID5000 ........................... -->
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /...............................................
+     ../ zone file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -83,7 +83,7 @@
         pastel     - toulouse | nodes=11    speed=1e9
         violette   - toulouse | nodes=10    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-11" speed="1Gf" bw="125MBps" lat="100us"
    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"/>
     <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"/>
   <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_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>
+  <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_bordereau"   dst="AS_network"     gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"    gw_dst="Bordeaux_gw" ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_bordereau"   gw_src="Bordeaux_gw"  gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"   ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_borderline"  dst="AS_network"     gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="borderline_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_borderline"  gw_src="Bordeaux_gw"  gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr"  ><link_ctn id="borderline_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_chuque"      dst="AS_network"     gw_src="chuque-AS_chuque_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chuque"      gw_src="Lille_gw"     gw_dst="chuque-AS_chuque_router.lille.grid5000.fr"         ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_chinqchint"  dst="AS_network"     gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr"       gw_dst="Lille_gw"   ><link_ctn id="chinqchint_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chinqchint"  gw_src="Lille_gw"     gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr"     ><link_ctn id="chinqchint_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_paradent"     dst="AS_network"     gw_src="paradent-AS_paradent_router.rennes.grid5000.fr"      gw_dst="Rennes_gw"   ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_paradent"     gw_src="Rennes_gw"    gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr"     ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_parapide"    dst="AS_network"     gw_src="parapide-AS_parapide_router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="parapide_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_parapide"    gw_src="Rennes_gw"    gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr"      ><link_ctn id="parapide_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_sol"         dst="AS_network"     gw_src="sol-AS_sol_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"     ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_sol"         gw_src="Sophia_gw"    gw_dst="sol-AS_sol_router.sophia.grid5000.fr"           ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_suno"        dst="AS_network"     gw_src="suno-AS_suno_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"    ><link_ctn id="suno_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_suno"        gw_src="Sophia_gw"    gw_dst="suno-AS_suno_router.sophia.grid5000.fr"          ><link_ctn id="suno_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>
index e40ac9c4184e65e6a1c060c7dc76c06363ac99ad..dfa36dc01f32c5f78e6325b88c180485a53110d7 100644 (file)
@@ -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 4096 hosts grid, based on ........ -->
 <!-- ... Platform description file for GRID5000 ........................... -->
 <!-- ....................................................... 24/09/2010 ... -->
 <!-- ...................................................................... -->
 <!--
-     ../ AS file structure /...............................................
+     ../ zone file structure /...............................................
 
    AS_grid5000(Floyd)
                                       _______________
@@ -83,7 +83,7 @@
         pastel     - toulouse | nodes=171   speed=1e9
         violette   - toulouse | nodes=170   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-171" speed="1Gf" bw="125MBps" lat="100us"
    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"/>
     <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"/>
   <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_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>
+  <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_bordereau"   dst="AS_network"     gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"    gw_dst="Bordeaux_gw" ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_bordereau"   gw_src="Bordeaux_gw"  gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr"   ><link_ctn id="bordereau_gw"/></zoneRoute>
+  <zoneRoute src="AS_borderline"  dst="AS_network"     gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr"   gw_dst="Bordeaux_gw" ><link_ctn id="borderline_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_borderline"  gw_src="Bordeaux_gw"  gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr"  ><link_ctn id="borderline_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_chuque"      dst="AS_network"     gw_src="chuque-AS_chuque_router.lille.grid5000.fr"       gw_dst="Lille_gw"       ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chuque"      gw_src="Lille_gw"     gw_dst="chuque-AS_chuque_router.lille.grid5000.fr"         ><link_ctn id="chuque_gw"/></zoneRoute>
+  <zoneRoute src="AS_chinqchint"  dst="AS_network"     gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr"       gw_dst="Lille_gw"   ><link_ctn id="chinqchint_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_chinqchint"  gw_src="Lille_gw"     gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr"     ><link_ctn id="chinqchint_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_paradent"     dst="AS_network"     gw_src="paradent-AS_paradent_router.rennes.grid5000.fr"      gw_dst="Rennes_gw"   ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_paradent"     gw_src="Rennes_gw"    gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr"     ><link_ctn id="paradent_gw"/></zoneRoute>
+  <zoneRoute src="AS_parapide"    dst="AS_network"     gw_src="parapide-AS_parapide_router.rennes.grid5000.fr"     gw_dst="Rennes_gw"     ><link_ctn id="parapide_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_parapide"    gw_src="Rennes_gw"    gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr"      ><link_ctn id="parapide_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_sol"         dst="AS_network"     gw_src="sol-AS_sol_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"     ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_sol"         gw_src="Sophia_gw"    gw_dst="sol-AS_sol_router.sophia.grid5000.fr"           ><link_ctn id="sol_gw"/></zoneRoute>
+  <zoneRoute src="AS_suno"        dst="AS_network"     gw_src="suno-AS_suno_router.sophia.grid5000.fr"          gw_dst="Sophia_gw"    ><link_ctn id="suno_gw"/></zoneRoute>
+  <zoneRoute src="AS_network"     dst="AS_suno"        gw_src="Sophia_gw"    gw_dst="suno-AS_suno_router.sophia.grid5000.fr"          ><link_ctn id="suno_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>
index 2eef3b64cbbdc5696cc20bae9052218081374d13..7544c44fca6f55a3fc053e68889133a4472c218a 100644 (file)
@@ -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"
    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"/>
     <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"/>
   <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>
index cd8779a439c5c3bc07037f2e043c9ad92acffcf4..b866dc0a89bc13c8e74149ab0732136456c31d05 100644 (file)
--- a/Plat.xml
+++ b/Plat.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+ <zone  id="AS0"  routing="Full">
   <host id="1" speed="98.095Mf"/>
   <host id="2" speed="98.095Mf"/>
   <host id="3" speed="98.095Mf"/>
   <route src="50" dst="49">
     <link_ctn id="unique"/>
   </route>
- </AS>
+ </zone>
 </platform>
index 903c861bae311dc1cd9357a2d59cd3839bea6fc3..762e1f5488ae11c679397545bbc3618a772002fd 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
+<platform version="4.1">
+<zone  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100999"
         speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="FATPIPE"/>
-</AS>
+</zone>
 </platform>
index fb44d0464df644a3ba867cc2e944c9f383660009..c6b34f71ca5a47edf71e7185362f6d4cab17f1ef 100644 (file)
@@ -1,27 +1,27 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Tremblay" function="simulation_main">
+<platform version="4.1">
+  <actor host="Tremblay" function="simulation_main">
     <argument value="5"/>
     <argument value="Jupiter"/>
-  </process>
-  <process host="Jupiter" function="simulation_main">
+  </actor>
+  <actor host="Jupiter" function="simulation_main">
     <argument value="0"/>
     <argument value="Tremblay"/>
     <argument value="Fafard"/>
-  </process>
-  <process host="Fafard" function="simulation_main">
+  </actor>
+  <actor host="Fafard" function="simulation_main">
     <argument value="0"/>
     <argument value="Jupiter"/>
     <argument value="Ginette"/>
-  </process>
-  <process host="Ginette" function="simulation_main">
+  </actor>
+  <actor host="Ginette" function="simulation_main">
     <argument value="0"/>
     <argument value="Fafard"/>
     <argument value="Bourassa"/>
-  </process>
-  <process host="Bourassa" function="simulation_main">
+  </actor>
+  <actor host="Bourassa" function="simulation_main">
     <argument value="0"/>
     <argument value="Ginette"/>
-  </process>
+  </actor>
 </platform>
index 1167a65273da7b22d9ab23e92a4a48f509cebd5a..eda8d969ffa93566875a10a846cb5d083f0feb52 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS  id="AS0"  routing="Full">
+<platform version="4.1">
+<zone  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100999"
         speed="1Gf"
         bw="1.25MBps"     lat="50us"
         bb_bw="22.5MBps" bb_lat="500us" bb_sharing_policy="FATPIPE"/>
-</AS>
+</zone>
 </platform>
index 0216c08ad64d178c37083cbec8bf58ab3c7238ba..fdfa132c084322f0b68a3ba9a08e245175801791 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <AS  id="AS0"  routing="Full">
+<platform version="4.1">
+ <zone  id="AS0"  routing="Full">
    <!-- ljlkj -->
    <host id="Tremblay" speed="98.095Mf"/>
    <host id="Jupiter" speed="76.296Mf"/>
@@ -57,5 +57,5 @@
    <route src="Ginette" dst="Bourassa">
      <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
    </route>
- </AS>
+ </zone>
  </platform>