X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3f040cd94eef77995a32dc1ae22527ffc828b27..12783570914b603d99b5ffff1c92517592d07e62:/examples/platforms/storage/storage.xml

diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml
index 6372351c88..1402e680f9 100644
--- a/examples/platforms/storage/storage.xml
+++ b/examples/platforms/storage/storage.xml
@@ -1,31 +1,27 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
   <config>
     <prop id="path" value="../examples/platforms/"/>
   </config>
 
-  <AS id="AS0" routing="Full">
-    <storage_type id="single_HDD" size="500GiB" model="linear_no_lat" 
-                  content="content/storage_content.txt" content_type="txt_unix">
+  <zone id="AS0" routing="Full">
+    <storage_type id="single_HDD" size="500GiB" content="content/storage_content.txt">
       <model_prop id="Bwrite" value="30MBps" />
       <model_prop id="Bread" value="100MBps" />
-      <model_prop id="Bconnection" value="120MBps" />
     </storage_type>
 
-    <storage_type id="single_SSD" size="500GiB" model="linear_no_lat"
-                  content="content/storage_content.txt" content_type="txt_unix">
+    <storage_type id="single_SSD" size="500GiB" content="content/storage_content.txt">
       <model_prop id="Bwrite" value="60MBps" />
       <model_prop id="Bread" value="200MBps" />
-      <model_prop id="Bconnection" value="220MBps" />
     </storage_type>
 
     <storage id="Disk1" typeId="single_HDD" attach="bob" />
     <storage id="Disk2" typeId="single_SSD" attach="alice"
-             content="content/win_storage_content.txt" content_type="txt_windows" />
+             content="content/win_storage_content.txt"/>
     <storage id="Disk3" typeId="single_HDD" attach="carl" />
     <storage id="Disk4" typeId="single_SSD" attach="denise"
-             content="content/small_content.txt" content_type="txt_unix" />
+             content="content/small_content.txt" />
 
     <host id="bob" speed="1Gf">
       <mount storageId="Disk1" name="/home"/>
@@ -46,5 +42,5 @@
     <route src="bob" dst="alice">
       <link_ctn id="link1" />
     </route>
-  </AS>
+  </zone>
 </platform>