reindent more platform files

diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml
index 7bca96a..37b973a 100644 (file)
--- a/examples/platforms/bypassASroute.xml
+++ b/examples/platforms/bypassASroute.xml
@@ -13,13 +13,16 @@
     <link id="link_tmp"  bandwidth="1.25GBps" latency="500us"/>
 
     <ASroute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">
-      <link_ctn id="link1"/><link_ctn id="link2"/>
+      <link_ctn id="link1"/>
+      <link_ctn id="link2"/>
     </ASroute>
     <ASroute src="my_cluster_1" dst="my_cluster_3" gw_src="my_cluster_1_router" gw_dst="my_cluster_3_router">
-      <link_ctn id="link1"/><link_ctn id="link3"/>
+      <link_ctn id="link1"/>
+      <link_ctn id="link3"/>
     </ASroute>
     <ASroute src="my_cluster_2" dst="my_cluster_3" gw_src="my_cluster_2_router" gw_dst="my_cluster_3_router">
-      <link_ctn id="link2"/><link_ctn id="link3"/>
+      <link_ctn id="link2"/>
+      <link_ctn id="link3"/>
     </ASroute>
 
     <bypassASroute src="my_cluster_1" dst="my_cluster_2" gw_src="my_cluster_1_router" gw_dst="my_cluster_2_router">

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index 626666d..5c94ae6 100644 (file)
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -34,9 +34,15 @@
         <link id="dc1_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
         <link id="dc1_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>
 
-        <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_AS1_dc1"><link_ctn id="dc1_entranceroom_ISP"/></route>
+        <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_AS1_dc1">
+          <link_ctn id="dc1_entranceroom_ISP"/>
+        </route>
       </AS>
 
       <!-- internal routes between clusters -->
@@ -57,27 +63,27 @@
       </ASroute>
       <!-- routes to exit AS -->
       <ASroute src="AS1_cb1" dst="gw_AS1_dc1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist">
-         <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb1"/>
       </ASroute>
       <ASroute src="AS1_cb3" dst="gw_AS1_dc1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
                gw_dst="gw_dc1_horizdist">
-         <link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb3"/>
       </ASroute>
       <ASroute src="AS1_cb2" dst="gw_AS1_dc1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
                gw_dst="gw_dc1_horizdist">
-         <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb2"/>
       </ASroute> 
       <ASroute dst="AS1_cb1" src="gw_AS1_dc1" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com"
                gw_src="gw_dc1_horizdist">
-         <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb1"/>
       </ASroute>
       <ASroute dst="AS1_cb3" src="gw_AS1_dc1" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com"
                gw_src="gw_dc1_horizdist">
-         <link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb3"/>
       </ASroute>
       <ASroute dst="AS1_cb2" src="gw_AS1_dc1" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com"
                gw_src="gw_dc1_horizdist">
-         <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb2"/>
       </ASroute>
     </AS>
 
@@ -120,62 +126,65 @@
         <link id="dc2_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>
         <!-- links to router relationships -->
         <route src="gw_dc2_horizdist" dst="gw_dc2_maindist">
-        <link_ctn id="dc2_horizdist_maindist"/></route>
+          <link_ctn id="dc2_horizdist_maindist"/>
+        </route>
         <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom">
-        <link_ctn id="dc2_maindist_entranceroom"/></route>
+          <link_ctn id="dc2_maindist_entranceroom"/>
+        </route>
         <route src="gw_dc2_entranceroom" dst="router_AS2_dc2">
-        <link_ctn id="dc2_entranceroom_ISP"/></route>
+          <link_ctn id="dc2_entranceroom_ISP"/>
+        </route>
       </AS>
 
       <!-- internal routes between clusters -->
       <ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb4"/>
+        <link_ctn id="link_dc2_cb4"/>
         <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb5" dst="AS2_cb6" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb5"/>
+        <link_ctn id="link_dc2_cb5"/>
         <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb5" dst="AS2_cb4" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb5"/>
+        <link_ctn id="link_dc2_cb5"/>
         <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb2" dst="AS2_cb6" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb2"/> 
+        <link_ctn id="link_dc2_cb2"/> 
         <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb2"/>
+        <link_ctn id="link_dc2_cb2"/>
         <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb2" dst="AS2_cb5" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb2"/>
+        <link_ctn id="link_dc2_cb2"/>
         <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb6" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb3"/>
         <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" 
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb3"/>
         <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb5" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb3"/>
         <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="AS2_cb2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb3"/>
         <link_ctn id="link_dc2_cb2"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb6" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
@@ -190,170 +199,172 @@
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb5" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb5-AS2_cb5_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb1"/>
         <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb2-AS2_cb2_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb1"/>
         <link_ctn id="link_dc2_cb2"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb3" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb3-AS2_cb3_router.dc2.acloud.com">
-         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb1"/>
         <link_ctn id="link_dc2_cb3"/>
       </ASroute>
 
       <!-- routess to exit AS -->
       <ASroute src="AS2_cb6" dst="gw_AS2_dc2" gw_src="cb6-AS2_cb6_router.dc2.acloud.com"
                gw_dst="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb6"/>
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb4" dst="gw_AS2_dc2" gw_src="cb4-AS2_cb4_router.dc2.acloud.com"
                gw_dst="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb4"/>
+        <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute src="AS2_cb5" dst="gw_AS2_dc2" gw_src="cb5-AS2_cb5_router.dc2.acloud.com"
                gw_dst="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb5"/>
+        <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute src="AS2_cb2" dst="gw_AS2_dc2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_dst="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb2"/>
+        <link_ctn id="link_dc2_cb2"/>
       </ASroute>
       <ASroute src="AS2_cb3" dst="gw_AS2_dc2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_dst="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb3"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="gw_AS2_dc2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb1"/>
       </ASroute> 
       <ASroute dst="AS2_cb6" src="gw_AS2_dc2" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com"
                gw_src="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb6"/>
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute dst="AS2_cb4" src="gw_AS2_dc2" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com"
                gw_src="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb4"/>
+        <link_ctn id="link_dc2_cb4"/>
       </ASroute>
       <ASroute dst="AS2_cb5" src="gw_AS2_dc2" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com"
                gw_src="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb5"/>
+        <link_ctn id="link_dc2_cb5"/>
       </ASroute>
       <ASroute dst="AS2_cb2" src="gw_AS2_dc2" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com"
                gw_src="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb2"/>
+        <link_ctn id="link_dc2_cb2"/>
       </ASroute>
       <ASroute dst="AS2_cb3" src="gw_AS2_dc2" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com"
                gw_src="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb3"/>
+        <link_ctn id="link_dc2_cb3"/>
       </ASroute>
       <ASroute dst="AS2_cb1" src="gw_AS2_dc2" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_src="gw_dc2_horizdist">
-         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb1"/>
       </ASroute> 
-     </AS>
-
-     <AS id="AS3_dc3" routing="Full">  
-       <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : FULL -->    
-       <!-- 4 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
-       <!-- clusters -->
-       <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" speed="5.2297Gf"
-                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-       <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" speed="8.8925Gf"
-                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-       <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
-                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-       <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
-                bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
-
-       <link id="link_dc3_cb1" bandwidth="1.25GBps" latency="100us"/>
-       <link id="link_dc3_cb2" bandwidth="1.25GBps" latency="100us"/>
-       <link id="link_dc3_cb3" bandwidth="1.25GBps" latency="100us"/>
-       <link id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
+    </AS>
 
-       <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
-       <AS id="gw_AS3_dc3" routing="Floyd">
-          <!-- equipments-->
-          <router id="gw_dc3_horizdist"/>
-          <router id="gw_dc3_maindist"/>
-          <router id="gw_dc3_entranceroom"/>
-          <!-- ISP end point, entering the cloud, so it has coordinates -->
-          <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6"/>
+    <AS id="AS3_dc3" routing="Full">  
+      <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : FULL -->    
+      <!-- 4 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted -->
+      <!-- clusters -->
+      <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" speed="5.2297Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" speed="8.8925Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" speed="13.357Gf"
+               bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+      <link id="link_dc3_cb1" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc3_cb2" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc3_cb3" bandwidth="1.25GBps" latency="100us"/>
+      <link id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
 
-          <!-- links -->
-          <link id="dc3_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
-          <link id="dc3_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
-          <link id="dc3_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
-          <!-- links to router relationships -->
-          <route src="gw_dc3_horizdist" dst="gw_dc3_maindist">
-        <link_ctn id="dc3_horizdist_maindist"/></route>
-          <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom">
-        <link_ctn id="dc3_maindist_entranceroom"/></route>
-          <route src="gw_dc3_entranceroom" dst="router_AS3_dc3"><link_ctn id="dc3_entranceroom_ISP"/></route>
-       </AS>
+      <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
+      <AS id="gw_AS3_dc3" routing="Floyd">
+        <!-- equipments-->
+        <router id="gw_dc3_horizdist"/>
+        <router id="gw_dc3_maindist"/>
+        <router id="gw_dc3_entranceroom"/>
+        <!-- ISP end point, entering the cloud, so it has coordinates -->
+        <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6"/>
+        <!-- links -->
+        <link id="dc3_horizdist_maindist" bandwidth="1.25GBps" latency="100us"/>        
+        <link id="dc3_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>  
+        <link id="dc3_entranceroom_ISP" bandwidth="1.25GBps" latency="100us"/>  
+        <!-- links to router relationships -->
+        <route src="gw_dc3_horizdist" dst="gw_dc3_maindist">
+          <link_ctn id="dc3_horizdist_maindist"/>
+        </route>
+        <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom">
+          <link_ctn id="dc3_maindist_entranceroom"/>
+        </route>
+        <route src="gw_dc3_entranceroom" dst="router_AS3_dc3">
+          <link_ctn id="dc3_entranceroom_ISP"/>
+        </route>
+      </AS>
 
-       <!-- internal routes between clusters -->
-       <ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
-                gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
-         <link_ctn id="link_dc3_cb2"/>
-         <link_ctn id="link_dc3_cb3"/>
-       </ASroute>
-       <ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
-                gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
-          <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb3"/>
-       </ASroute>
-       <ASroute src="AS3_cb1" dst="AS3_cb2" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
-                gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
-          <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb2"/>
-       </ASroute>
-       <ASroute src="AS3_cb4" dst="AS3_cb3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-                gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
-          <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb3"/>
-       </ASroute>
-       <ASroute src="AS3_cb4" dst="AS3_cb2" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-                gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
-          <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb2"/>
-       </ASroute>
-       <ASroute src="AS3_cb4" dst="AS3_cb1" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-                gw_dst="cb1-AS3_cb1_router.dc3.acloud.com">
-          <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb1"/>
-       </ASroute>
+      <!-- internal routes between clusters -->
+      <ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
+               gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
+        <link_ctn id="link_dc3_cb2"/>
+        <link_ctn id="link_dc3_cb3"/>
+      </ASroute>
+      <ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
+               gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
+        <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb3"/>
+      </ASroute>
+      <ASroute src="AS3_cb1" dst="AS3_cb2" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
+               gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
+        <link_ctn id="link_dc3_cb1"/><link_ctn id="link_dc3_cb2"/>
+      </ASroute>
+      <ASroute src="AS3_cb4" dst="AS3_cb3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+               gw_dst="cb3-AS3_cb3_router.dc3.acloud.com">
+        <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb3"/>
+      </ASroute>
+      <ASroute src="AS3_cb4" dst="AS3_cb2" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+               gw_dst="cb2-AS3_cb2_router.dc3.acloud.com">
+        <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb2"/>
+      </ASroute>
+      <ASroute src="AS3_cb4" dst="AS3_cb1" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+               gw_dst="cb1-AS3_cb1_router.dc3.acloud.com">
+        <link_ctn id="link_dc3_cb4"/><link_ctn id="link_dc3_cb1"/>
+      </ASroute>
 
-       <!-- routes to exit AS -->
-       <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com"
-                gw_dst="gw_dc3_horizdist">
-          <link_ctn id="link_dc3_cb3"/>
-       </ASroute>
-       <ASroute src="AS3_cb2" dst="gw_AS3_dc3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
-                gw_dst="gw_dc3_horizdist">
-         <link_ctn id="link_dc3_cb2"/>
-       </ASroute>
-       <ASroute src="AS3_cb1" dst="gw_AS3_dc3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
-                gw_dst="gw_dc3_horizdist">
-          <link_ctn id="link_dc3_cb1"/>
-       </ASroute>
-       <ASroute src="AS3_cb4" dst="gw_AS3_dc3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
-                gw_dst="gw_dc3_horizdist">
-          <link_ctn id="link_dc3_cb4"/>
-       </ASroute>
-       <ASroute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com"
-                gw_src="gw_dc3_horizdist">
-          <link_ctn id="link_dc3_cb3"/>
-       </ASroute>
-       <ASroute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com"
-                gw_src="gw_dc3_horizdist">
-          <link_ctn id="link_dc3_cb2"/>
-       </ASroute>
-       <ASroute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com"
-                gw_src="gw_dc3_horizdist">
-          <link_ctn id="link_dc3_cb1"/>
-       </ASroute>
-       <ASroute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com"
-                gw_src="gw_dc3_horizdist">
-          <link_ctn id="link_dc3_cb4"/>
-       </ASroute>  
+      <!-- routes to exit AS -->
+      <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com"
+               gw_dst="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb3"/>
+      </ASroute>
+      <ASroute src="AS3_cb2" dst="gw_AS3_dc3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com"
+               gw_dst="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb2"/>
+      </ASroute>
+      <ASroute src="AS3_cb1" dst="gw_AS3_dc3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com"
+               gw_dst="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb1"/>
+      </ASroute>
+      <ASroute src="AS3_cb4" dst="gw_AS3_dc3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com"
+               gw_dst="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb4"/>
+      </ASroute>
+      <ASroute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com"
+               gw_src="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb3"/>
+      </ASroute>
+      <ASroute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com"
+               gw_src="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb2"/>
+      </ASroute>
+      <ASroute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com"
+               gw_src="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb1"/>
+      </ASroute>
+      <ASroute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com"
+               gw_src="gw_dc3_horizdist">
+        <link_ctn id="link_dc3_cb4"/>
+      </ASroute>
     </AS>
   </AS>
 </platform>

diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml
index 0f45089..fe25716 100644 (file)
--- a/examples/platforms/config.xml
+++ b/examples/platforms/config.xml
@@ -19,7 +19,9 @@
     <link id="link3" bandwidth="125MBps" latency="50us"/>
 
     <route src="bob" dst="alice">
-      <link_ctn id="link1"/><link_ctn id="link2"/><link_ctn id="link3"/>
+      <link_ctn id="link1"/>
+      <link_ctn id="link2"/>
+      <link_ctn id="link3"/>
     </route>
   </AS>
 </platform>

diff --git a/examples/platforms/faulty_host.xml b/examples/platforms/faulty_host.xml
index 8267e7f..bcb382c 100644 (file)
--- a/examples/platforms/faulty_host.xml
+++ b/examples/platforms/faulty_host.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="Faulty Host" speed="1Gf" state_file="trace/faulty_host.trace"/>
-  <host id="Safe Host" speed="500Mf"/>
-</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="Faulty Host" speed="1Gf" state_file="trace/faulty_host.trace"/>
+    <host id="Safe Host" speed="500Mf"/>
+  </AS>
 </platform>
 

diff --git a/examples/platforms/griffon.xml b/examples/platforms/griffon.xml
index b3cd180..69ac6e4 100644 (file)
--- a/examples/platforms/griffon.xml
+++ b/examples/platforms/griffon.xml
@@ -1,34 +1,33 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS id="AS_griffon"  routing="Full">
-  <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="1-29,58,59,60" speed="286.087kf" bw="125MBps" lat="24us"
-           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
-  <cluster id="griffon_cluster_cabinet2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="30-57" speed="286.087kf" bw="125MBps" lat="24us" 
-           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
-  <cluster id="griffon_cluster_cabinet3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="61-92" speed="286.087kf" bw="125MBps" lat="24us" 
-           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+  <AS id="AS_griffon"  routing="Full">
+    <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
+             radical="1-29,58,59,60" speed="286.087kf" bw="125MBps" lat="24us"
+             bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+    <cluster id="griffon_cluster_cabinet2" prefix="griffon-" suffix=".nancy.grid5000.fr"
+             radical="30-57" speed="286.087kf" bw="125MBps" lat="24us" 
+             bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+    <cluster id="griffon_cluster_cabinet3" prefix="griffon-" suffix=".nancy.grid5000.fr"
+             radical="61-92" speed="286.087kf" bw="125MBps" lat="24us" 
+             bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
 
-  <link id="backbone" bandwidth="1.25GBps" latency="24us" sharing_policy="SHARED"/>
+    <link id="backbone" bandwidth="1.25GBps" latency="24us" sharing_policy="SHARED"/>
 
-  <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet2" 
-           gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
-           gw_dst="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr">
-    <link_ctn id="backbone"/>
-  </ASroute>
-  <ASroute src="griffon_cluster_cabinet2" dst="griffon_cluster_cabinet3" 
-           gw_src="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr"
+    <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet2" 
+             gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
+             gw_dst="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr">
+      <link_ctn id="backbone"/>
+    </ASroute>
+    <ASroute src="griffon_cluster_cabinet2" dst="griffon_cluster_cabinet3" 
+             gw_src="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr"
            gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
-    <link_ctn id="backbone"/>
-  </ASroute>
-  <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet3" 
-           gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
-           gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
-    <link_ctn id="backbone"/>
-  </ASroute>
-</AS>
+      <link_ctn id="backbone"/>
+    </ASroute>
+    <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet3" 
+             gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
+             gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
+      <link_ctn id="backbone"/>
+    </ASroute>
+  </AS>
 </platform>
-

diff --git a/examples/platforms/meta_cluster.xml b/examples/platforms/meta_cluster.xml
index 4e4e36a..98d6c22 100644 (file)
--- a/examples/platforms/meta_cluster.xml
+++ b/examples/platforms/meta_cluster.xml
@@ -1,29 +1,29 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS id="AS0" routing="Full">
-  <AS  id="my_cluster1"  routing="Cluster">
-    <cabinet id="cabinet1" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
-    <cabinet id="cabinet2" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
-    <cabinet id="cabinet3" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
+  <AS id="AS0" routing="Full">
+    <AS  id="my_cluster1"  routing="Cluster">
+      <cabinet id="cabinet1" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
+      <cabinet id="cabinet2" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
+      <cabinet id="cabinet3" prefix="host-" suffix=".cluster1" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
 
-    <router  id="router1"/>
-    <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
-  </AS>
+      <router  id="router1"/>
+      <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
+    </AS>
 
-  <AS  id="my_cluster2"  routing="Cluster">
-    <cabinet id="cabinet1" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
-    <cabinet id="cabinet2" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
-    <cabinet id="cabinet3" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
+    <AS  id="my_cluster2"  routing="Cluster">
+      <cabinet id="cabinet1" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="1-10"/>
+      <cabinet id="cabinet2" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="11-20"/>
+      <cabinet id="cabinet3" prefix="host-" suffix=".cluster2" speed="1Gf" bw="125MBps" lat="100us" radical="21-30"/>
 
-    <router  id="router2"/>
-    <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
-  </AS>
+      <router  id="router2"/>
+      <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
+    </AS>
 
-  <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
+    <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
 
-  <ASroute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
-    <link_ctn id="link1-2" />
-  </ASroute>
-</AS>
+    <ASroute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
+      <link_ctn id="link1-2" />
+    </ASroute>
+  </AS>
 </platform>

diff --git a/examples/platforms/onelink.xml b/examples/platforms/onelink.xml
index 9182406..2a86803 100644 (file)
--- a/examples/platforms/onelink.xml
+++ b/examples/platforms/onelink.xml
@@ -1,13 +1,15 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS  id="AS0"  routing="Full">
-  <!---   S1 <-> link 1 <-> C1  -->
-  <!---        (10kB, 10ms)     -->
+  <AS  id="AS0"  routing="Full">
+    <!---   S1 <-> link 1 <-> C1  -->
+    <!---        (10kB, 10ms)     -->
 
-   <host id="S1" speed="1Gf"/>
-   <host id="C1" speed="1Gf"/>
-   <link id="1" bandwidth="10kBps" latency="10ms"/>
-   <route src="S1" dst="C1"><link_ctn id="1"/></route>
-</AS>
+    <host id="S1" speed="1Gf"/>
+    <host id="C1" speed="1Gf"/>
+    <link id="1" bandwidth="10kBps" latency="10ms"/>
+    <route src="S1" dst="C1">
+      <link_ctn id="1"/>
+    </route>
+  </AS>
 </platform>

diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index 645f7f3..b65f1db 100644 (file)
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
   <!-- This file describe a super simple platform which main interest is to define some properties on hosts, 
-      processes and links. It is used in several regression cases on properties -->
+       processes and links. It is used in several regression cases on properties -->
   <AS  id="AS0"  routing="Full">
     <prop id="filename" value="prop.xml"/>
     <prop id="date" value="31-08-12"/>
@@ -22,25 +22,27 @@
       <prop id="bla" value="acme cluster"/>
       <prop id="Hdd"  value="180"/>
       <prop id="mem"  value="42"/>
-   </cluster>
+    </cluster>
 
-   <AS  id="AS4"  routing="Full">
-     <host id="host1" speed="1Gf">
-       <prop id="Hdd" value="180"/>
-       <prop id="mem" value="4"/>
-     </host>
-     <host id="host2" speed="1Gf">
-       <prop id="Hdd" value="120"/>
-     </host>
+    <AS  id="AS4"  routing="Full">
+      <host id="host1" speed="1Gf">
+        <prop id="Hdd" value="180"/>
+        <prop id="mem" value="4"/>
+      </host>
+      <host id="host2" speed="1Gf">
+        <prop id="Hdd" value="120"/>
+      </host>
 
-     <link id="l1" bandwidth="125MBps" latency="100us">
-       <prop id="type" value="Ethernet"/>
-     </link>
-     <link id="l2" bandwidth="125MBps" latency="100us">
-       <prop id="type" value="ethernet"/>
-     </link>
+      <link id="l1" bandwidth="125MBps" latency="100us">
+        <prop id="type" value="Ethernet"/>
+      </link>
+      <link id="l2" bandwidth="125MBps" latency="100us">
+        <prop id="type" value="ethernet"/>
+      </link>
 
-     <route src="host1" dst="host2"><link_ctn id="l1"/><link_ctn id="l2"/></route>
-   </AS>
+      <route src="host1" dst="host2"><link_ctn id="l1"/>
+        <link_ctn id="l2"/>
+      </route>
+    </AS>
   </AS>
 </platform>

diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml
index ba8ed8a..a5e242e 100644 (file)
--- a/examples/platforms/routing_cluster.xml
+++ b/examples/platforms/routing_cluster.xml
@@ -11,49 +11,49 @@ l1_up / / l1_down  | l3   l2_up\ \ l2_down   l4_up / / l4_down  | l6   l5_up\ \
      / /           |            \ \               / /           |            \ \
     host1         host3         host2           host4         host6          host5
 -->
-<AS id="AS0" routing="Full">
-  <AS  id="my_cluster1"  routing="Cluster">
-    <router id="router1"/>
+  <AS id="AS0" routing="Full">
+    <AS  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="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="FULLDUPLEX"/>
-    <host_link id="host2" up="l2_UP" down="l2_DOWN"/>
+      <host id="host2" speed="1Gf"/>
+      <link id="l2" bandwidth="125MBps" latency="100us" sharing_policy="FULLDUPLEX"/>
+      <host_link id="host2" up="l2_UP" down="l2_DOWN"/>
 
-    <host id="host3" speed="1Gf"/>
-    <link id="l3" bandwidth="125MBps" latency="100us"/>
-    <host_link id="host3" up="l3" down="l3"/>
+      <host id="host3" speed="1Gf"/>
+      <link id="l3" bandwidth="125MBps" latency="100us"/>
+      <host_link id="host3" up="l3" down="l3"/>
 
-    <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
-  </AS>
+      <backbone id="backbone1" bandwidth="2.25GBps" latency="500us"/>
+    </AS>
+
+    <AS  id="my_cluster2"  routing="Cluster">
+      <router id="router2"/>
+
+      <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"/>
+
+      <host id="host5" speed="1Gf"/>
+      <link id="l5" bandwidth="125MBps" latency="100us" sharing_policy="FULLDUPLEX"/>
+      <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" 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="backbone2" bandwidth="2.25GBps" latency="500us"/>
+    </AS>
 
-    <host id="host5" speed="1Gf"/>
-    <link id="l5" bandwidth="125MBps" latency="100us" 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" speed="1Gf"/>
-    <link id="l6" bandwidth="125MBps" latency="100us"/>
-    <host_link id="host6" up="l6" down="l6"/>
- 
-    <backbone id="backbone2" bandwidth="2.25GBps" latency="500us"/>
+    <ASroute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
+      <link_ctn id="link1-2" />
+    </ASroute>
   </AS>
-  
-  <link id="link1-2" bandwidth="2.25GBps" latency="500us"/>
-  
-  <ASroute src="my_cluster1" dst="my_cluster2" gw_src="router1" gw_dst="router2">
-    <link_ctn id="link1-2" />
-  </ASroute>
-</AS>
 </platform>

diff --git a/examples/platforms/two_hosts.xml b/examples/platforms/two_hosts.xml
index 6a7a389..2aebc98 100644 (file)
--- a/examples/platforms/two_hosts.xml
+++ b/examples/platforms/two_hosts.xml
@@ -7,7 +7,9 @@
 
     <link id="1" bandwidth="125MBps" latency="100us" bandwidth_file="trace/link1_avail.trace"/>
 
-    <route src="Tremblay" dst="Jupiter"><link_ctn id="1"/></route>
+    <route src="Tremblay" dst="Jupiter">
+      <link_ctn id="1"/>
+    </route>
   </AS>
 
   <trace id="Tremblay_power" periodicity="6.0">

diff --git a/examples/platforms/two_hosts_platform_with_availability.xml b/examples/platforms/two_hosts_platform_with_availability.xml
index 5012186..c9d6e49 100644 (file)
--- a/examples/platforms/two_hosts_platform_with_availability.xml
+++ b/examples/platforms/two_hosts_platform_with_availability.xml
@@ -1,10 +1,12 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS  id="AS0"  routing="Full">
-  <host id="Cpu A" speed="10f" availability_file="trace/trace_A.txt" state_file="trace/trace_A_failure.txt"/>
-  <host id="Cpu B" speed="10f" availability_file="trace/trace_B.txt"/>
-  <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
-  <route src="Cpu A" dst="Cpu B"><link_ctn id="LinkA"/></route>
-</AS>
+  <AS  id="AS0"  routing="Full">
+    <host id="Cpu A" speed="10f" availability_file="trace/trace_A.txt" state_file="trace/trace_A_failure.txt"/>
+    <host id="Cpu B" speed="10f" availability_file="trace/trace_B.txt"/>
+    <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
+    <route src="Cpu A" dst="Cpu B">
+      <link_ctn id="LinkA"/>
+    </route>
+  </AS>
 </platform>

diff --git a/examples/platforms/two_hosts_platform_with_availability_included.xml b/examples/platforms/two_hosts_platform_with_availability_included.xml
index 35b2f2e..3eb160f 100644 (file)
--- a/examples/platforms/two_hosts_platform_with_availability_included.xml
+++ b/examples/platforms/two_hosts_platform_with_availability_included.xml
@@ -20,7 +20,9 @@
     <host id="Cpu A" speed="10f"/>
     <host id="Cpu B" speed="10f"/>
     <link id="LinkA" bandwidth="10MBps" latency="200ms"/>
-    <route src="Cpu A" dst="Cpu B"><link_ctn id="LinkA"/></route>
+    <route src="Cpu A" dst="Cpu B">
+      <link_ctn id="LinkA"/>
+    </route>
   </AS>
 
   <trace_connect kind="SPEED" trace="A" element="Cpu A"/>

diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml
index 7bd805c..00d9768 100644 (file)
--- a/examples/platforms/two_peers.xml
+++ b/examples/platforms/two_peers.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
 <platform version="4">
-<AS id="AS0" routing="Vivaldi">
-  <peer id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />
-  <peer id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />
-</AS>
+  <AS id="AS0" routing="Vivaldi">
+    <peer id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />
+    <peer id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" bw_in="2.25GBps" bw_out="2.25GBps" lat="500us" />
+  </AS>
 </platform>

diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml
index 2f3a4fb..926b88c 100644 (file)
--- a/examples/platforms/vivaldi.xml
+++ b/examples/platforms/vivaldi.xml
@@ -1,49 +1,49 @@
 <?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"></prop>
-</config>  
-<AS id="AS0" routing="Vivaldi">
-  <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
-  <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" />
-  <host id="100041334" coordinates="-15.7 9.9 14.7" speed="2.8Gf" />
-  <host id="100055671" coordinates="27.1 7.2 19.2" speed="880Mf" />
-  <host id="100066658" coordinates="11.4 10.7 24.8" speed="2Gf" />
-  <host id="100090691" coordinates="27.1 14.9 0.3" speed="1Gf" />
-  <host id="100094952" coordinates="110.1 31.2 43.7" speed="340Mf" />
-  <host id="100117943" coordinates="-21.2 -25.2 4.1" speed="1.2Gf" />
-  <host id="100126290" coordinates="-2.3 1.1 12.0" speed="1.3Gf" />
-  <host id="100144483" coordinates="16.8 -11.1 15.4" speed="1.4Gf" />
-  <host id="100152889" coordinates="-6.8 1.6 0.3" speed="1.6Gf" />
-  <host id="100178474" coordinates="23.0 -4.1 1.0" speed="1.7Gf" />
-  <host id="100180261" coordinates="29.9 -9.2 0.2" speed="2.2Gf" />
-  <host id="100185883" coordinates="-2.2 7.2 11.0" speed="770Mf" />
-  <host id="100186365" coordinates="26.1 -61.9 144.7" speed="840Mf" />
-  <host id="100200866" coordinates="-39.4 1.1 0.6" speed="1.5Gf" />
-  <host id="100207885" coordinates="26.5 -15.1 0.3" speed="1.6Gf" />
-  <host id="100224447" coordinates="15.0 -0.5 34.5" speed="720Mf" />
-  <host id="100238799" coordinates="16.5 11.5 19.2" speed="1.4Gf" />
-  <host id="100273297" coordinates="-37.9 85.0 69.8" speed="2.3Gf" />
-  <host id="100280711" coordinates="-2.6 19.4 6.4" speed="2.3Gf" />
-  <host id="100284574" coordinates="-104.4 -162.5 1.7" speed="2.3Gf" />
-  <host id="100292843" coordinates="-41.8 -30.9 5.8" speed="700Mf" />
-  <host id="100309685" coordinates="-9.9 10.4 1.9" speed="2.3Gf" />
-  <host id="100315281" coordinates="8.5 15.3 31.9" speed="2.2Gf" />
-  <host id="100317715" coordinates="6.0 -12.6 7.0" speed="1.7Gf" />
-  <host id="100324694" coordinates="89.6 26.1 17.9" speed="2.2Gf" />
-  <host id="100326641" coordinates="13.9 -31.4 8.2" speed="1.5Gf" />
-  <host id="100331484" coordinates="13.6 10.0 25.0" speed="2.2Gf" />
-  <host id="100347816" coordinates="32.2 34.0 104.4" speed="2.8Gf" />
-  <host id="100354536" coordinates="23.5 21.2 24.5" speed="2Gf" />
-  <host id="100355017" coordinates="-27.0 -12.1 4.8" speed="1.3Gf" />
-  <host id="100359203" coordinates="18.4 -4.5 1.2" speed="2.3Gf" />
-  <host id="100379397" coordinates="109.3 253.6 2.0" speed="2.5Gf" />
-  <host id="100404046" coordinates="16.5 9.4 4.2" speed="2.3Gf" />
-  <host id="100413314" coordinates="-35.9 -42.6 1.0" speed="2.8Gf" />
-  <host id="100416828" coordinates="30.4 18.9 3.5" speed="1.3Gf" />
-  <host id="100422926" coordinates="-23.1 -7.6 39.9" speed="1.6Gf" />
-  <host id="100427449" coordinates="135.5 -21.0 83.4" speed="1.4Gf" />
-  <host id="100429957" coordinates="17.5 6.7 18.8" speed="830Mf" />
-</AS>
+  <config id="General">
+    <prop id="network/coordinates" value="yes"></prop>
+  </config>
+  <AS id="AS0" routing="Vivaldi">
+    <host id="100030591" coordinates="25.5 9.4 1.4" speed="1.5Gf" />
+    <host id="100036570" coordinates="-12.7 -9.9 2.1" speed="730Mf" />
+    <host id="100041334" coordinates="-15.7 9.9 14.7" speed="2.8Gf" />
+    <host id="100055671" coordinates="27.1 7.2 19.2" speed="880Mf" />
+    <host id="100066658" coordinates="11.4 10.7 24.8" speed="2Gf" />
+    <host id="100090691" coordinates="27.1 14.9 0.3" speed="1Gf" />
+    <host id="100094952" coordinates="110.1 31.2 43.7" speed="340Mf" />
+    <host id="100117943" coordinates="-21.2 -25.2 4.1" speed="1.2Gf" />
+    <host id="100126290" coordinates="-2.3 1.1 12.0" speed="1.3Gf" />
+    <host id="100144483" coordinates="16.8 -11.1 15.4" speed="1.4Gf" />
+    <host id="100152889" coordinates="-6.8 1.6 0.3" speed="1.6Gf" />
+    <host id="100178474" coordinates="23.0 -4.1 1.0" speed="1.7Gf" />
+    <host id="100180261" coordinates="29.9 -9.2 0.2" speed="2.2Gf" />
+    <host id="100185883" coordinates="-2.2 7.2 11.0" speed="770Mf" />
+    <host id="100186365" coordinates="26.1 -61.9 144.7" speed="840Mf" />
+    <host id="100200866" coordinates="-39.4 1.1 0.6" speed="1.5Gf" />
+    <host id="100207885" coordinates="26.5 -15.1 0.3" speed="1.6Gf" />
+    <host id="100224447" coordinates="15.0 -0.5 34.5" speed="720Mf" />
+    <host id="100238799" coordinates="16.5 11.5 19.2" speed="1.4Gf" />
+    <host id="100273297" coordinates="-37.9 85.0 69.8" speed="2.3Gf" />
+    <host id="100280711" coordinates="-2.6 19.4 6.4" speed="2.3Gf" />
+    <host id="100284574" coordinates="-104.4 -162.5 1.7" speed="2.3Gf" />
+    <host id="100292843" coordinates="-41.8 -30.9 5.8" speed="700Mf" />
+    <host id="100309685" coordinates="-9.9 10.4 1.9" speed="2.3Gf" />
+    <host id="100315281" coordinates="8.5 15.3 31.9" speed="2.2Gf" />
+    <host id="100317715" coordinates="6.0 -12.6 7.0" speed="1.7Gf" />
+    <host id="100324694" coordinates="89.6 26.1 17.9" speed="2.2Gf" />
+    <host id="100326641" coordinates="13.9 -31.4 8.2" speed="1.5Gf" />
+    <host id="100331484" coordinates="13.6 10.0 25.0" speed="2.2Gf" />
+    <host id="100347816" coordinates="32.2 34.0 104.4" speed="2.8Gf" />
+    <host id="100354536" coordinates="23.5 21.2 24.5" speed="2Gf" />
+    <host id="100355017" coordinates="-27.0 -12.1 4.8" speed="1.3Gf" />
+    <host id="100359203" coordinates="18.4 -4.5 1.2" speed="2.3Gf" />
+    <host id="100379397" coordinates="109.3 253.6 2.0" speed="2.5Gf" />
+    <host id="100404046" coordinates="16.5 9.4 4.2" speed="2.3Gf" />
+    <host id="100413314" coordinates="-35.9 -42.6 1.0" speed="2.8Gf" />
+    <host id="100416828" coordinates="30.4 18.9 3.5" speed="1.3Gf" />
+    <host id="100422926" coordinates="-23.1 -7.6 39.9" speed="1.6Gf" />
+    <host id="100427449" coordinates="135.5 -21.0 83.4" speed="1.4Gf" />
+    <host id="100429957" coordinates="17.5 6.7 18.8" speed="830Mf" />
+  </AS>
 </platform>