cleanup XML jungle in teshsuite

[simgrid.git] / 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 b066d67..57ab438 100644 (file)
--- a/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
+++ b/teshsuite/simdag/network/mxn/platform_4p_1switch.xml
@@ -1,89 +1,23 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "surfxml.dtd">
-<platform version="2">\r
-\r
-\r
-  <host id="cpu0" power="1"/>\r
-  <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">\r
-    <link:ctn id="link0"/>\r
-    <link:ctn id="switch"/>
-    <link:ctn id="link1"/>
-  </route>\r
-
-  <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="cpu0">
-    <link:ctn id="link1"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link0"/>
-  </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="cpu0">
-    <link:ctn id="link2"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link0"/>
-  </route>
-
-  <route src="cpu2" dst="cpu1">
-    <link:ctn id="link2"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link1"/>
-  </route>
-
-  <route src="cpu2" dst="cpu3">
-    <link:ctn id="link2"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link3"/>
-  </route>
-
-  <route src="cpu3" dst="cpu0">
-    <link:ctn id="link3"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link0"/>
-  </route>
-
-  <route src="cpu3" dst="cpu1">
-    <link:ctn id="link3"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link1"/>
-  </route>
-
-  <route src="cpu3" dst="cpu2">
-    <link:ctn id="link3"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link2"/>
-  </route>
-  \r
-</platform>\r
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <AS id="AS0" routing="Full">
+    <host id="cpu0" speed="1f"/>
+    <host id="cpu1" speed="1f"/>
+    <host id="cpu2" speed="1f"/>
+    <host id="cpu3" speed="1f"/>
+
+    <link id="switch" bandwidth="2Bps" latency="1s" sharing_policy="FATPIPE"/>
+    <link id="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="link1" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="link2" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+    <link id="link3" bandwidth="1Bps" latency="500ms" 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>