Update g5k platform.

Add griffon platform.

diff --git a/buildtools/Cmake/generate_g5k_platform.pl b/buildtools/Cmake/generate_g5k_platform.pl
index c213ee7..a2e29ca 100755 (executable)
--- a/buildtools/Cmake/generate_g5k_platform.pl
+++ b/buildtools/Cmake/generate_g5k_platform.pl
@@ -72,7 +72,7 @@ while(defined($line=<SITES_LIGNE>))
                {
                        if($line =~ /"uid": "(.*)",/){
                                $cluster = $1;
-                               print "\t\t\t<cluster id=\"AS_$cluster\" prefix=\"$cluster-\" suffix=\".$cluster.grid5000.fr\"\n";
+                               print "\t\t\t<cluster id=\"AS_$cluster\" prefix=\"$cluster-\" suffix=\".$site.grid5000.fr\"\n";
                                `wget https://api.grid5000.fr/2.0/grid5000/sites/$site/clusters/$cluster/nodes --http-user="$ARGV[0]" --http-password="$ARGV[1]" --no-check-certificate --quiet`;
                                open NODES_LIGNE, 'nodes' or die "Unable to open nodes $!\n";
                                while(defined($line=<NODES_LIGNE>))

diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml
index 46898bd..abdc040 100644 (file)
--- a/examples/platforms/g5k.xml
+++ b/examples/platforms/g5k.xml
@@ -35,17 +35,17 @@
                <route src="marseille" dst="toulouse"  ><link_ctn id="Marseille_Toulouse"/></route>
                </AS>
                <AS id="AS_bordeaux" routing="RuleBased" >
-                       <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeplage.grid5000.fr"
+                       <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
                                radical="1-51" power="5.2297E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_bordeplage" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordereau.grid5000.fr"
+                       <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
                                radical="1-93" power="8.8925E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_bordereau" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_borderline" prefix="borderline-" suffix=".borderline.grid5000.fr"
+                       <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
                                radical="1-10" power="13.357E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_borderline" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -79,17 +79,17 @@
 
                </AS>
                <AS id="AS_grenoble" routing="RuleBased" >
-                       <cluster id="AS_adonis" prefix="adonis-" suffix=".adonis.grid5000.fr"
+                       <cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr"
                                radical="1-12" power="23.681E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_adonis" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_edel" prefix="edel-" suffix=".edel.grid5000.fr"
+                       <cluster id="AS_edel" prefix="edel-" suffix=".grenoble.grid5000.fr"
                                radical="1-72" power="23.492E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_edel" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_genepi" prefix="genepi-" suffix=".genepi.grid5000.fr"
+                       <cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr"
                                radical="1-34" power="21.175E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_genepi" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -123,16 +123,26 @@
 
                </AS>
                <AS id="AS_lille" routing="RuleBased" >
-                       <cluster id="AS_chicon" prefix="chicon-" suffix=".chicon.grid5000.fr"
+                       <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
                                radical="1-26" power="8.9618E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_chicon" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".chinqchint.grid5000.fr"
+                       <cluster id="AS_chimint" prefix="chimint-" suffix=".lille.grid5000.fr"
+                               radical="1-20" power="23.531E9" bw="1.25E8" lat="1.0E-4"
+                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+                       <link   id="link_chimint" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
                                radical="1-46" power="22.270E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_chinqchint" bandwidth="1.25E9" latency="1.0E-4"/>
 
+                       <cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr"
+                               radical="1-8" power="24.473E9" bw="1.25E8" lat="1.0E-4"
+                               bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+                       <link   id="link_chirloute" bandwidth="1.25E9" latency="1.0E-4"/>
+
                        <AS id="gw_AS_lille" routing="Full">
                                <router id="gw_lille"/>
                        </AS>
@@ -162,12 +172,12 @@
 
                </AS>
                <AS id="AS_lyon" routing="RuleBased" >
-                       <cluster id="AS_capricorne" prefix="capricorne-" suffix=".capricorne.grid5000.fr"
+                       <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
                                radical="1-56" power="4.7233E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_capricorne" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".sagittaire.grid5000.fr"
+                       <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
                                radical="1-79" power="5.6693E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_sagittaire" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -201,12 +211,12 @@
 
                </AS>
                <AS id="AS_nancy" routing="RuleBased" >
-                       <cluster id="AS_graphene" prefix="graphene-" suffix=".graphene.grid5000.fr"
+                       <cluster id="AS_graphene" prefix="graphene-" suffix=".nancy.grid5000.fr"
                                radical="1-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_griffon" prefix="griffon-" suffix=".griffon.grid5000.fr"
+                       <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
                                radical="1-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -240,12 +250,12 @@
 
                </AS>
                <AS id="AS_orsay" routing="RuleBased" >
-                       <cluster id="AS_gdx" prefix="gdx-" suffix=".gdx.grid5000.fr"
+                       <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
                                radical="1-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_netgdx" prefix="netgdx-" suffix=".netgdx.grid5000.fr"
+                       <cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr"
                                radical="1-30" power="4.7144E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_netgdx" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -279,22 +289,22 @@
 
                </AS>
                <AS id="AS_rennes" routing="RuleBased" >
-                       <cluster id="AS_paradent" prefix="paradent-" suffix=".paradent.grid5000.fr"
+                       <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
                                radical="1-64" power="21.496E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_paradent" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_paramount" prefix="paramount-" suffix=".paramount.grid5000.fr"
+                       <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
                                radical="1-33" power="12.910E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_paramount" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_parapide" prefix="parapide-" suffix=".parapide.grid5000.fr"
+                       <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
                                radical="1-25" power="30.130E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_parapide" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_parapluie" prefix="parapluie-" suffix=".parapluie.grid5000.fr"
+                       <cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr"
                                radical="1-40" power="27.391E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_parapluie" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -328,17 +338,17 @@
 
                </AS>
                <AS id="AS_sophia" routing="RuleBased" >
-                       <cluster id="AS_helios" prefix="helios-" suffix=".helios.grid5000.fr"
+                       <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
                                radical="1-56" power="7.7318E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_helios" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_sol" prefix="sol-" suffix=".sol.grid5000.fr"
+                       <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
                                radical="1-50" power="8.9388E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_sol" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_suno" prefix="suno-" suffix=".suno.grid5000.fr"
+                       <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
                                radical="1-45" power="23.530E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_suno" bandwidth="1.25E9" latency="1.0E-4"/>
@@ -372,12 +382,12 @@
 
                </AS>
                <AS id="AS_toulouse" routing="RuleBased" >
-                       <cluster id="AS_pastel" prefix="pastel-" suffix=".pastel.grid5000.fr"
+                       <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
                                radical="1-80" power="9.5674E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_pastel" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <cluster id="AS_violette" prefix="violette-" suffix=".violette.grid5000.fr"
+                       <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
                                radical="1-52" power="5.1143E9" bw="1.25E8" lat="1.0E-4"
                                bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
                        <link   id="link_violette" bandwidth="1.25E9" latency="1.0E-4"/>

diff --git a/examples/platforms/griffon-cluster.xml b/examples/platforms/griffon-cluster.xml
new file mode 100644 (file)
index 0000000..bc2c323
--- /dev/null
+++ b/examples/platforms/griffon-cluster.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<platform version="3">
+<AS  id="AS_griffon"  routing="Full">
+       
+     <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
+           radical="1-29,58,59,60" power="286087" bw="1.25e8" lat="2.4e-5"
+           bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+   
+     <cluster id="griffon_cluster_cabinet2" prefix="griffon-" suffix=".nancy.grid5000.fr"
+           radical="30-57" power="286087" bw="1.25e8" lat="2.4e-5" 
+           bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+       
+     <cluster id="griffon_cluster_cabinet3" prefix="griffon-" suffix=".nancy.grid5000.fr"
+           radical="61-92" power="286087" bw="1.25e8" lat="2.4e-5" 
+           bb_bw="1.25e9" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+
+     <link id="backbone" bandwidth="1.25e9" latency="2.4e-5" 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" 
+        symmetrical="YES">
+               <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" 
+        symmetrical="YES">
+               <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" 
+        symmetrical="YES">
+               <link_ctn id="backbone"/>
+     </ASroute> 
+               
+</AS>
+</platform>
+