cosmetics: rename a function, deprecate old name

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

diff --git a/teshsuite/simdag/platforms/two_clusters_router_id.xml b/teshsuite/simdag/platforms/two_clusters_router_id.xml
index 7c0e117..43d4e46 100644 (file)
--- a/teshsuite/simdag/platforms/two_clusters_router_id.xml
+++ b/teshsuite/simdag/platforms/two_clusters_router_id.xml
@@ -1,19 +1,19 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <AS  id="AS0"  routing="Full">
-     <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
-              bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
-     <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
-              bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  
+<platform version="4.1">
+  <zone  id="AS0"  routing="Full">
+    <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" router_id="bob_cluster_router"/>
+    <cluster id="alice_cluster" prefix="alice" suffix=".crepe.fr" radical="0-4" speed="1Gf" bw="125MBps" lat="50us"
+             bb_bw="2.25GBps" bb_lat="500us" router_id="alice_cluster_router"/>  
 
-     <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
+    <link id="backbone" bandwidth="1.25GBps" latency="500us"/>  
 
-     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bob_cluster_router" gw_dst="alice_cluster_router">
-        <link_ctn id="backbone"/>
-     </ASroute>
-     <ASroute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
-        <link_ctn id="backbone"/>
-     </ASroute>
-  </AS>
+    <zoneRoute src="bob_cluster" dst="alice_cluster" gw_src="bob_cluster_router" gw_dst="alice_cluster_router">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+    <zoneRoute src="alice_cluster" dst="bob_cluster" gw_src="alice_cluster_router" gw_dst="bob_cluster_router">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+  </zone>
 </platform>