X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/60cde42d4472906d5a5693981107231417476906..d6d03a0a88c2673c9e5c604d63912b77bc17fdd4:/examples/platforms/data_center.xml

diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml
index 2be1246c3e..95e8167088 100644
--- a/examples/platforms/data_center.xml
+++ b/examples/platforms/data_center.xml
@@ -1,26 +1,23 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<config id="General">
-  <prop id="network/coordinates" value="yes"/>
-</config>
-<AS id="AS0" routing="Vivaldi">
-  <AS id="dataCenter1" routing="Full">
-    <!-- 3 cabinets, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
-    <!-- cabinets -->
-    <cluster id="cabinet1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" speed="5.2297Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="cabinet2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" speed="8.8925Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-    <cluster id="cabinet3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" speed="13.357Gf"
-             bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+<platform version="4.1">
+  <zone id="AS0" routing="Vivaldi">
+    <zone id="dataCenter1" routing="Full">
+      <!-- 3 cabinets, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
+      <!-- cabinets -->
+      <cluster id="cabinet1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" speed="5.2297Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="cabinet2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" speed="8.8925Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="cabinet3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" speed="13.357Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
 
-    <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
-    <link id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>
- 
-    <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
-    <AS id="gw_dataCenter1" routing="Floyd">
+      <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>
+
+      <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
+      <zone id="gw_dataCenter1" routing="Floyd">
         <!-- equipments-->
         <router id="gw_dc1_horizdist"/>
         <router id="gw_dc1_maindist"/>
@@ -35,36 +32,33 @@
         <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/> 
 
         <!-- links to router relationships -->
-        <route src="gw_dc1_horizdist" dst="gw_dc1_maindist"><link_ctn id="dc1_horizdist_maindist"/></route>
-        <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
-        <route src="gw_dc1_entranceroom" dst="router_dataCenter1"><link_ctn id="dc1_entranceroom_ISP"/></route>
-    </AS>
+        <route src="gw_dc1_horizdist" dst="gw_dc1_maindist">
+          <link_ctn id="dc1_horizdist_maindist"/>
+        </route>
+        <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom">
+          <link_ctn id="dc1_maindist_entranceroom"/>
+        </route>
+        <route src="gw_dc1_entranceroom" dst="router_dataCenter1">
+          <link_ctn id="dc1_entranceroom_ISP"/>
+        </route>
+      </zone>
 
-    <!-- internal routes between cabinets -->
-    <ASroute src="cabinet3" dst="cabinet3" gw_src="cb3-cabinet3_router.dc1.acloud.com"
-             gw_dst="cb3-cabinet3_router.dc1.acloud.com" symmetrical="YES">
-      <link_ctn id="link_dc1_cb3"/><link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <ASroute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com"
-             gw_dst="cb3-cabinet3_router.dc1.acloud.com" symmetrical="YES">
-        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <ASroute src="cabinet2" dst="cabinet2" gw_src="cb2-cabinet2_router.dc1.acloud.com"
-             gw_dst="cb2-cabinet2_router.dc1.acloud.com" symmetrical="YES">
-      <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb2"/>
-    </ASroute>
-    <ASroute src="cabinet1" dst="cabinet3" gw_src="cb1-cabinet1_router.dc1.acloud.com"
-             gw_dst="cb3-cabinet3_router.dc1.acloud.com" symmetrical="YES">
-      <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb3"/>
-    </ASroute>
-    <ASroute src="cabinet1" dst="cabinet2" gw_src="cb1-cabinet1_router.dc1.acloud.com"
-             gw_dst="cb2-cabinet2_router.dc1.acloud.com" symmetrical="YES">
-      <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb2"/>
-    </ASroute>
-    <ASroute src="cabinet1" dst="cabinet1" gw_src="cb1-cabinet1_router.dc1.acloud.com"
-             gw_dst="cb1-cabinet1_router.dc1.acloud.com" symmetrical="YES">
-      <link_ctn id="link_dc1_cb1"/><link_ctn id="link_dc1_cb1"/>
-    </ASroute>
-  </AS>
-</AS>
+      <!-- internal routes between cabinets -->
+      <zoneRoute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com"
+               gw_dst="cb3-cabinet3_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb3"/>
+      </zoneRoute>
+      <zoneRoute src="cabinet1" dst="cabinet3" gw_src="cb1-cabinet1_router.dc1.acloud.com"
+               gw_dst="cb3-cabinet3_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb3"/>
+      </zoneRoute>
+      <zoneRoute src="cabinet1" dst="cabinet2" gw_src="cb1-cabinet1_router.dc1.acloud.com"
+               gw_dst="cb2-cabinet2_router.dc1.acloud.com">
+        <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb2"/>
+      </zoneRoute>
+    </zone>
+  </zone>
 </platform>