Merge branch 'mc++'

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

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 7ee2c20..988e40b 100644 (file)
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -12,32 +12,32 @@
    <storage_type id="single_HDD" model="linear_no_lat" 
                  content="content/storage_content.txt" size="500GiB"
                  content_type="txt_unix">
-      <prop id="Bwrite" value="30MBps" />
-      <prop id="Bread" value="100MBps" />
-      <prop id="Bconnection" value="120MBps" />
+      <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" model="linear_no_lat" size="500GiB">
-      <prop id="Bwrite" value="60MBps" />
-      <prop id="Bread" value="200MBps" />
-      <prop id="Bconnection" value="220MBps" />
+      <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" />
+    <storage id="Disk1" typeId="single_HDD" attach="bob" />
     <storage id="Disk2" typeId="single_SSD"
              content="content/win_storage_content.txt"
-             content_type="txt_windows" />
-    <storage id="Disk3" typeId="single_HDD" />
+             content_type="txt_windows" attach="alice" />
+    <storage id="Disk3" typeId="single_HDD" attach="carl" />
     <storage id="Disk4" typeId="single_SSD"
              content="content/small_content.txt"
-             content_type="txt_unix" />
+             content_type="txt_unix" attach="denise"/>
 
     <host id="bob" power="1Gf">
       <mount storageId="Disk1" name="/home"/>
     </host>
 
     <host id="alice" power="1Gf">
-      <mount storageId="Disk2" name="/windows"/>
+      <mount storageId="Disk2" name="c:"/>
     </host>
 
     <host id="carl" power="1Gf">
@@ -45,7 +45,7 @@
     </host>
 
     <host id="denise" power="1Gf">
-      <mount storageId="Disk2" name="/windows"/>       
+      <mount storageId="Disk2" name="c:"/>     
       <mount storageId="Disk4" name="/home"/>  
     </host>