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

diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index b41fe4db23..3eaa3d539a 100644
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -1,17 +1,13 @@
 <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!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 -->
  
- <!-- 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"/>
@@ -26,22 +22,33 @@
 	       <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 id="host1" speed="1Gf">
+	     <prop id="Hdd" value="180"/>
+	     <prop id="mem" value="4"/>
 	   </host>
 	   
-	   <host id="host2" power="1000000000">
-	     <prop id="SG_TEST_Hdd" value="120"/>
+	   <host id="host2" speed="1Gf">
+	     <prop id="Hdd" value="120"/>
 	   </host>
 	   
-	   <link id="l1" bandwidth="125000000" latency="0.000100">
+	   <link id="l1" bandwidth="125MBps" latency="100us">
 	     <prop id="type" value="Ethernet"/>
 	   </link>
 	   
-	   <link id="l2" bandwidth="125000000" latency="0.000100">
+	   <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>