X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e67875d46730d8bf3f40f025d2ae6848f0bb47cf..8b47d18183827cb13535fd1b3f50df6dfb04b73e:/examples/platforms/data_center.xml?ds=sidebyside

diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml
index 6774021044..f8bc860df9 100644
--- a/examples/platforms/data_center.xml
+++ b/examples/platforms/data_center.xml
@@ -1,11 +1,8 @@
 <?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">
+<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
+<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"
@@ -20,7 +17,7 @@
       <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">
+      <zone id="gw_dataCenter1" routing="Floyd">
         <!-- equipments-->
         <router id="gw_dc1_horizdist"/>
         <router id="gw_dc1_maindist"/>
@@ -30,9 +27,9 @@
         <router id="router_dataCenter1" coordinates="25.5 9.4 1.4"/>
 
         <!-- links -->
-        <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
-        <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
-        <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/> 
+        <link id="dc1_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>
+        <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
+        <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>
 
         <!-- links to router relationships -->
         <route src="gw_dc1_horizdist" dst="gw_dc1_maindist">
@@ -44,24 +41,24 @@
         <route src="gw_dc1_entranceroom" dst="router_dataCenter1">
           <link_ctn id="dc1_entranceroom_ISP"/>
         </route>
-      </AS>
+      </zone>
 
       <!-- internal routes between cabinets -->
-      <ASroute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com"
+      <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"/>
-      </ASroute>
-      <ASroute src="cabinet1" dst="cabinet3" gw_src="cb1-cabinet1_router.dc1.acloud.com"
+      </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"/>
-      </ASroute>
-      <ASroute src="cabinet1" dst="cabinet2" gw_src="cb1-cabinet1_router.dc1.acloud.com"
+      </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"/>
-      </ASroute>
-    </AS>
-  </AS>
+      </zoneRoute>
+    </zone>
+  </zone>
 </platform>