X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15badc71ce964f6dae6428c9a4c0198fad5d4936..61427a88a76a2c2ef25d0d5b8132995c6f550e5c:/teshsuite/simdag/platforms/two_clusters_router_id.xml

diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml
index ed56047938..43d4e46243 100644
--- a/teshsuite/simdag/platforms/two_clusters_router_id.xml
+++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml
@@ -1,30 +1,19 @@
 <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
- <platform version="3">
-	
- <AS  id="AS0"  routing="Full">
-   	
-     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- 	    radical="0-4" power="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
-   
-     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr"
- 	    radical="0-4" power="1Gf" bw="125MBps" lat="50us"
- 	    bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  
-       
-     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
- 	
-     <ASroute src="bob_cluster" dst="alice_cluster" 
-	 gw_src="bob_cluster_router" 
-	 gw_dst="alice_cluster_router">
- 		<link_ctn id="backbone"/>
-     </ASroute>
-	 
-     <ASroute src="alice_cluster" dst="bob_cluster" 
-	 gw_src="alice_cluster_router" 
-	 gw_dst="bob_cluster_router">
- 		<link_ctn id="backbone"/>
-     </ASroute>   
-     
- </AS>
- </platform>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
+    <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  
+
+    <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
+
+    <zoneRoute src="bob_cluster" dst="alice_cluster" gw_src="bob_cluster_router" gw_dst="alice_cluster_router">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+    <zoneRoute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+  </zone>
+</platform>