X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89df6a48741330160c27b692f6fbfc213db31cbe..e92284beb25991e23cf18c5db06e33d647d77fd7:/examples/platforms/storage.xml

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index 8046a21fd1..451a0bfdb3 100644
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -4,53 +4,50 @@
 <platform version="3">
 
 <config>
-	<prop id="path" value="../examples/platforms/"/>
+  <prop id="path" value="../examples/platforms/"/>
 </config>
 
-	<AS id="AS0" routing="Full">
-
-		<storage_type id="samsung" model="RAID5" content="content/storage_content.txt" size="500">
-			<prop id="Bwrite" value="30000000" /> <!-- 30Mo/s -->
-			<prop id="Bread" value="100000000" /> <!-- 100Mo/s -->
-			<prop id="Bconnection" value="150000000" /> <!-- 150Mo/s -->
-		</storage_type>
-
-		<storage_type id="crucial" model="SSD" content="content/storage_content.txt" size="500">
-			<prop id="Bwrite" value="30000000" />
-			<prop id="Bread" value="100000000" />
-			<prop id="Bconnection" value="150000000" />
-		</storage_type>
-
-		<storage_type id="wdigital" model="RAID0" content="content/storage_content.txt" size="500">
-			<prop id="Bwrite" value="30000000" />
-			<prop id="Bread" value="100000000" />
-			<prop id="Bconnection" value="150000000" />
+  <AS id="AS0" routing="Full">
+
+   <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="150MBps" />
+   </storage_type>
+
+   <storage_type id="single_SSD" model="linear_no_lat"
+                 content="content/storage_content.txt" size="500GiB">
+			<prop id="Bwrite" value="30MBps" />
+			<prop id="Bread" value="100MBps" />
+			<prop id="Bconnection" value="150MBps" />
 		</storage_type>
 
-		<storage id="Disk1" typeId="crucial"/>
-		<storage id="Disk2" typeId="samsung"/>
-		<storage id="Disk3" typeId="wdigital"/>
-		<storage id="Disk4" typeId="wdigital"/>
+		<storage id="Disk1" typeId="single_HDD"/>
+		<storage id="Disk2" typeId="single_SSD"/>
+		<storage id="Disk3" typeId="single_HDD"/>
+		<storage id="Disk4" typeId="single_SSD"/>
 
-		<host id="bob" power="1000000000">
-			<mount id="Disk1" name="/home"/>			
+		<host id="bob" power="1Gf">
+			<mount storageId="Disk1" name="/home"/>			
 		</host>		
 		
-		<host id="alice" power="1000000000">
-			<mount id="Disk2" name="/home"/>
+		<host id="alice" power="1Gf">
+			<mount storageId="Disk2" name="/home"/>
 		</host>
 
-		<host id="carl" power="1000000000">		
-			<mount id="Disk3" name="/home"/>		
+		<host id="carl" power="1Gf">		
+			<mount storageId="Disk3" name="/home"/>		
 		</host>
 		
-		<host id="denise" power="1000000000">
-			<mount id="Disk4" name="/home"/>	
+		<host id="denise" power="1Gf">
+			<mount storageId="Disk4" name="/home"/>	
 		</host>
 
-		<link id="link1" bandwidth="125000000" latency="5E-5" />
-		<link id="link2" bandwidth="125000000" latency="5E-5" />
-		<link id="link3" bandwidth="125000000" latency="5E-5" />
+		<link id="link1" bandwidth="125MBps" latency="50us" />
+		<link id="link2" bandwidth="125MBps" latency="50us" />
+		<link id="link3" bandwidth="125MBps" latency="50us" />
 	
 		<route src="bob" dst="alice" symmetrical="YES">
 			<link_ctn id="link1" />