Don't test features that are impossible to get right

[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 82f379d..16a0dfd 100644 (file)
--- a/examples/platforms/storage/remote_io.xml
+++ b/examples/platforms/storage/remote_io.xml
@@ -1,86 +1,58 @@
 <?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>
 
-
-<config>
-  <prop id="path" value="../examples/platforms/"/>
-</config>
-
-  <AS id="AS0" routing="Full">
-    <storage_type id="SATA-II_HDD" size="500GB"
-                  content_type="txt_unix" 
-                  content="content/small_content.txt" 
-                  model="linear_no_lat">
+  <zone id="AS0" routing="Full">
+    <storage_type id="SATA-II_HDD" size="500GB" content="content/small_content.txt">
       <model_prop id="Bread" value="92MBps"/> 
       <model_prop id="Bwrite" value="62MBps"/> 
-      <model_prop id="Bconnection" value="122MBps"/> 
     </storage_type>
 
-    <storage id="Disk1" typeId="SATA-II_HDD"
-             attach="carl"/>
+    <storage id="Disk1" typeId="SATA-II_HDD" attach="carl"/>
 
-    <storage id="Disk2" typeId="SATA-II_HDD"
-             attach="dave"
-             content_type="txt_windows" 
+    <storage id="Disk2" typeId="SATA-II_HDD" attach="dave"
              content="content/win_storage_content.txt" />
 
     <host id="alice" speed="1Gf">
-      <mount storageId="Disk2" name="c:"/>                     
+      <mount storageId="Disk2" name="c:"/>
     </host>
-
     <host id="bob" speed="1Gf">
-      <mount storageId="Disk1" name="/scratch"/>                       
+      <mount storageId="Disk1" name="/scratch"/>
     </host>
-
     <host id="carl" speed="1Gf">
-      <mount storageId="Disk1" name="/scratch"/>                       
+      <mount storageId="Disk1" name="/scratch"/>
     </host>
-
     <host id="dave" speed="1Gf">
-      <mount storageId="Disk2" name="c:"/>                     
+      <mount storageId="Disk2" name="c:"/>
     </host>
 
-    <link id="link1" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link2" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link3" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link4" bandwidth="125MBps" 
-          latency="50us"/>
+    <link id="link1" bandwidth="125MBps" latency="50us"/>
+    <link id="link2" bandwidth="125MBps" latency="50us"/>
+    <link id="link3" bandwidth="125MBps" latency="50us"/>
+    <link id="link4" bandwidth="125MBps" latency="50us"/>
+    <link id="link5" bandwidth="125MBps" latency="50us"/>
+    <link id="link6" bandwidth="125MBps" latency="50us"/>
 
-    <link id="link5" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <link id="link6" bandwidth="125MBps" 
-          latency="50us"/>
-
-    <route src="alice" dst="bob" symmetrical="YES">
+    <route src="alice" dst="bob">
       <link_ctn id="link1"/>
     </route>
-
-    <route src="alice" dst="carl" symmetrical="YES">
+    <route src="alice" dst="carl">
       <link_ctn id="link2"/>
     </route>
-
-    <route src="alice" dst="dave" symmetrical="YES">
+    <route src="alice" dst="dave">
       <link_ctn id="link3"/>
     </route>
-
-    <route src="bob" dst="carl" symmetrical="YES">
+    <route src="bob" dst="carl">
       <link_ctn id="link4"/>
     </route>
-
-    <route src="bob" dst="dave" symmetrical="YES">
+    <route src="bob" dst="dave">
       <link_ctn id="link5"/>
     </route>
-
-    <route src="carl" dst="dave" symmetrical="YES">
+    <route src="carl" dst="dave">
       <link_ctn id="link6"/>
     </route>
-  </AS>
+  </zone>
 </platform>