X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/595e59c568ff5f8510de201bfd800951cdc2adcb..8344f32ee2339f2b53a6e79ac0e9aa3a93384f58:/examples/platforms/cloud.xml

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index 82672eaf46..a0c1e49c53 100644
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
   <zone id="AS0" routing="Vivaldi">
     <zone id="AS1_dc1" routing="Full">
@@ -68,18 +68,6 @@
       <zoneRoute 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"/>
-      </zoneRoute> 
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
       </zoneRoute>
     </zone>
 
@@ -150,7 +138,7 @@
       </zoneRoute>
       <zoneRoute 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"/>
       </zoneRoute>
       <zoneRoute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com"
@@ -168,7 +156,7 @@
         <link_ctn id="link_dc2_cb3"/>
         <link_ctn id="link_dc2_cb6"/>
       </zoneRoute>
-      <zoneRoute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" 
+      <zoneRoute 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"/>
@@ -233,35 +221,11 @@
       <zoneRoute 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"/>
-      </zoneRoute> 
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
       </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute> 
     </zone>
 
-    <zone id="AS3_dc3" routing="Full">  
-      <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : FULL -->    
+    <zone 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"
@@ -286,9 +250,9 @@
         <!-- 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"/>  
+        <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"/>
@@ -350,22 +314,6 @@
                gw_dst="gw_dc3_horizdist">
         <link_ctn id="link_dc3_cb4"/>
       </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
-      <zoneRoute 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"/>
-      </zoneRoute>
     </zone>
   </zone>
 </platform>