X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7abffd12021a46a0ac1bd2b4ff48ca4b3cc8c71c..e49d3a1ebc59da7d2e1a02ccf9a56ddc5223beef:/examples/platforms/routing_cluster.xml

diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml
index 0b64bb7e58..fae4223cc8 100644
--- a/examples/platforms/routing_cluster.xml
+++ b/examples/platforms/routing_cluster.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-
-<!--              router1 -------------link1-2--------------router2
+<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
+<platform version="4.1">
+<!--              router1 - - - - - - link1-2 - - - - - - router2
        __________________________                   _________________________
        |                        |                   |                        |
        |        backbone1       |                   |      backbone2         |
@@ -11,54 +11,49 @@ l1_up / / l1_down  | l3   l2_up\ \ l2_down   l4_up / / l4_down  | l6   l5_up\ \
      / /           |            \ \               / /           |            \ \
     host1         host3         host2           host4         host6          host5
 -->
+  <zone id="AS0" routing="Full">
+    <zone  id="my_cluster1"  routing="Cluster">
+      <router id="router1"/>
+
+      <host id="host1" speed="1Gf"/>
+      <link id="l1_UP" bandwidth="125MBps" latency="100us"/>
+      <link id="l1_DOWN" bandwidth="125MBps" latency="100us"/>
+      <host_link id="host1" up="l1_UP" down="l1_DOWN"/>
 
+      <host id="host2" speed="1Gf"/>
+      <link id="l2" bandwidth="125MBps" latency="100us" sharing_policy="SPLITDUPLEX"/>
+      <host_link id="host2" up="l2_UP" down="l2_DOWN"/>
 
-<platform version="3">
-<AS id="AS0" routing="Full">
-  <AS  id="my_cluster1"  routing="Cluster">
-    <router id="router1"/>
+      <host id="host3" speed="1Gf"/>
+      <link id="l3" bandwidth="125MBps" latency="100us"/>
+      <host_link id="host3" up="l3" down="l3"/>
 
-    <host id="host1" power="1000000000"/>
-    <link id="l1_UP" bandwidth="125000000" latency="0.000100"/>
-    <link id="l1_DOWN" bandwidth="125000000" latency="0.000100"/>
-    <host_link id="host1" up="l1_UP" down="l1_DOWN"/>
+      <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
+    </zone>
 
-    <host id="host2" power="1000000000"/>
-    <link id="l2" bandwidth="125000000" latency="0.000100" sharing_policy="FULLDUPLEX"/>
-    <host_link id="host2" up="l2_UP" down="l2_DOWN"/>
+    <zone  id="my_cluster2"  routing="Cluster">
+      <router id="router2"/>
 
-    <host id="host3" power="1000000000"/>
-    <link id="l3" bandwidth="125000000" latency="0.000100"/>
-    <host_link id="host3" up="l3" down="l3"/>
+      <host id="host4" speed="1Gf"/>
+      <link id="l4_UP" bandwidth="125MBps" latency="100us"/>
+      <link id="l4_DOWN" bandwidth="125MBps" latency="100us"/>
+      <host_link id="host4" up="l4_UP" down="l4_DOWN"/>
 
-    <backbone id="backbone1" bandwidth="2250000000" latency="5E-4"/>
-  </AS>
+      <host id="host5" speed="1Gf"/>
+      <link id="l5" bandwidth="125MBps" latency="100us" sharing_policy="SPLITDUPLEX"/>
+      <host_link id="host5" up="l5_UP" down="l5_DOWN"/>
 
-  <AS  id="my_cluster2"  routing="Cluster">
-    <router id="router2"/>
+      <host id="host6" speed="1Gf"/>
+      <link id="l6" bandwidth="125MBps" latency="100us"/>
+      <host_link id="host6" up="l6" down="l6"/>
 
-    <host id="host4" power="1000000000"/>
-    <link id="l4_UP" bandwidth="125000000" latency="0.000100"/>
-    <link id="l4_DOWN" bandwidth="125000000" latency="0.000100"/>
-    <host_link id="host4" up="l4_UP" down="l4_DOWN"/>
+      <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
+    </zone>
 
-    <host id="host5" power="1000000000"/>
-    <link id="l5" bandwidth="125000000" latency="0.000100" sharing_policy="FULLDUPLEX"/>
-    <host_link id="host5" up="l5_UP" down="l5_DOWN"/>
+    <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
 
-    <host id="host6" power="1000000000"/>
-    <link id="l6" bandwidth="125000000" latency="0.000100"/>
-    <host_link id="host6" up="l6" down="l6"/>
- 
-    <backbone id="backbone2" bandwidth="2250000000" latency="5E-4"/>
-  </AS>
-  
-  <link id="link1-2" bandwidth="2250000000" latency="5E-4"/>
-  
-  <ASroute src="my_cluster1" dst="my_cluster2"
-    gw_src="router1"
-    gw_dst="router2">
-    <link_ctn id="link1-2" />
-  </ASroute>
-</AS>	
+    <zoneRoute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
+      <link_ctn id="link1-2" />
+    </zoneRoute>
+  </zone>
 </platform>