X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0891bb811cbad72a36e0aa215ab5ea6cb1a73640..e7cb73c92a8f68dc513934244646fa1a9d55f601:/teshsuite/simdag/platforms/two_clusters.xml

diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml
index c47ee3bc69..294cab3488 100644
--- a/teshsuite/simdag/platforms/two_clusters.xml
+++ b/teshsuite/simdag/platforms/two_clusters.xml
@@ -1,34 +1,17 @@
 <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "simgrid.dtd">
- <platform version="2">
- <config id="general">
- 	<prop id="test" value="retest"></prop>
- 	<prop id="test" value="retest"></prop>
- 	<prop id="test" value="retest"></prop>
- </config>
-	
- <AS  id="AS0"  routing="Full">
-   	
-     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- 	    radical="0-4" power="1000000000" bw="125000000" lat="5E-5"
- 	    bb_bw="2250000000" bb_lat="5E-4"/>
-   
-     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr"
- 	    radical="0-4" 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="alice_cluster" 
-	 gw_src="bobbob_cluster_router.hamburger.edu" 
-	 gw_dst="alicealice_cluster_router.crepe.fr">
- 		<link_ctn id="backbone"/>
-     </ASroute>   
-     <ASroute src="alice_cluster" dst="bob_cluster" 
-	 gw_src="alicealice_cluster_router.crepe.fr" 
-	 gw_dst="bobbob_cluster_router.hamburger.edu">
- 		<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-1" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us"/>
+    <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-1" 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="alice_cluster" gw_src="bobbob_cluster_router.hamburger.edu"
+             gw_dst="alicealice_cluster_router.crepe.fr">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+  </zone>
+</platform>