X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a30d839e791237688f68d4047fef5a30293dfc4..4c8b729ca205a05b34613dfe73d5f1b542c189f6:/examples/platforms/bypassASroute.xml

diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml
index 8918b9ab5d..ea93cd3740 100644
--- a/examples/platforms/bypassASroute.xml
+++ b/examples/platforms/bypassASroute.xml
@@ -1,46 +1,32 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-<AS  id="AS0"  routing="Full">
-  <cluster id="my_cluster_1" prefix="" suffix=""
-  		radical="1"	power="1gf"    bw="125MBps"     lat="50us"/>
-		
-  <cluster id="my_cluster_2" prefix="" suffix=""
- 	    radical="2" power="1gf"	bw="125MBps"	lat="50us"/>  
- 	    
-  <cluster id="my_cluster_3" prefix="" suffix=""
-        radical="3" power="1gf"    bw="125MBps"  lat="50us"/>  
-       
-     <link id="link1" bandwidth="1.25GBps" latency="500us"/>  
- 	 <link id="link2" bandwidth="1.25GBps" latency="500us"/>
- 	 <link id="link3" bandwidth="1.25GBps" latency="500us"/>
- 	 <link id="link_tmp"  bandwidth="1.25GBps" latency="500us"/>
- 	
-     <ASroute src="my_cluster_1" dst="my_cluster_2" 
-	 gw_src="my_cluster_1_router" 
-	 gw_dst="my_cluster_2_router">
- 		<link_ctn id="link1"/>
- 		<link_ctn id="link2"/>
-     </ASroute>
-     
-     <ASroute src="my_cluster_1" dst="my_cluster_3" 
-     gw_src="my_cluster_1_router" 
-     gw_dst="my_cluster_3_router">
-        <link_ctn id="link1"/>
-        <link_ctn id="link3"/>
-     </ASroute>
-     
-     <ASroute src="my_cluster_2" dst="my_cluster_3" 
-     gw_src="my_cluster_2_router" 
-     gw_dst="my_cluster_3_router">
-        <link_ctn id="link2"/>
-        <link_ctn id="link3"/>
-     </ASroute>
-     
-     <bypassASroute src="my_cluster_1" dst="my_cluster_2"
-     gw_src="my_cluster_1_router" 
-     gw_dst="my_cluster_2_router">
-        <link_ctn id="link_tmp"/>  
-     </bypassASroute>
-</AS>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
+    <cluster id="my_cluster_1" prefix="" suffix="" radical="1" speed="1Gf" bw="125MBps" lat="50us"/>
+    <cluster id="my_cluster_2" prefix="" suffix="" radical="2" speed="1Gf" bw="125MBps" lat="50us"/>
+    <cluster id="my_cluster_3" prefix="" suffix="" radical="3" speed="1Gf" bw="125MBps" lat="50us"/>
+
+    <link id="link1" bandwidth="1.25GBps" latency="500us"/>
+    <link id="link2" bandwidth="1.25GBps" latency="500us"/>
+    <link id="link3" bandwidth="1.25GBps" latency="500us"/>
+
+    <link id="link_tmp"  bandwidth="1.25GBps" latency="500us"/>
+
+    <zoneRoute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">
+      <link_ctn id="link1"/>
+      <link_ctn id="link2"/>
+    </zoneRoute>
+    <zoneRoute src="my_cluster_1" dst="my_cluster_3" gw_src="my_cluster_1_router" gw_dst="my_cluster_3_router">
+      <link_ctn id="link1"/>
+      <link_ctn id="link3"/>
+    </zoneRoute>
+    <zoneRoute src="my_cluster_2" dst="my_cluster_3" gw_src="my_cluster_2_router" gw_dst="my_cluster_3_router">
+      <link_ctn id="link2"/>
+      <link_ctn id="link3"/>
+    </zoneRoute>
+
+    <bypassASroute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">
+      <link_ctn id="link_tmp"/>
+    </bypassASroute>
+  </zone>
 </platform>