X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/357be85894221cc2937fa53b5c591f96287fa9fa..8a30d839e791237688f68d4047fef5a30293dfc4:/examples/platforms/cloud.xml?ds=sidebyside

diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml
index 662de61d6b..3833736a7d 100644
--- a/examples/platforms/cloud.xml
+++ b/examples/platforms/cloud.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 <config id="General">
-	<prop id="coordinates" value="yes"></prop>
+	<prop id="network/coordinates" value="yes"></prop>
 </config>
 
 <AS  id="AS0"  routing="Vivaldi">
@@ -11,14 +11,14 @@
    <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : rule based, because of its regularity-->    
     	    <!-- 3 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted because not a part of the production platform  -->
             <!-- clusters -->
-            <cluster id="AS1_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-	    <link   id="link_dc1_cb1" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS1_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" power="5.2297gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+	    <link   id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
 
-	    <cluster id="AS1_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-	    <link   id="link_dc1_cb2" bandwidth="1.25E9" latency="1.0E-4"/>
+	    <cluster id="AS1_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" power="8.8925gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+	    <link   id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS1_cb3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-	    <link   id="link_dc1_cb3" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS1_cb3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" power="13.357gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+	    <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_AS1_dc1" routing="Floyd">
@@ -29,9 +29,9 @@
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
                     <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4" />
                     <!-- links -->
-                    <link id="dc1_horizdist_maindist"        bandwidth="1.25E9" latency="1.0E-4"/>        
-                    <link id="dc1_maindist_entranceroom"        bandwidth="1.25E9" latency="1.0E-4"/>  
-                        <link id="dc1_entranceroom_ISP"        bandwidth="1.25E9" latency="1.0E-4"/>  
+                    <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"><link_ctn id="dc1_horizdist_maindist"/></route>
                     <route src="gw_dc1_maindist" dst="gw_dc1_entranceroom"><link_ctn id="dc1_maindist_entranceroom"/></route>
@@ -56,23 +56,23 @@
    <!--bigger tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : rule based, because of its regularity-->   
             <!-- 6 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted because not a part of the production platform  -->
             <!-- clusters -->
-            <cluster id="AS2_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb1" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc2_cb1" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb2" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc2_cb2" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb3" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" power="13.357gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc2_cb3" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb4" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc2_cb4" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb5" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc2_cb5" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS2_cb6" prefix="cb6-" suffix=".dc2.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc2_cb6" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS2_cb6" prefix="cb6-" suffix=".dc2.acloud.com" radical="1-30" power="13.357gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc2_cb6" bandwidth="1.25GBps" latency="100us"/>
 
             <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
             <AS id="gw_AS2_dc2" routing="Floyd">
@@ -83,9 +83,9 @@
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
                     <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4" />
                     <!-- links -->
-                    <link id="dc2_horizdist_maindist"        bandwidth="1.25E9" latency="1.0E-4"/>        
-                    <link id="dc2_maindist_entranceroom"        bandwidth="1.25E9" latency="1.0E-4"/>  
-                        <link id="dc2_entranceroom_ISP"        bandwidth="1.25E9" latency="1.0E-4"/>  
+                    <link id="dc2_horizdist_maindist"        bandwidth="1.25GBps" latency="100us"/>        
+                    <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>
@@ -110,17 +110,17 @@
    <!--small tier-1 datacenter, according to TIA-942 annex G tiers notation, routing : rule based, because of its regularity-->    
             <!-- 4 clusters, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted because not a part of the production platform  -->
             <!-- clusters -->
-            <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" power="5.2297E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb1" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" power="5.2297gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc3_cb1" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" power="8.8925E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb2" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" power="8.8925gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc3_cb2" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com"  radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb3" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb3" prefix="cb3-" suffix=".dc3.acloud.com"  radical="1-30" power="13.357gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc3_cb3" bandwidth="1.25GBps" latency="100us"/>
 
-            <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" power="13.357E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-            <link   id="link_dc3_cb4" bandwidth="1.25E9" latency="1.0E-4"/>
+            <cluster id="AS3_cb4" prefix="cb4-" suffix=".dc3.acloud.com" radical="1-30" power="13.357gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
+            <link   id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
 
             <!-- horiz dist area switch, main dist area switch, entrance room switch, end point for ISP  -->
             <AS id="gw_AS3_dc3" routing="Floyd">
@@ -131,9 +131,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.25E9" latency="1.0E-4"/>        
-                    <link id="dc3_maindist_entranceroom"        bandwidth="1.25E9" latency="1.0E-4"/>  
-                        <link id="dc3_entranceroom_ISP"        bandwidth="1.25E9" latency="1.0E-4"/>  
+                    <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>