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

diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index 33a34e112a..fdf39cf84e 100644
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -1,55 +1,49 @@
 <?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 -->
- 
- <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.1">
+  <!-- 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 -->
+  <zone  id="AS0"  routing="Full">
+    <prop id="filename" value="prop.xml"/>
+    <prop id="date" value="31-08-12"/>
+    <prop id="author" value="pnavarro"/>
 
-   <cluster id="acme"
-            prefix="node-"    suffix=".acme.org"
-            radical="0-4"     power="1Gf" 
-            bw="125MBps"      lat="50us"
-            bb_bw="2.25GBps"  bb_lat="500us">
-	    
+    <zone id="AS3"  routing="Full">
+      <zone id="AS1" routing="None">
+        <prop id="name" value="AS1"/>
+      </zone>
+      <zone id="AS2" routing="None">
+        <prop id="name" value="AS2"/>
+     </zone>
+    </zone>
+
+    <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>
+    </cluster>
+
+    <zone  id="AS4"  routing="Full">
+      <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>
 
-   <AS  id="AS4"  routing="Full">
-	   <host id="host1" power="1Gf">
-	     <prop id="Hdd" value="180"/>
-	     <prop id="mem" value="4"/>
-	   </host>
-	   
-	   <host id="host2" power="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>
+      <route src="host1" dst="host2">
+        <link_ctn id="l1"/>
+        <link_ctn id="l2"/>
+      </route>
+    </zone>
+  </zone>
+</platform>