From db2f027bbc0e8bad6ec20d5e2e76c989a1800b69 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 18 Sep 2018 00:30:18 +0200
Subject: [PATCH] cleanups in the cluster platform files

---
 .../{cluster_no_backbone.xml => cluster_crossbar.xml}    | 9 ++++++---
 .../{cluster_backbone.xml => cluster_multi.xml}          | 0
 .../routing-get-clusters/s4u-routing-get-clusters.tesh   | 2 +-
 teshsuite/msg/cloud-sharing/cloud-sharing.tesh           | 2 +-
 tools/cmake/DefinePackages.cmake                         | 4 ++--
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename examples/platforms/{cluster_no_backbone.xml => cluster_crossbar.xml} (55%)
 rename examples/platforms/{cluster_backbone.xml => cluster_multi.xml} (100%)

diff --git a/examples/platforms/cluster_no_backbone.xml b/examples/platforms/cluster_crossbar.xml
similarity index 55%
rename from examples/platforms/cluster_no_backbone.xml
rename to examples/platforms/cluster_crossbar.xml
index c3acb30446..138859f840 100644
--- a/examples/platforms/cluster_no_backbone.xml
+++ b/examples/platforms/cluster_crossbar.xml
@@ -3,7 +3,7 @@
 <platform version="4.1">
   <!--           _________
                 |          |
-                |  router  |
+                | crossbar |
                 |__________|
                     / | \
                    /  |  \
@@ -11,8 +11,11 @@
                  /    |    \
                 /     |     \
             host0   host1   host2
+	    
+    All hosts can communicate at full speed with no interference on
+    the crossbar. Only the links of each hosts are limiting.	    
   -->
-  <zone id="AS0" routing="Full">
-    <cluster id="my_cluster_1" prefix="" suffix="" radical="0-262144" speed="1Gf" bw="125MBps" lat="50us"/>
+  <zone id="world" routing="Full">
+    <cluster id="cluster-crossbar" prefix="host-" suffix="simgrid.org" radical="0-262144" speed="1Gf" bw="125MBps" lat="50us"/>
   </zone>
 </platform>
diff --git a/examples/platforms/cluster_backbone.xml b/examples/platforms/cluster_multi.xml
similarity index 100%
rename from examples/platforms/cluster_backbone.xml
rename to examples/platforms/cluster_multi.xml
diff --git a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh
index 7ccebfbc86..99cc45c0db 100644
--- a/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh
+++ b/examples/s4u/routing-get-clusters/s4u-routing-get-clusters.tesh
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-routing-get-clusters$EXEEXT ${platfdir}/cluster_backbone.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/s4u-routing-get-clusters$EXEEXT ${platfdir}/cluster_multi.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (maestro@) simple
 > [  0.000000] (maestro@)    node-0.1core.org
 > [  0.000000] (maestro@)    node-1.1core.org
diff --git a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
index 052a489c28..19345ad77d 100644
--- a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
+++ b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${platfdir}/cluster_backbone.xml
+$ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${platfdir}/cluster_multi.xml
 > # TEST ON SINGLE-CORE PMs
 > ## Check computation on regular PMs
 > ### Test '(o)1'. A task on a regular PM
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index cf18211017..9b49b2e74e 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1135,10 +1135,10 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
   examples/platforms/cluster.xml
-  examples/platforms/cluster_backbone.xml
+  examples/platforms/cluster_multi.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_prototype.lua
-  examples/platforms/cluster_no_backbone.xml
+  examples/platforms/cluster_crossbar.xml
   examples/platforms/cluster_torus.xml
   examples/platforms/cluster_fat_tree.xml
   examples/platforms/cluster_dragonfly.xml
-- 
2.20.1