cleanup XML jungle in teshsuite

[simgrid.git] / teshsuite / simdag / network / p2p / platform_2p_1switch.xml

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
index 5472228..bd1e546 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1switch.xml
@@ -1,23 +1,14 @@
-<?xml version='1.0'?>\r
-<!DOCTYPE platform_description SYSTEM "surfxml.dtd">\r
-<platform_description version="1">\r
-  <cpu name="cpu0" power="1"/>\r
-  <cpu name="cpu1" 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"/>
-  
-  <route src="cpu0" dst="cpu1">\r
-    <route_element name="link0"/>\r
-    <route_element name="switch"/>
-    <route_element name="link1"/>
-  </route>\r
-  
-  <route src="cpu1" dst="cpu0">\r
-    <route_element name="link1"/>\r
-    <route_element name="switch"/>
-    <route_element name="link0"/>
-  </route>
-  \r
-</platform_description>\r
+<?xml version='1.0'?>
+<!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"/>
+
+    <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"/>
+
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/><link_ctn id="switch"/><link_ctn id="link1"/></route>
+ </AS>
+ </platform>