cleanup XML jungle in teshsuite

[simgrid.git] / teshsuite / simdag / platforms / two_hosts_multi_hop.xml

diff --git a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
index 01cad53..5048e04 100644 (file)
--- a/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
+++ b/teshsuite/simdag/platforms/two_hosts_multi_hop.xml
@@ -1,23 +1,14 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "simgrid.dtd">
-<platform version="2">
-  <host id="bob" power="1000000000"/>
-  <host id="alice" power="500000000"/>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
+  <AS  id="AS0"  routing="Full">
+    <host id="bob" speed="1Gf"/>
+    <host id="alice" speed="500Mf"/>
 
-  <link id="link_bob" bandwidth="125000000" latency="5E-5"/>
-  <link id="link_alice" bandwidth="125000000" latency="5E-5"/>
-  <link id="switch" bandwidth="125000000" latency="5E-5"
-        sharing_policy="FATPIPE"/>
+    <link id="link_bob" bandwidth="125MBps" latency="50us"/>
+    <link id="link_alice" bandwidth="125MBps" latency="50us"/>
+    <link id="switch" bandwidth="125MBps" latency="50us" sharing_policy="FATPIPE"/>
 
-  <route src="bob" dst="alice">
-    <link:ctn id="link_bob"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link_alice"/>
-  </route>
-
-  <route src="alice" dst="bob">
-    <link:ctn id="link_alice"/>
-    <link:ctn id="switch"/>
-    <link:ctn id="link_bob"/>
-  </route>
+    <route src="bob" dst="alice"><link_ctn id="link_bob"/><link_ctn id="switch"/><link_ctn id="link_alice"/></route>
+  </AS>
 </platform>