X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19e10ab8724e2966067019bf63031bc8cbeb027d..a09fdaced8717cdcb0aefb66564bd4825c14e4aa:/examples/platforms/storage.xml

diff --git a/examples/platforms/storage.xml b/examples/platforms/storage.xml
index bcf999558a..cb7c846a51 100644
--- a/examples/platforms/storage.xml
+++ b/examples/platforms/storage.xml
@@ -2,33 +2,57 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 
 <platform version="3">
-	<AS id="AS0" routing="Full">
-
-		<storage id="Disk1" model="HDD" content="content.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
-		</storage>
-		<storage id="Disk2" model="SSD" content="content.txt">
-			<prop id="Bwrite" value="110" />
-			<prop id="Bread" value="300" />
-		</storage>
-		<storage id="Disk3" model="RAID0" content="content.txt">
-			<prop id="Bwrite" value="60" />
-			<prop id="Bread" value="160" />
-		</storage>
-
-		<host id="bob" power="1000000000">
-			<prop id="storage" value="Disk1" />
-		</host>
+
+<config>
+  <prop id="path" value="../examples/platforms/"/>
+</config>
+
+  <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="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="single_HDD"/>
+		<storage id="Disk2" typeId="single_SSD"/>
+		<storage id="Disk3" typeId="single_HDD"/>
+		<storage id="Disk4" typeId="single_SSD"/>
+
+		<host id="bob" power="1Gf">
+			<mount id="Disk1" name="/home"/>			
+		</host>		
 		
-		<storage id="Disk4" model="RAID1" content="content.txt">
-			<prop id="Bwrite" value="30" />
-			<prop id="Bread" value="80" />
-		</storage>
+		<host id="alice" power="1Gf">
+			<mount id="Disk2" name="/home"/>
+		</host>
+
+		<host id="carl" power="1Gf">		
+			<mount id="Disk3" name="/home"/>		
+		</host>
 		
-		<host id="alice" power="1000000000">
-			<prop id="storage" value="Disk4" />
-		</host>		
+		<host id="denise" power="1Gf">
+			<mount id="Disk4" name="/home"/>	
+		</host>
+
+		<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" />
+			<link_ctn id="link2" />
+			<link_ctn id="link3" />
+   		</route>	
 
 	</AS>
 </platform>