Update all our XML files + next XML version will be 4.1, not 5

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

diff --git a/teshsuite/simdag/platforms/platform_4p_1switch.xml b/teshsuite/simdag/platforms/platform_4p_1switch.xml
index 57ab438..bc41679 100644 (file)
--- a/teshsuite/simdag/platforms/platform_4p_1switch.xml
+++ b/teshsuite/simdag/platforms/platform_4p_1switch.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS id="AS0" routing="Full">
+<platform version="4.1">
+  <zone id="AS0" routing="Full">
     <host id="cpu0" speed="1f"/>
     <host id="cpu1" speed="1f"/>
     <host id="cpu2" speed="1f"/>
@@ -13,11 +13,35 @@
     <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>
+    <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>
+  </zone>
 </platform>