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

diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml
index 91c760cc94..e4f3a8a08d 100644
--- a/teshsuite/simdag/platforms/two_clusters.xml
+++ b/teshsuite/simdag/platforms/two_clusters.xml
@@ -1,30 +1,24 @@
 <?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>
+ <!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="1000000000" bw="125000000" lat="5E-5"
- 	    bb_bw="2250000000" bb_lat="5E-4"/>
+ 	    radical="0-4" power="1Gf" bw="125MBps" lat="50us"
+ 	    bb_bw="2.25GBps" bb_lat="500us"/>
    
      <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"/>  
+ 	    radical="0-4" power="1Gf" bw="125MBps" lat="50us"
+ 	    bb_bw="2.25GBps" bb_lat="500us"/>  
        
-     <link id="backbone" bandwidth="1250000000" latency="5E-4"/>  
+     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
  	
-     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bob_bob_cluster_router.hamburger.edu" gw_dst="alice_alice_cluster_router.crepe.fr">
+     <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="alice_alice_cluster_router.crepe.fr" gw_dst="bob_bob_cluster_router.hamburger.edu">
- 		<link_ctn id="backbone"/>
-     </ASroute>   
+     </ASroute>
      
  </AS>
  </platform>