X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b05a0ed4f5fb7b81f96777af37b8f7fc5a4bf160..eba5ae1edf4ba60747de3d624ab2a34bdc2f5b84:/examples/platforms/prop.xml

diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index b41fe4db23..645f7f38ae 100644
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -1,50 +1,46 @@
 <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
- 
- <!-- This file describe a super simple platform which main interest is
-      to define some properties on hosts, processes and links. 
-      It is used in several regression cases on properties -->
- 
- <!-- Some properties' name is prefixed by SG_TEST_ only to simplify
-      the test of GRAS on real life: we don't want to display the whole
-      user's environment here, only the ones related to the test.
-      
-      Of course, this restriction is not needed in your own platforms. -->
- 
- <platform version="3">
- <AS  id="AS0"  routing="Full">
-   <prop id="filename" value="prop.xml"/>
-   <prop id="date" value="31-08-12"/>
-   <prop id="author" value="pnavarro"/>
-   
-   <AS  id="AS3"  routing="Full">
-	   <AS id="AS1" routing="None">
-	       <prop id="name" value="AS1"/>
-	   </AS>
-	   
-	   <AS id="AS2" routing="None">
-	       <prop id="name" value="AS2"/>
-	   </AS>
-   </AS>
-   
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <!-- This file describe a super simple platform which main interest is to define some properties on hosts, 
+      processes and links. It is used in several regression cases on properties -->
+  <AS  id="AS0"  routing="Full">
+    <prop id="filename" value="prop.xml"/>
+    <prop id="date" value="31-08-12"/>
+    <prop id="author" value="pnavarro"/>
+
+    <AS id="AS3"  routing="Full">
+       <AS id="AS1" routing="None">
+         <prop id="name" value="AS1"/>
+      </AS>
+      <AS id="AS2" routing="None">
+         <prop id="name" value="AS2"/>
+     </AS>
+    </AS>
+
+    <cluster id="acme" prefix="node-" suffix=".acme.org" radical="0-4" speed="1Gf"
+             bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
+      <prop id="bla" value="acme cluster"/>
+      <prop id="Hdd"  value="180"/>
+      <prop id="mem"  value="42"/>
+   </cluster>
+
    <AS  id="AS4"  routing="Full">
-	   <host id="host1" power="1000000000">
-	     <prop id="SG_TEST_Hdd" value="180"/>
-	     <prop id="SG_TEST_mem" value="4"/>
-	   </host>
-	   
-	   <host id="host2" power="1000000000">
-	     <prop id="SG_TEST_Hdd" value="120"/>
-	   </host>
-	   
-	   <link id="l1" bandwidth="125000000" latency="0.000100">
-	     <prop id="type" value="Ethernet"/>
-	   </link>
-	   
-	   <link id="l2" bandwidth="125000000" latency="0.000100">
-	     <prop id="type" value="ethernet"/>
-	   </link>
-	   <route src="host1" dst="host2"><link_ctn id="l1"/><link_ctn id="l2"/></route>
+     <host id="host1" speed="1Gf">
+       <prop id="Hdd" value="180"/>
+       <prop id="mem" value="4"/>
+     </host>
+     <host id="host2" speed="1Gf">
+       <prop id="Hdd" value="120"/>
+     </host>
+
+     <link id="l1" bandwidth="125MBps" latency="100us">
+       <prop id="type" value="Ethernet"/>
+     </link>
+     <link id="l2" bandwidth="125MBps" latency="100us">
+       <prop id="type" value="ethernet"/>
+     </link>
+
+     <route src="host1" dst="host2"><link_ctn id="l1"/><link_ctn id="l2"/></route>
    </AS>
- </AS>
- </platform>
+  </AS>
+</platform>