X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..71d4334465ce8d44107336c35e5968f5342ae7d0:/examples/platforms/prop.xml

diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index 645f7f38ae..8196cd9433 100644
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -1,46 +1,50 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<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 -->
-  <AS  id="AS0"  routing="Full">
+       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"/>
 
-    <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>
+    <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"
+    <cluster id="acme" prefix="node-" suffix=".simgrid.org" radical="0-4" speed="1Gf"
              bw="125MBps" lat="50us" bb_bw="2.25GBps"  bb_lat="500us">
+      <!-- these props will be attached to the network zone constituting the cluster -->
       <prop id="bla" value="acme cluster"/>
       <prop id="Hdd"  value="180"/>
       <prop id="mem"  value="42"/>
-   </cluster>
+    </cluster>
 
-   <AS  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>
+    <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>
+      <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>
+      <route src="host1" dst="host2">
+        <link_ctn id="l1"/>
+        <link_ctn id="l2"/>
+      </route>
+    </zone>
+  </zone>
 </platform>