X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2a9afac801b6f592772dfee3a181e27d517a18ef..963b8d1182796bce58318c92742863a8d3f32b37:/teshsuite/simdag/network/mxn/platform_4p_1switch.xml

diff --git a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
index 34493d3ea0..c4f0d55704 100644
--- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
+++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
@@ -1,87 +1,55 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<platform_description version="1">
-  <cpu name="cpu0" power="1"/>
-  <cpu name="cpu1" power="1"/>
-  <cpu name="cpu2" power="1"/>
-  <cpu name="cpu3" power="1"/>
-  
-  <network_link name="switch" bandwidth="2" latency="1" sharing_policy="FATPIPE"/>
-  <network_link name="link0" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  <network_link name="link1" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  <network_link name="link2" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  <network_link name="link3" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  
-  <route src="cpu0" dst="cpu1">
-    <route_element name="link0"/>
-    <route_element name="switch"/>
-    <route_element name="link1"/>
-  </route>
-
-  <route src="cpu0" dst="cpu2">
-    <route_element name="link0"/>
-    <route_element name="switch"/>
-    <route_element name="link2"/>
-  </route>
-
-  <route src="cpu0" dst="cpu3">
-    <route_element name="link0"/>
-    <route_element name="switch"/>
-    <route_element name="link3"/>
-  </route>
-
-  <route src="cpu1" dst="cpu0">
-    <route_element name="link1"/>
-    <route_element name="switch"/>
-    <route_element name="link0"/>
-  </route>
-
-  <route src="cpu1" dst="cpu2">
-    <route_element name="link1"/>
-    <route_element name="switch"/>
-    <route_element name="link2"/>
-  </route>
-
-  <route src="cpu1" dst="cpu3">
-    <route_element name="link1"/>
-    <route_element name="switch"/>
-    <route_element name="link3"/>
-  </route>
-  
-  <route src="cpu2" dst="cpu0">
-    <route_element name="link2"/>
-    <route_element name="switch"/>
-    <route_element name="link0"/>
-  </route>
-
-  <route src="cpu2" dst="cpu1">
-    <route_element name="link2"/>
-    <route_element name="switch"/>
-    <route_element name="link1"/>
-  </route>
-
-  <route src="cpu2" dst="cpu3">
-    <route_element name="link2"/>
-    <route_element name="switch"/>
-    <route_element name="link3"/>
-  </route>
-
-  <route src="cpu3" dst="cpu0">
-    <route_element name="link3"/>
-    <route_element name="switch"/>
-    <route_element name="link0"/>
-  </route>
-
-  <route src="cpu3" dst="cpu1">
-    <route_element name="link3"/>
-    <route_element name="switch"/>
-    <route_element name="link1"/>
-  </route>
-
-  <route src="cpu3" dst="cpu2">
-    <route_element name="link3"/>
-    <route_element name="switch"/>
-    <route_element name="link2"/>
-  </route>
-  
-</platform_description>
+<?xml version='1.0'?>
+ <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+ <platform version="3">
+ <AS  id="AS0"  routing="Full">
+ 
+ 
+   <host id="cpu0" power="1"/>
+   <host id="cpu1" power="1"/>
+   <host id="cpu2" power="1"/>
+   <host id="cpu3" power="1"/>
+   
+   <link id="switch" bandwidth="2" latency="1" sharing_policy="FATPIPE"/>
+   <link id="link0" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
+   <link id="link1" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
+   <link id="link2" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
+   <link id="link3" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
+   
+   <route src="cpu0" dst="cpu1">
+     <link_ctn id="link0"/>
+     <link_ctn id="switch"/>
+     <link_ctn id="link1"/>
+   </route>
+ 
+   <route src="cpu0" dst="cpu2">
+     <link_ctn id="link0"/>
+     <link_ctn id="switch"/>
+     <link_ctn id="link2"/>
+   </route>
+ 
+   <route src="cpu0" dst="cpu3">
+     <link_ctn id="link0"/>
+     <link_ctn id="switch"/>
+     <link_ctn id="link3"/>
+   </route>
+ 
+   <route src="cpu1" dst="cpu2">
+     <link_ctn id="link1"/>
+     <link_ctn id="switch"/>
+     <link_ctn id="link2"/>
+   </route>
+ 
+   <route src="cpu1" dst="cpu3">
+     <link_ctn id="link1"/>
+     <link_ctn id="switch"/>
+     <link_ctn id="link3"/>
+   </route>
+   
+   <route src="cpu2" dst="cpu3">
+     <link_ctn id="link2"/>
+     <link_ctn id="switch"/>
+     <link_ctn id="link3"/>
+   </route>
+ 
+ </AS>
+ </platform>