X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8a30d839e791237688f68d4047fef5a30293dfc4..7b9972a1b7c3d3357a3089161831ca87e055fa61:/examples/platforms/bypassRoute.xml?ds=sidebyside

diff --git a/examples/platforms/bypassRoute.xml b/examples/platforms/bypassRoute.xml
index a4130ec91f..5cb7f57021 100644
--- a/examples/platforms/bypassRoute.xml
+++ b/examples/platforms/bypassRoute.xml
@@ -1,58 +1,71 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-	<AS  id="AS_Big"  routing="Dijkstra">
-	  <AS id="AS_1" routing="Full">    
-	     <host id="AS_1_host1" power="1gf"/>	
-	     <link id="AS_1_link" bandwidth="1.25GBps" latency="500us"/>  
-	     <router id="AS_1_gateway"/>
-	     <route src="AS_1_host1" dst="AS_1_gateway">
-	            <link_ctn id="AS_1_link"/>
-	     </route>	
-	  </AS>
-	  <AS id="AS_2" routing="Floyd">    
-	     <host id="AS_2_host1" power="1gf"/>	
-	     <host id="AS_2_host2" power="1gf"/>	
-	     <host id="AS_2_host3" power="1gf"/>	
-	    
-	     <link id="AS_2_link1" bandwidth="1.25GBps" latency="500us"/>  
-	     <link id="AS_2_link2" bandwidth="1.25GBps" latency="500us"/>  
-	     <link id="AS_2_link3" bandwidth="1.25GBps" latency="500us"/>  
-	     <link id="AS_2_link4" bandwidth="1.25GBps" latency="500us"/>
-	     <link id="AS_2_link5" bandwidth="1.25GBps" latency="500us"/>  
-	     <link id="AS_2_link6" bandwidth="1.25GBps" latency="500us"/>  	       
-	     <link id="AS_2_link7" bandwidth="1.25GBps" latency="500us"/>
-	     
-	     <router id="central_router"/>
-	     <router id="bypass_router1"/>
-	     <router id="bypass_router2"/>
-	     <router id="AS_2_gateway"/>
-	    
-	     <!-- routes providing topological information -->	
-	     <route src="central_router" dst="AS_2_host1"><link_ctn id="AS_2_link1"/></route>	
-	     <route src="central_router" dst="AS_2_host2"><link_ctn id="AS_2_link2"/></route>	
-	     <route src="central_router" dst="AS_2_host3"><link_ctn id="AS_2_link3"/></route>	     
-	     <route src="central_router" dst="AS_2_gateway"><link_ctn id="AS_2_link4"/></route>
-	     
-	     <!--  longer route -->
-	     <route src="bypass_router1" dst="AS_2_host2"><link_ctn id="AS_2_link5"/></route>
-	     <route src="bypass_router1" dst="bypass_router2"><link_ctn id="AS_2_link6"/></route>
-	     <route src="bypass_router2" dst="AS_2_host1"><link_ctn id="AS_2_link7"/></route>
-	     
-	     <!-- bypass route -->
-	     <bypassRoute src="AS_2_host1" dst="AS_2_host2">
-		     <link_ctn id="AS_2_link7"/>
-		     <link_ctn id="AS_2_link6"/>
-		     <link_ctn id="AS_2_link5"/>
-	     </bypassRoute> 	
-	  </AS>
-	  <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  	
-	
-	   <ASroute src="AS_1" dst="AS_2" 
-	gw_src="AS_1_gateway" 
-	gw_dst="AS_2_gateway">
-		<link_ctn id="backbone"/>
-	   </ASroute>
-	   
-	</AS>
-</platform>
\ No newline at end of file
+<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
+<platform version="4.1">
+  <zone  id="AS_Big" routing="Dijkstra">
+    <zone id="AS_1" routing="Full">
+      <host id="AS_1_host1" speed="1Gf"/>
+      <link id="AS_1_link" bandwidth="1.25GBps" latency="500us"/>
+      <router id="AS_1_gateway"/>
+      <route src="AS_1_host1" dst="AS_1_gateway">
+        <link_ctn id="AS_1_link"/>
+      </route>
+    </zone>
+
+    <zone id="AS_2" routing="Floyd">
+      <host id="AS_2_host1" speed="1Gf"/>
+      <host id="AS_2_host2" speed="1Gf"/>
+      <host id="AS_2_host3" speed="1Gf"/>
+
+      <link id="AS_2_link1" bandwidth="1.25GBps" latency="500us"/>
+      <link id="AS_2_link2" bandwidth="1.25GBps" latency="500us"/>
+      <link id="AS_2_link3" bandwidth="1.25GBps" latency="500us"/>
+      <link id="AS_2_link4" bandwidth="1.25GBps" latency="500us"/>
+      <link id="AS_2_link5" bandwidth="1.25GBps" latency="500us"/>
+      <link id="AS_2_link6" bandwidth="1.25GBps" latency="500us"/>
+      <link id="AS_2_link7" bandwidth="1.25GBps" latency="500us"/>
+
+      <router id="central_router"/>
+      <router id="bypass_router1"/>
+      <router id="bypass_router2"/>
+      <router id="AS_2_gateway"/>
+
+      <!-- routes providing topological information -->  
+      <route src="central_router" dst="AS_2_host1">
+        <link_ctn id="AS_2_link1"/>
+      </route>
+      <route src="central_router" dst="AS_2_host2">
+        <link_ctn id="AS_2_link2"/>
+      </route>
+      <route src="central_router" dst="AS_2_host3">
+        <link_ctn id="AS_2_link3"/>
+      </route>
+      <route src="central_router" dst="AS_2_gateway">
+        <link_ctn id="AS_2_link4"/>
+      </route>
+
+      <!--  longer route -->
+      <route src="bypass_router1" dst="AS_2_host2">
+        <link_ctn id="AS_2_link5"/>
+      </route>
+      <route src="bypass_router1" dst="bypass_router2">
+        <link_ctn id="AS_2_link6"/>
+      </route>
+      <route src="bypass_router2" dst="AS_2_host1">
+        <link_ctn id="AS_2_link7"/>
+      </route>
+
+      <!-- bypass route -->
+      <bypassRoute src="AS_2_host1" dst="AS_2_host2">
+        <link_ctn id="AS_2_link7"/>
+        <link_ctn id="AS_2_link6"/>
+        <link_ctn id="AS_2_link5"/>
+      </bypassRoute>
+    </zone>
+
+    <link id="backbone" bandwidth="1.25GBps" latency="500us"/>
+
+    <zoneRoute src="AS_1" dst="AS_2" gw_src="AS_1_gateway" gw_dst="AS_2_gateway">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+  </zone>
+</platform>