X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d3f040cd94eef77995a32dc1ae22527ffc828b27..60b0a3fcfeb8ab03910861209af6b06964ec7a30:/examples/platforms/cloud.xml?ds=sidebyside

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index e2cc7a3f27..626666d044 100644
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -42,15 +42,18 @@
       <!-- internal routes between clusters -->
       <ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com"
                gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb3"/><link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb1"/>
       </ASroute>
       <ASroute src="AS1_cb2" dst="AS1_cb1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
                gw_dst="cb1-AS1_cb1_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb1"/>
       </ASroute>
       <ASroute src="AS1_cb2" dst="AS1_cb3" gw_src="cb2-AS1_cb2_router.dc1.acloud.com"
                gw_dst="cb3-AS1_cb3_router.dc1.acloud.com">
-        <link_ctn id="link_dc1_cb2"/><link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb3"/>
       </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">
@@ -116,71 +119,89 @@
         <link id="dc2_maindist_entranceroom" bandwidth="1.25GBps" latency="100us"/>
         <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>
-        <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom"><link_ctn id="dc2_maindist_entranceroom"/></route>
-        <route src="gw_dc2_entranceroom" dst="router_AS2_dc2"><link_ctn id="dc2_entranceroom_ISP"/></route>
+        <route src="gw_dc2_horizdist" dst="gw_dc2_maindist">
+        <link_ctn id="dc2_horizdist_maindist"/></route>
+        <route src="gw_dc2_maindist" dst="gw_dc2_entranceroom">
+        <link_ctn id="dc2_maindist_entranceroom"/></route>
+        <route src="gw_dc2_entranceroom" dst="router_AS2_dc2">
+        <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_cb6"/>
+         <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_cb6"/>
+         <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_cb4"/>
+         <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_cb6"/>
+         <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_cb4"/>
+         <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_cb5"/>
+         <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_cb6"/>
+         <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_cb4"/>
+         <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_cb5"/>
+         <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_cb2"/>
+         <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"
                gw_dst="cb6-AS2_cb6_router.dc2.acloud.com">
-        <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb6"/>
+        <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb6"/>
       </ASroute>
       <ASroute src="AS2_cb1" dst="AS2_cb4" gw_src="cb1-AS2_cb1_router.dc2.acloud.com"
                gw_dst="cb4-AS2_cb4_router.dc2.acloud.com">
-        <link_ctn id="link_dc2_cb1"/><link_ctn id="link_dc2_cb4"/>
+        <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb4"/>
       </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_cb5"/>
+         <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_cb2"/>
+         <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_cb3"/>
+         <link_ctn id="link_dc2_cb1"/>
+        <link_ctn id="link_dc2_cb3"/>
       </ASroute>
 
       <!-- routess to exit AS -->
@@ -266,15 +287,18 @@
           <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_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"/>
+         <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">