tiny cleanups in platform examples

diff --git a/MANIFEST.in b/MANIFEST.in
index 61e8c26..0c8e23d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1891,8 +1891,8 @@ include examples/deprecated/java/CMakeLists.txt
 include examples/deprecated/msg/CMakeLists.txt
 include examples/deprecated/msg/mc/CMakeLists.txt
 include examples/deprecated/simdag/CMakeLists.txt
-include examples/platforms/bypassASroute.xml
 include examples/platforms/bypassRoute.xml
+include examples/platforms/bypassZoneRoute.xml
 include examples/platforms/cloud.xml
 include examples/platforms/cluster_and_one_host.xml
 include examples/platforms/cluster_backbone.xml

diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassZoneRoute.xml
similarity index 100%
rename from examples/platforms/bypassASroute.xml
rename to examples/platforms/bypassZoneRoute.xml

diff --git a/examples/platforms/cluster_and_one_host.xml b/examples/platforms/cluster_and_one_host.xml
index ee0d267..710b2c7 100644 (file)
--- a/examples/platforms/cluster_and_one_host.xml
+++ b/examples/platforms/cluster_and_one_host.xml
@@ -1,17 +1,17 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
-  <zone id="AS0" routing="Full">
-    <cluster id="my_cluster_1" prefix="c-" suffix=".me" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
+  <zone id="world" routing="Full">
+    <cluster id="datacenter" prefix="c-" suffix=".me" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
              router_id="router1"/>
 
-    <zone id="AS1" routing="None">
+    <zone id="outside" routing="None">
       <host id="host1" speed="1Gf"/>
     </zone>
 
     <link id="link1" bandwidth="100kBps" latency="10ms"/>
 
-    <zoneRoute src="my_cluster_1" dst="AS1" gw_src="router1" gw_dst="host1">
+    <zoneRoute src="datacenter" dst="outside" gw_src="router1" gw_dst="host1">
       <link_ctn id="link1"/>
     </zoneRoute>
   </zone>

diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
index 8d60945..81f3bed 100644 (file)
--- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
@@ -2,7 +2,7 @@
 
 p Testing a bypass ASroute
 
-$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassASroute.xml FULL_LINK
+$ ${bindir:=.}/basic-parsing-test ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml FULL_LINK
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > Workstation number: 3, link number: 11
 > Route between 1 and 1

diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh
index 941b4eb..d027cfb 100644 (file)
--- a/teshsuite/simdag/flatifier/flatifier.tesh
+++ b/teshsuite/simdag/flatifier/flatifier.tesh
@@ -550,7 +550,7 @@ $ ${bindir:=.}/flatifier ../platforms/two_hosts_one_link.xml "--log=root.fmt:[%1
 > </AS>
 > </platform>
 
-$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassASroute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
+$ ${bindir:=.}/flatifier ${srcdir:=.}/examples/platforms/bypassZoneRoute.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
 > <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index ae1d4b5..b4b2dd6 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1140,7 +1140,7 @@ set(CMAKE_SOURCE_FILES
   )
 
 set(PLATFORMS_EXAMPLES
-  examples/platforms/bypassASroute.xml
+  examples/platforms/bypassZoneRoute.xml
   examples/platforms/bypassRoute.xml
   examples/platforms/cloud.xml
   examples/platforms/cluster_backbone.xml