X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/48b49c2ca6573b31386bd5afd4e68304c740e8ec..2955afe732becd712d718abaf6806aef3c0998a6:/Experimentations/grid16.xml?ds=inline

diff --git a/Experimentations/grid16.xml b/Experimentations/grid16.xml
index cef22d0..0b7c4c6 100644
--- a/Experimentations/grid16.xml
+++ b/Experimentations/grid16.xml
@@ -1,12 +1,13 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<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)
                                       _______________
@@ -57,32 +58,31 @@
 
      ../ Cluster description /.............................................
 
-        bordemer   - bordeaux | nodes=4     power=1e9
-        chicon     - lille    | nodes=4     power=1e9
-        grelon     - nancy    | nodes=4     power=1e9
-        azur       - sophia   | nodes=4     power=1e9
+        bordemer   - bordeaux | nodes=4     speed=1e9
+        chicon     - lille    | nodes=4     speed=1e9
+        grelon     - nancy    | nodes=4     speed=1e9
+        azur       - sophia   | nodes=4     speed=1e9
 -->
-<platform version="3">
-<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" power="1e9" bw="1.25E8" lat="1.0E-4"
-   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
+   bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-   radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
-   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
+   bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
-   radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
-   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
+   bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
-   radical="1-4" power="1e9" bw="1.25E8" lat="1.0E-4"
-   bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+   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"/>
@@ -107,27 +107,27 @@
     <router id="Sophia_gw"/>
     <router id="Toulouse_gw"/>
 
-    <link id="Lille_Paris"        bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Luxemburg_Nancy"    bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Paris_Nancy"        bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Paris_Rennes"       bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Paris_Lyon"         bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Bordeaux_Lyon"      bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Lyon_Grenoble"      bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Lyon_Marseille"     bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Marseille_Sophia"   bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Marseille_Toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-
-    <link id="Lille_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Orsay_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Luxemburg_sw_gw" bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Nancy_sw_gw"     bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Rennes_sw_gw"    bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Bordeaux_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Lyon_sw_gw"      bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Grenoble_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Sophia_sw_gw"    bandwidth="1.25E9" latency="1.0E-4"/>
-    <link id="Toulouse_sw_gw"  bandwidth="1.25E9" latency="1.0E-4"/>
+    <link id="Lille_Paris"        bandwidth="1.25GBps" latency="100us"/>
+    <link id="Luxemburg_Nancy"    bandwidth="1.25GBps" latency="100us"/>
+    <link id="Paris_Nancy"        bandwidth="1.25GBps" latency="100us"/>
+    <link id="Paris_Rennes"       bandwidth="1.25GBps" latency="100us"/>
+    <link id="Paris_Lyon"         bandwidth="1.25GBps" latency="100us"/>
+    <link id="Bordeaux_Lyon"      bandwidth="1.25GBps" latency="100us"/>
+    <link id="Lyon_Grenoble"      bandwidth="1.25GBps" latency="100us"/>
+    <link id="Lyon_Marseille"     bandwidth="1.25GBps" latency="100us"/>
+    <link id="Marseille_Sophia"   bandwidth="1.25GBps" latency="100us"/>
+    <link id="Marseille_Toulouse" bandwidth="1.25GBps" latency="100us"/>
+
+    <link id="Lille_sw_gw"     bandwidth="1.25GBps" latency="100us"/>
+    <link id="Orsay_sw_gw"     bandwidth="1.25GBps" latency="100us"/>
+    <link id="Luxemburg_sw_gw" bandwidth="1.25GBps" latency="100us"/>
+    <link id="Nancy_sw_gw"     bandwidth="1.25GBps" latency="100us"/>
+    <link id="Rennes_sw_gw"    bandwidth="1.25GBps" latency="100us"/>
+    <link id="Bordeaux_sw_gw"  bandwidth="1.25GBps" latency="100us"/>
+    <link id="Lyon_sw_gw"      bandwidth="1.25GBps" latency="100us"/>
+    <link id="Grenoble_sw_gw"  bandwidth="1.25GBps" latency="100us"/>
+    <link id="Sophia_sw_gw"    bandwidth="1.25GBps" latency="100us"/>
+    <link id="Toulouse_sw_gw"  bandwidth="1.25GBps" latency="100us"/>
 
     <route src="Lille_sw"     dst="Paris_sw"     ><link_ctn id="Lille_Paris"/></route>
     <route src="Paris_sw"     dst="Lille_sw"     ><link_ctn id="Lille_Paris"/></route>
@@ -171,34 +171,34 @@
     <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>
-
-  <link id="bordemer_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="bordeplage_gw" bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="chicon_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="chti_gw"       bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="capricorne_gw" bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="sagittaire_gw" bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="grelon_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="griffon_gw"    bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="gdx_gw"        bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="gdx2_gw"       bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="paramount_gw"  bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="paraquad_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="azur_gw"       bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="helios_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="pastel_gw"     bandwidth="1.25E8" latency="1.0E-4"/>
-  <link id="violette_gw"   bandwidth="1.25E8" latency="1.0E-4"/>
-
-  <ASroute src="AS_bordemer"    dst="AS_network"     gw_src="bordemer-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>
-
-</AS>
+  </zone>
+
+  <link id="bordemer_gw"   bandwidth="125MBps" latency="100us"/>
+  <link id="bordeplage_gw" bandwidth="125MBps" latency="100us"/>
+  <link id="chicon_gw"     bandwidth="125MBps" latency="100us"/>
+  <link id="chti_gw"       bandwidth="125MBps" latency="100us"/>
+  <link id="capricorne_gw" bandwidth="125MBps" latency="100us"/>
+  <link id="sagittaire_gw" bandwidth="125MBps" latency="100us"/>
+  <link id="grelon_gw"     bandwidth="125MBps" latency="100us"/>
+  <link id="griffon_gw"    bandwidth="125MBps" latency="100us"/>
+  <link id="gdx_gw"        bandwidth="125MBps" latency="100us"/>
+  <link id="gdx2_gw"       bandwidth="125MBps" latency="100us"/>
+  <link id="paramount_gw"  bandwidth="125MBps" latency="100us"/>
+  <link id="paraquad_gw"   bandwidth="125MBps" latency="100us"/>
+  <link id="azur_gw"       bandwidth="125MBps" latency="100us"/>
+  <link id="helios_gw"     bandwidth="125MBps" latency="100us"/>
+  <link id="pastel_gw"     bandwidth="125MBps" latency="100us"/>
+  <link id="violette_gw"   bandwidth="125MBps" latency="100us"/>
+
+  <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>
+
+</zone>
 
 </platform>