no more content_type

[simgrid.git] / examples / platforms / storage / storage.xml

diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml
index 8413050..4ea5547 100644 (file)
--- a/examples/platforms/storage/storage.xml
+++ b/examples/platforms/storage/storage.xml
@@ -1,29 +1,31 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <config><prop id="path" value="../examples/platforms/"/></config>
+<platform version="4.1">
+  <config>
+    <prop id="path" value="../examples/platforms/"/>
+  </config>
 
-  <AS id="AS0" routing="Full">
+  <zone id="AS0" routing="Full">
     <storage_type id="single_HDD" size="500GiB" model="linear_no_lat" 
-                  content="content/storage_content.txt" content_type="txt_unix">
-       <model_prop id="Bwrite" value="30MBps" />
-       <model_prop id="Bread" value="100MBps" />
-       <model_prop id="Bconnection" value="120MBps" />
+                  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">
-       <model_prop id="Bwrite" value="60MBps" />
-       <model_prop id="Bread" value="200MBps" />
-       <model_prop id="Bconnection" value="220MBps" />
+                  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"/>
@@ -35,12 +37,14 @@
       <mount storageId="Disk3" name="/home"/>
     </host>
     <host id="denise" speed="1Gf">
-      <mount storageId="Disk2" name="c:"/>     
-      <mount storageId="Disk4" name="/home"/>  
+      <mount storageId="Disk2" name="c:"/>
+      <mount storageId="Disk4" name="/home"/>
     </host>
 
     <link id="link1" bandwidth="125MBps" latency="150us" />
 
-    <route src="bob" dst="alice"><link_ctn id="link1" /></route>
-  </AS>
+    <route src="bob" dst="alice">
+      <link_ctn id="link1" />
+    </route>
+  </zone>
 </platform>