From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Mon, 22 May 2017 20:17:34 +0000 (+0200)
Subject: no more content_type
X-Git-Tag: v3.16~270
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/583acb7106a87631afa0e5e59a82076c7447f735?hp=4f423a58620da6a25058aa753c98a25f56ee05c9

no more content_type
---

diff --git a/examples/platforms/storage/remote_io.xml b/examples/platforms/storage/remote_io.xml
index b654b9cd19..4400e6c298 100644
--- a/examples/platforms/storage/remote_io.xml
+++ b/examples/platforms/storage/remote_io.xml
@@ -7,7 +7,7 @@
 
   <zone id="AS0" routing="Full">
     <storage_type id="SATA-II_HDD" size="500GB" model="linear_no_lat"
-                  content_type="txt_unix" content="content/small_content.txt">
+                  content="content/small_content.txt">
       <model_prop id="Bread" value="92MBps"/> 
       <model_prop id="Bwrite" value="62MBps"/> 
       <model_prop id="Bconnection" value="122MBps"/> 
@@ -16,7 +16,7 @@
     <storage id="Disk1" typeId="SATA-II_HDD" attach="carl"/>
 
     <storage id="Disk2" typeId="SATA-II_HDD" attach="dave"
-             content_type="txt_windows" content="content/win_storage_content.txt" />
+             content="content/win_storage_content.txt" />
 
     <host id="alice" speed="1Gf">
       <mount storageId="Disk2" name="c:"/>
diff --git a/examples/platforms/storage/storage.xml b/examples/platforms/storage/storage.xml
index 449438eb81..4ea5547ec4 100644
--- a/examples/platforms/storage/storage.xml
+++ b/examples/platforms/storage/storage.xml
@@ -7,14 +7,14 @@
 
   <zone id="AS0" routing="Full">
     <storage_type id="single_HDD" size="500GiB" model="linear_no_lat" 
-                  content="content/storage_content.txt" content_type="txt_unix">
+                  content="content/storage_content.txt">
       <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" size="500GiB" model="linear_no_lat"
-                  content="content/storage_content.txt" content_type="txt_unix">
+                  content="content/storage_content.txt">
       <model_prop id="Bwrite" value="60MBps" />
       <model_prop id="Bread" value="200MBps" />
       <model_prop id="Bconnection" value="220MBps" />
@@ -22,10 +22,10 @@
 
     <storage id="Disk1" typeId="single_HDD" attach="bob" />
     <storage id="Disk2" typeId="single_SSD" attach="alice"
-             content="content/win_storage_content.txt" content_type="txt_windows" />
+             content="content/win_storage_content.txt"/>
     <storage id="Disk3" typeId="single_HDD" attach="carl" />
     <storage id="Disk4" typeId="single_SSD" attach="denise"
-             content="content/small_content.txt" content_type="txt_unix" />
+             content="content/small_content.txt" />
 
     <host id="bob" speed="1Gf">
       <mount storageId="Disk1" name="/home"/>