no more content_type

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

diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml
index 2505796..4400e6c 100644 (file)
--- a/examples/platforms/storage/remote_io.xml
+++ b/examples/platforms/storage/remote_io.xml
@@ -1,11 +1,13 @@
 <?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="SATA-II_HDD" size="500GB" model="linear_no_lat"
-                  content_type="txt_unix" content="content/small_content.txt">
+                  content="content/small_content.txt">
       <model_prop id="Bread" value="92MBps"/> 
       <model_prop id="Bwrite" value="62MBps"/> 
       <model_prop id="Bconnection" value="122MBps"/> 
@@ -14,7 +16,7 @@
     <storage id="Disk1" typeId="SATA-II_HDD" attach="carl"/>
 
     <storage id="Disk2" typeId="SATA-II_HDD" attach="dave"
-             content_type="txt_windows" content="content/win_storage_content.txt" />
+             content="content/win_storage_content.txt" />
 
     <host id="alice" speed="1Gf">
       <mount storageId="Disk2" name="c:"/>
@@ -36,11 +38,23 @@
     <link id="link5" bandwidth="125MBps" latency="50us"/>
     <link id="link6" bandwidth="125MBps" latency="50us"/>
 
-    <route src="alice" dst="bob" symmetrical="YES"><link_ctn id="link1"/></route>
-    <route src="alice" dst="carl" symmetrical="YES"><link_ctn id="link2"/></route>
-    <route src="alice" dst="dave" symmetrical="YES"><link_ctn id="link3"/></route>
-    <route src="bob" dst="carl" symmetrical="YES"><link_ctn id="link4"/></route>
-    <route src="bob" dst="dave" symmetrical="YES"><link_ctn id="link5"/></route>
-    <route src="carl" dst="dave" symmetrical="YES"><link_ctn id="link6"/></route>
-  </AS>
+    <route src="alice" dst="bob">
+      <link_ctn id="link1"/>
+    </route>
+    <route src="alice" dst="carl">
+      <link_ctn id="link2"/>
+    </route>
+    <route src="alice" dst="dave">
+      <link_ctn id="link3"/>
+    </route>
+    <route src="bob" dst="carl">
+      <link_ctn id="link4"/>
+    </route>
+    <route src="bob" dst="dave">
+      <link_ctn id="link5"/>
+    </route>
+    <route src="carl" dst="dave">
+      <link_ctn id="link6"/>
+    </route>
+  </zone>
 </platform>