Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
index a5a07d0..53e2f8a 100644 (file)
--- a/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
+++ b/teshsuite/simdag/network/p2p/platform_2p_1sl.xml
@@ -1,13 +1,12 @@
-<?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="link0" bandwidth="1" latency=".5" sharing_policy="SHARED"/>
-  <route src="cpu0" dst="cpu1">\r
-    <route_element name="link0"/>\r
-  </route>\r
-  <route src="cpu1" dst="cpu0">\r
-    <route_element name="link0"/>\r
-  </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="link0" bandwidth="1Bps" latency="500ms" sharing_policy="SHARED"/>
+
+    <route src="cpu0" dst="cpu1"><link_ctn id="link0"/></route>
+  </AS>
+</platform>