Merge branch 'master' of https://github.com/Onesphore/simgrid into Onesphore-master

[simgrid.git] / examples / platforms / simulacrum_7_hosts.xml

diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml
index 6563df4..3887685 100644 (file)
--- a/examples/platforms/simulacrum_7_hosts.xml
+++ b/examples/platforms/simulacrum_7_hosts.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
+<platform version="4.1">
 <!-- This is a random platform, generated with Simulacrum.
         http://pda.gforge.inria.fr/tools/download.html
      Unfortunately, the generation parameters were lost with the years. -->
 
-  <AS  id="AS0" routing="Full">
+  <zone  id="AS0" routing="Full">
     <host id="Host 26" speed="3.300140519709234Gf"/>
     <host id="Host 27" speed="3.867398877553016Gf"/>
     <host id="Host 28" speed="1.6522665718098645Gf"/>
@@ -36,27 +36,79 @@
     <link id="l172" bandwidth="125MBps" latency="100us"/>
     <link id="l173" bandwidth="125MBps" latency="100us"/>
 
-    <route src="Host 26" dst="Host 27"><link_ctn id="l155"/></route>
-    <route src="Host 26" dst="Host 28"><link_ctn id="l155"/> <link_ctn id="l154"/><link_ctn id="l156"/></route>
-    <route src="Host 26" dst="Host 29"><link_ctn id="l152"/><link_ctn id="l157"/></route>
-    <route src="Host 26" dst="Host 30"><link_ctn id="l152"/><link_ctn id="l161"/></route>
-    <route src="Host 26" dst="Host 31"><link_ctn id="l166"/></route>
-    <route src="Host 26" dst="Host 32"><link_ctn id="l152"/><link_ctn id="l169"/></route>
-    <route src="Host 27" dst="Host 28"><link_ctn id="l154"/><link_ctn id="l156"/></route>
-    <route src="Host 27" dst="Host 29"><link_ctn id="l159"/></route>
-    <route src="Host 27" dst="Host 30"><link_ctn id="l162"/></route>
-    <route src="Host 27" dst="Host 31"><link_ctn id="l167"/></route>
-    <route src="Host 27" dst="Host 32"><link_ctn id="l154"/><link_ctn id="l170"/></route>
-    <route src="Host 28" dst="Host 29"><link_ctn id="l160"/></route>
-    <route src="Host 28" dst="Host 30"><link_ctn id="l163"/></route>
-    <route src="Host 28" dst="Host 31"><link_ctn id="l163"/><link_ctn id="l168"/></route>
-    <route src="Host 28" dst="Host 32"><link_ctn id="l156"/><link_ctn id="l170"/></route>
-    <route src="Host 29" dst="Host 30"><link_ctn id="l164"/></route>
-    <route src="Host 29" dst="Host 31"><link_ctn id="l159"/><link_ctn id="l167"/></route>
-    <route src="Host 29" dst="Host 32"><link_ctn id="l171"/></route>
-    <route src="Host 30" dst="Host 31"><link_ctn id="l168"/></route>
-    <route src="Host 30" dst="Host 32"><link_ctn id="l172"/></route>
-    <route src="Host 31" dst="Host 32"><link_ctn id="l173"/></route>
-  </AS>
+    <route src="Host 26" dst="Host 27">
+      <link_ctn id="l155"/>
+    </route>
+    <route src="Host 26" dst="Host 28">
+      <link_ctn id="l155"/> 
+      <link_ctn id="l154"/>
+      <link_ctn id="l156"/>
+    </route>
+    <route src="Host 26" dst="Host 29">
+      <link_ctn id="l152"/>
+      <link_ctn id="l157"/>
+    </route>
+    <route src="Host 26" dst="Host 30">
+      <link_ctn id="l152"/>
+      <link_ctn id="l161"/>
+    </route>
+    <route src="Host 26" dst="Host 31">
+      <link_ctn id="l166"/>
+    </route>
+    <route src="Host 26" dst="Host 32">
+      <link_ctn id="l152"/>
+      <link_ctn id="l169"/>
+    </route>
+    <route src="Host 27" dst="Host 28">
+      <link_ctn id="l154"/>
+      <link_ctn id="l156"/>
+    </route>
+    <route src="Host 27" dst="Host 29">
+      <link_ctn id="l159"/>
+    </route>
+    <route src="Host 27" dst="Host 30">
+      <link_ctn id="l162"/>
+    </route>
+    <route src="Host 27" dst="Host 31">
+      <link_ctn id="l167"/>
+    </route>
+    <route src="Host 27" dst="Host 32">
+      <link_ctn id="l154"/>
+      <link_ctn id="l170"/>
+    </route>
+    <route src="Host 28" dst="Host 29">
+      <link_ctn id="l160"/>
+    </route>
+    <route src="Host 28" dst="Host 30">
+      <link_ctn id="l163"/>
+    </route>
+    <route src="Host 28" dst="Host 31">
+      <link_ctn id="l163"/>
+      <link_ctn id="l168"/>
+    </route>
+    <route src="Host 28" dst="Host 32">
+      <link_ctn id="l156"/>
+      <link_ctn id="l170"/>
+    </route>
+    <route src="Host 29" dst="Host 30">
+      <link_ctn id="l164"/>
+    </route>
+    <route src="Host 29" dst="Host 31">
+      <link_ctn id="l159"/>
+      <link_ctn id="l167"/>
+    </route>
+    <route src="Host 29" dst="Host 32">
+      <link_ctn id="l171"/>
+    </route>
+    <route src="Host 30" dst="Host 31">
+      <link_ctn id="l168"/>
+    </route>
+    <route src="Host 30" dst="Host 32">
+      <link_ctn id="l172"/>
+    </route>
+    <route src="Host 31" dst="Host 32">
+      <link_ctn id="l173"/>
+    </route>
+  </zone>
 </platform>