id -> storageId in mount tags + example of content_type + test of

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

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 85ddac8..451a0bf 100644 (file)
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -10,17 +10,18 @@
   <AS id="AS0" routing="Full">
 
    <storage_type id="single_HDD" model="linear_no_lat" 
-                 content="content/storage_content.txt" size="500GiB">
-                       <prop id="Bwrite" value="30000000" />
-                       <prop id="Bread" value="100000000" />
-                       <prop id="Bconnection" value="150000000" />
+                 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="150MBps" />
    </storage_type>
 
    <storage_type id="single_SSD" model="linear_no_lat"
                  content="content/storage_content.txt" size="500GiB">
-                       <prop id="Bwrite" value="30000000" />
-                       <prop id="Bread" value="100000000" />
-                       <prop id="Bconnection" value="150000000" />
+                       <prop id="Bwrite" value="30MBps" />
+                       <prop id="Bread" value="100MBps" />
+                       <prop id="Bconnection" value="150MBps" />
                </storage_type>
 
                <storage id="Disk1" typeId="single_HDD"/>
@@ -29,19 +30,19 @@
                <storage id="Disk4" typeId="single_SSD"/>
 
                <host id="bob" power="1Gf">
-                       <mount id="Disk1" name="/home"/>                        
+                       <mount storageId="Disk1" name="/home"/>                 
                </host>         
                
                <host id="alice" power="1Gf">
-                       <mount id="Disk2" name="/home"/>
+                       <mount storageId="Disk2" name="/home"/>
                </host>
 
                <host id="carl" power="1Gf">            
-                       <mount id="Disk3" name="/home"/>                
+                       <mount storageId="Disk3" name="/home"/>         
                </host>
                
                <host id="denise" power="1Gf">
-                       <mount id="Disk4" name="/home"/>        
+                       <mount storageId="Disk4" name="/home"/> 
                </host>
 
                <link id="link1" bandwidth="125MBps" latency="50us" />