X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5adc846ebd4d6f122e27fcc962b73c05628f1d3..18ba8a3fabab08a493038a2e11e5df5b4b6de4f0:/teshsuite/msg/storage/platform.xml

diff --git a/teshsuite/msg/storage/platform.xml b/teshsuite/msg/storage/platform.xml
index c288fb51fd..aa6b27110e 100644
--- a/teshsuite/msg/storage/platform.xml
+++ b/teshsuite/msg/storage/platform.xml
@@ -4,31 +4,35 @@
 <platform version="3">
 	<AS id="AS0" routing="Full">
 		<!-- STORAGE TYPES -->
-		<storage_type id="crucial" model="SSD" 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 id="crucial" model="SSD" size="500GiB">
+			<model_prop id="Bwrite" value="30000000" /> <!-- 30Mo/s -->
+			<model_prop id="Bread" value="100000000" /> <!-- 100Mo/s -->
+			<model_prop id="Bconnection" value="150000000" /> <!-- 150Mo/s -->
 		</storage_type>
 
-		<storage_type id="single_HDD" model="linear_no_lat" size="500GiB" content_type="txt_unix">
-			<prop id="Bwrite" value="30MBps" />
-			<prop id="Bread" value="100MBps" />
-			<prop id="Bconnection" value="150MBps" />
+		<storage_type id="single_HDD" model="linear_no_lat" size="750GiB" content_type="txt_unix">
+			<model_prop id="Bwrite" value="30MBps" />
+			<model_prop id="Bread" value="100MBps" />
+			<model_prop id="Bconnection" value="150MBps" />
 		</storage_type>
 
-		<storage_type id="single_SSD" model="linear_no_lat" size="500GiB">
-			<prop id="Bwrite" value="30MBps" />
-			<prop id="Bread" value="100MBps" />
-			<prop id="Bconnection" value="150MBps" />
+		<storage_type id="single_SSD" model="linear_no_lat"
+			content="content/storage_content.txt" size="300GiB">
+			<model_prop id="Bwrite" value="30MBps" />
+			<model_prop id="Bread" value="100MBps" />
+			<model_prop id="Bconnection" value="150MBps" />
 		</storage_type>
 
 		<!-- DISKS -->
-		<storage id="cdisk" typeId="single_HDD" content="msg/storage/storage_content_c.txt">
-		   <prop id="usage" value="scratch"/>
-   		   <prop id="date" value="31-08-13"/>
+		<storage id="cdisk" typeId="single_HDD" content="msg/storage/storage_content_c.txt" attach="client"/>
+
+		<storage id="sdisk1" typeId="single_SSD" content="msg/storage/storage_content_s1.txt" attach="server">
+			<prop id="usage" value="File system"/>
+		</storage>
+			
+		<storage id="sdisk2" typeId="single_HDD" content="msg/storage/storage_content_s2.txt" attach="server">
+			<prop id="usage" value="Cache"/>
 		</storage>
-		<storage id="sdisk1" typeId="single_SSD" content="msg/storage/storage_content_s1.txt" />
-		<storage id="sdisk2" typeId="single_HDD" content="msg/storage/storage_content_s2.txt" />
 
 		<!-- HOSTS -->
 		<host id="client" power="1000000000">
@@ -38,7 +42,7 @@
 		<host id="server" power="1000000000">
 			<mount storageId="sdisk1" name="/sd1" />
 			<mount storageId="sdisk2" name="/sd2" />
-			<prop id="ip adress" value="134.165.2.5"/>
+			<prop id="ip adress" value="127.0.0.5"/>
 		</host>
 
 		<!-- LINKS & ROUTES -->