X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5a4b0bd8b8fab79966acf4f63dfc55781d8c0e54..eaa222acd330e2c3e2c517c5eaab82c8fcb8a4c1:/teshsuite/simdag/platforms/two_clusters_one_name.xml

diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/simdag/platforms/two_clusters_one_name.xml
index 853e4b8e35..dc50aa110b 100644
--- a/teshsuite/simdag/platforms/two_clusters_one_name.xml
+++ b/teshsuite/simdag/platforms/two_clusters_one_name.xml
@@ -1,33 +1,18 @@
 <?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-1" power="1000000000" bw="125000000" lat="5E-5"
- 	    bb_bw="2250000000" bb_lat="5E-4"/>
-   
-     <cluster id="bob_cluster_1" prefix="bob" suffix=".hamburger.edu"
- 	    radical="2-3" power="1000000000" bw="125000000" lat="5E-5"
- 	    bb_bw="2250000000" bb_lat="5E-4"/>
-       
-     <link id="backbone" bandwidth="1250000000" latency="5E-4"/>  
-	 
-	 <ASroute 
-	 src="bob_cluster" 
-	 dst="bob_cluster_1" 
-	 gw_src="bobbob_cluster_router.hamburger.edu" 
-	 gw_dst="bobbob_cluster_1_router.hamburger.edu">
- 		<link_ctn id="backbone"/>
-     </ASroute>  
-	  
-	 <ASroute 
-	 src="bob_cluster_1" 
-	 dst="bob_cluster" 
-	 gw_src="bobbob_cluster_1_router.hamburger.edu" 
-	 gw_dst="bobbob_cluster_router.hamburger.edu">
- 		<link_ctn id="backbone"/>
-     </ASroute>   
- 	 
- </AS>
- </platform>
\ No newline at end of file
+<!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-1" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>
+
+    <cluster id="bob_cluster_1" prefix="bob" suffix=".hamburger.edu" radical="2-3" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>
+
+    <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
+
+    <zoneRoute src="bob_cluster" dst="bob_cluster_1" gw_src="bobbob_cluster_router.hamburger.edu" 
+             gw_dst="bobbob_cluster_1_router.hamburger.edu">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+  </zone>
+</platform>