Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Remove PCRE dependency and RuleBased routing
authorPaul Bédaride <paul.bedaride@gmail.com>
Wed, 15 May 2013 15:41:39 +0000 (17:41 +0200)
committerPaul Bédaride <paul.bedaride@gmail.com>
Wed, 15 May 2013 15:41:39 +0000 (17:41 +0200)
39 files changed:
COPYING
ChangeLog
INSTALL
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/MakeLib.cmake
buildtools/Cmake/MakeLibWin.cmake
buildtools/Cmake/Modules/FindPCRE.cmake [deleted file]
buildtools/Cmake/Modules/FindPcreWin.cmake [deleted file]
buildtools/Cmake/src/simgrid.nsi.in
buildtools/pipol/rc.debian
buildtools/pipol/rc.fedora
buildtools/pipol/rc.mac
buildtools/pipol/rc.ubuntu
doc/HelloWorld/CMakeLists.txt
doc/HelloWorld/FindPcreWin.cmake [deleted file]
doc/HelloWorld/README
doc/doxygen/install.doc
doc/doxygen/pls.doc
doc/msg-tuto-src/platforms/cloud.xml
doc/msg-tuto-src/platforms/g5k.xml
examples/platforms/cloud.xml
examples/platforms/cluster_routing_rulebased.xml [deleted file]
examples/platforms/data_center.xml
examples/platforms/g5k.xml
include/surf/simgrid_dtd.h
src/bindings/lua/lua_platf.c
src/surf/simgrid.dtd
src/surf/simgrid_dtd.c
src/surf/surf_routing.c
src/surf/surf_routing_private.h
src/surf/surf_routing_rulebased.c [deleted file]
src/surf/surf_routing_vivaldi.c
src/surf/surfxml_parse.c
src/xbt/log.c
teshsuite/simdag/platforms/CMakeLists.txt
teshsuite/simdag/platforms/Two_clusters_rulebased.xml [deleted file]
teshsuite/simdag/platforms/basic_parsing_test.tesh
tools/platf_route_rulebased2full.py [new file with mode: 0755]

diff --git a/COPYING b/COPYING
index 98b0223..3870bb5 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -14,30 +14,6 @@ The SimGrid logo is distributed under the CC-BY-SA license.
 
 =========================================================================
 
-We have embeded pcre 8.12 library into the windows installer.
-
-PCRE is a library of functions to support regular expressions whose syntax
-and semantics are as close as possible to those of the Perl 5 language.
-Release 8 of PCRE is distributed under the terms of the "BSD" licence.
-The basic library functions are written in C and are freestanding. Also
-included in the distribution is a set of C++ wrapper functions.
-
-/*
-*      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-*      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-*      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-*      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-*      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-*      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-*      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-*      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-*      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-*      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-*      POSSIBILITY OF SUCH DAMAGE.
-*/
-
-==========================================================================
-
 The file src/xbt/snprintf.c contains this license text:
 
 /*
index 24a2358..e464132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,7 @@ SimGrid (3.10) NOT RELEASED; urgency=low
 
  PLATFORM:
  * Handle units for values (10ms, 10kiloflops, 10Bps, …)
+ * Remove rule based routing (no more pcre dependency)
 -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.9) stable; urgency=low
diff --git a/INSTALL b/INSTALL
index 4953f2b..bb8150c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -45,7 +45,6 @@ SimGrid archives do not have any firm dependencies.
 
 If you want to compile, you must have installed perl and cmake version 2.6 or
 above.
-In order to improve memory management you should install libpcre.
 
 If you want to compile the java bindings, you have to have a java compiler, and
 the jni.h header file (available from the JDK).
index 00ea0f3..2a4e36a 100644 (file)
@@ -68,11 +68,6 @@ include(TestBigEndian)
 TEST_BIG_ENDIAN(BIGENDIAN)
 
 include(FindGraphviz)
-if(WIN32)
-  include(FindPcreWin)
-else()
-  include(FindPCRE)
-endif()
 
 set(HAVE_GTNETS 0)
 if(enable_gtnets)
index 3e9cb61..d922cc9 100644 (file)
@@ -288,7 +288,6 @@ set(SURF_SRC
   src/surf/surf_routing_full.c
   src/surf/surf_routing_generic.c
   src/surf/surf_routing_none.c
-  src/surf/surf_routing_rulebased.c
   src/surf/surf_routing_vivaldi.c
   src/surf/surfxml_parse.c
   src/surf/surfxml_parseplatf.c
@@ -703,7 +702,6 @@ set(DOC_SOURCES
 
   doc/HelloWorld/CMakeLists.txt
   doc/HelloWorld/HelloWorld.c
-  doc/HelloWorld/FindPcreWin.cmake
   doc/HelloWorld/README
 
   doc/doxygen/FAQ.doc
@@ -926,8 +924,6 @@ set(CMAKE_SOURCE_FILES
   buildtools/Cmake/Modules/FindLibunwind.cmake
   buildtools/Cmake/Modules/FindLua51Simgrid.cmake
   buildtools/Cmake/Modules/FindNS3.cmake
-  buildtools/Cmake/Modules/FindPCRE.cmake
-  buildtools/Cmake/Modules/FindPcreWin.cmake
   buildtools/Cmake/Modules/FindRngStream.cmake
   buildtools/Cmake/Modules/FindRubySimgrid.cmake
   buildtools/Cmake/Modules/FindSimGrid.cmake
@@ -971,7 +967,6 @@ set(PLATFORMS_EXAMPLES
   examples/platforms/cluster.xml
   examples/platforms/cluster_and_one_host.xml
   examples/platforms/cluster_no_backbone.xml
-  examples/platforms/cluster_routing_rulebased.xml
   examples/platforms/clusters_routing_full.xml
   examples/platforms/conf/gridpp_grid_2004.conf
   examples/platforms/conf/gridpp_grid_2004.xml
index 0c8e76f..93ace1d 100644 (file)
@@ -38,7 +38,7 @@ endif()
 
 # Compute the dependencies of SimGrid
 #####################################
-set(SIMGRID_DEP "-lm -lpcre")
+set(SIMGRID_DEP "-lm")
 
 if(pthread)
   if(${CONTEXT_THREADS})
index 081c6e0..206ab5c 100644 (file)
@@ -24,7 +24,7 @@ else()
     )
 endif()
 
-set(SIMGRID_DEP "-lws2_32 -L${PATH_PCRE_LIB} -L${PATH_PTHREAD_LIB} -lm -lpcre -lpthreadGC2")
+set(SIMGRID_DEP "-lws2_32 -L${PATH_PTHREAD_LIB} -lm -lpthreadGC2")
 
 if(ARCH_32_BITS)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32 -march=i486")
diff --git a/buildtools/Cmake/Modules/FindPCRE.cmake b/buildtools/Cmake/Modules/FindPCRE.cmake
deleted file mode 100644 (file)
index 2e46c9b..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-find_library(PATH_PCRE_LIB
-  NAMES pcre
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{LD_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES lib/ GnuWin32/lib
-  PATHS
-  /opt
-  /opt/local
-  /opt/csw
-  /sw
-  /usr)
-
-find_path(PATH_PCRE_H "pcre.h"
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{LD_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES include/ GnuWin32/include
-  PATHS
-  /opt
-  /opt/local
-  /opt/csw
-  /sw
-  /usr)
-
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-  message(STATUS "Looking for pcre.h - found")
-else()
-  message(STATUS "Looking for pcre.h - not found")
-endif()
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-  message(STATUS "Looking for lib pcre - found")
-else()
-  message(STATUS "Looking for lib pcre - not found")
-endif()
-
-if(PATH_PCRE_LIB AND PATH_PCRE_H)
-  string(REGEX REPLACE "/libpcre.*[.]${LIB_EXE}$" "" PATH_PCRE_LIB "${PATH_PCRE_LIB}")
-  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-  include_directories(${PATH_PCRE_H})
-  link_directories(${PATH_PCRE_LIB})
-else()
-  message(FATAL_ERROR "Please install the libpcre3-dev package or equivalent before using SimGrid.")
-endif()
-
-set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
-
-mark_as_advanced(PATH_PCRE_H)
-mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
diff --git a/buildtools/Cmake/Modules/FindPcreWin.cmake b/buildtools/Cmake/Modules/FindPcreWin.cmake
deleted file mode 100644 (file)
index 8f454fb..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# LIB libpcre.dll
-find_library(PATH_PCRE_LIB
-  NAMES pcre
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES bin/ GnuWin32/bin
-  )
-
-find_path(PATH_PCRE_H "pcre.h"
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES include/ GnuWin32/include
-  )
-
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-  message(STATUS "Looking for pcre.h - found")
-else()
-  message(STATUS "Looking for pcre.h - not found")
-endif()
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-  message(STATUS "Looking for lib pcre - found")
-else()
-  message(STATUS "Looking for lib pcre - not found")
-endif()
-
-if(PATH_PCRE_LIB AND PATH_PCRE_H)
-  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-  string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
-  if(NOT operation)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
-  endif()
-else()
-  message(FATAL_ERROR "Please install the pcre package before using SimGrid.")
-endif()
-
-set(PCRE_LIBRARY_PATH $ENV{PCRE_LIBRARY_PATH})
-
-mark_as_advanced(PATH_PCRE_H)
-mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
index da7aeb4..1323865 100644 (file)
@@ -163,8 +163,6 @@ Section "Examples" ExamplesSection
        file @CMAKE_HOME_DIRECTORY@\examples\msg\masterslave\deployment_masterslave_forwarder.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\msg_platform.xml\r
        file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\CMakeLists.txt\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
-\r
 \r
        # create shortcuts in the start menu programs directory\r
        CreateDirectory "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\"\r
@@ -172,16 +170,6 @@ Section "Examples" ExamplesSection
        createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\MasterSlave project.lnk"  "$INSTDIR\examples\MasterSlave"\r
        \r
 SectionEnd\r
-Section "Pcre library" PCRESection     \r
-       # install pcre library\r
-       CreateDirectory $INSTDIR\GnuWin32\r
-       setOutPath $INSTDIR\GnuWin32\r
-       file /r "@PCRE_LIBRARY_PATH@\lib"\r
-       file /r "@PCRE_LIBRARY_PATH@\include"\r
-       file /r "@PCRE_LIBRARY_PATH@\bin"\r
-       file /r "@PCRE_LIBRARY_PATH@\man"\r
-       file /r "@PCRE_LIBRARY_PATH@\share"\r
-SectionEnd\r
 \r
 Section "Java Bindings" JavaSection    \r
        # install java library and examples\r
@@ -230,7 +218,6 @@ Section "SMPI Library" SMPISection
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\hostfile\r
        file @CMAKE_HOME_DIRECTORY@\examples\msg\small_platform_with_routers.xml\r
        file @CMAKE_HOME_DIRECTORY@\examples\smpi\CMakeLists.txt\r
-       file @CMAKE_HOME_DIRECTORY@\doc\HelloWorld\FindPcreWin.cmake\r
 SectionEnd\r
 \r
 # default section start\r
@@ -250,8 +237,6 @@ section
        # Set Variables\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_ROOT $INSTDIR\r
        WriteRegExpandStr ${env_hkcu} SIMGRID_VERSION @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\r
-       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH $INSTDIR\GnuWin32\r
-       WriteRegExpandStr ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION "8.21"\r
        \r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "Version" "@SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        WriteRegStr HKCU "SOFTWARE\SimGrid" "InstallPath" "$INSTDIR"\r
@@ -268,25 +253,22 @@ LangString DESC_LibSection                ${LANG_ENGLISH} "Install Simgrid libraries with ass
 LangString DESC_BinSection             ${LANG_ENGLISH} "Install some useful tools for Simgrid."\r
 LangString DESC_DocSection             ${LANG_ENGLISH} "Generated (doxygen) documentation."\r
 LangString DESC_ExamplesSection ${LANG_ENGLISH} "Simgrid's HelloWorld example and some classical platforms."\r
-LangString DESC_PCRESection    ${LANG_ENGLISH} "Install the PCRE and PCREPOSIX libraries for SimGrid."\r
 LangString DESC_JAVASection    ${LANG_ENGLISH} "Install the Java binding and examples."\r
 LangString DESC_SMPISection    ${LANG_ENGLISH} "Install the SMPI library, headers, and examples."\r
 \r
 \r
-LangString DESC_LibSection             ${LANG_FRENCH}  "Installer les librairies Simgrid et leurs Entêtes."\r
+LangString DESC_LibSection             ${LANG_FRENCH}  "Installer les librairies Simgrid et leurs Enttes."\r
 LangString DESC_BinSection             ${LANG_FRENCH}  "Installer les outils optionnels."\r
 LangString DESC_DocSection             ${LANG_FRENCH}  "Installer la documentation."\r
 LangString DESC_ExamplesSection ${LANG_FRENCH}         "Installer un exemple 'HelloWorld' et des fichiers de plate-formes types."\r
-LangString DESC_PCRESection    ${LANG_FRENCH}  "Installer les librairies PCRE et PCREPOSIX for SimGrid."\r
 LangString DESC_JAVASection    ${LANG_FRENCH}  "Installer la librairie Simgrid-java et les exemples."\r
-LangString DESC_SMPISection    ${LANG_FRENCH}  "Installer la librairie SMPI, ses en-têtes, et ses exemples."\r
+LangString DESC_SMPISection    ${LANG_FRENCH}  "Installer la librairie SMPI, ses en-ttes, et ses exemples."\r
 \r
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN\r
   !insertmacro MUI_DESCRIPTION_TEXT ${LibSection}              $(DESC_LibSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${BinSection}              $(DESC_BinSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${DocSection}              $(DESC_DocSection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${ExamplesSection}         $(DESC_ExamplesSection)\r
-  !insertmacro MUI_DESCRIPTION_TEXT ${PCRESection}             $(DESC_PCRESection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${JAVASection}             $(DESC_JAVASection)\r
   !insertmacro MUI_DESCRIPTION_TEXT ${SMPISection}             $(DESC_SMPISection)\r
 !insertmacro MUI_FUNCTION_DESCRIPTION_END\r
@@ -394,14 +376,9 @@ section "Uninstall"
        RMDir  /r "$INSTDIR\examples"\r
        RMDir  /r "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@"\r
        \r
-       # delete PCRE\r
-       RMDir   /r "$INSTDIR\GnuWin32"\r
-       \r
        # Delete variable\r
        DeleteRegValue ${env_hkcu} SIMGRID_ROOT\r
        DeleteRegValue ${env_hkcu} SIMGRID_VERSION\r
-       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_PATH\r
-       DeleteRegValue ${env_hkcu} SIMGRID_PCRE_LIBRARY_VERSION\r
     DeleteRegKey HKCU "SOFTWARE\SimGrid"\r
     \r
     # delete JAVA-bindings\r
index 7cdb9c5..5fd8a96 100644 (file)
@@ -11,7 +11,6 @@ sudo aptitude -y install git
 sudo aptitude -y install git-core
 sudo aptitude -y install graphviz-dev graphviz
 sudo aptitude -y install liblua5.1-dev lua5.1
-sudo aptitude -y install libpcre3-dev
 sudo aptitude -y install libunwind7-dev
 sudo aptitude -y install make
 sudo aptitude -y install valgrind
index 8088a64..35f9832 100644 (file)
@@ -14,7 +14,6 @@ sudo yum -y -q install wget
 sudo yum -y -q install perl
 sudo yum -y -q install graphviz-dev graphviz
 sudo yum -y -q install f2c
-sudo yum -y -q install pcre-devel pcre-static
 sudo yum -y -q install git-core
 sudo yum -y -q install ruby ruby-devel
 sudo yum -y -q install libunwind libunwind-devel
index c14e3ea..9fc740a 100644 (file)
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 #sudo port install wget
-#sudo port install pcre
 #sudo port install gcc46
 #sudo port install graphviz-devel
 #sudo port install lua
index 534e321..cfd59e3 100644 (file)
@@ -10,7 +10,6 @@ sudo apt-get -y -qq install gcc
 sudo apt-get -y -qq install git-core
 sudo apt-get -y -qq install graphviz-dev graphviz
 sudo apt-get -y -qq install liblua5.1-dev lua5.1
-sudo apt-get -y -qq install libpcre3-dev
 sudo apt-get -y -qq install libunwind7-dev
 sudo apt-get -y -qq install make
 sudo apt-get -y -qq install perl
index 99c2b58..02d42f5 100644 (file)
@@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 2.8)
 ### Need to set rc ccompiler before enable language
 if(WIN32)
   SET(CMAKE_RC_COMPILER "windres")
-  set(LIBRARIES_DEP simgrid pcre ws2_32 pthread)
+  set(LIBRARIES_DEP simgrid ws2_32 pthread)
 else()
-  set(LIBRARIES_DEP simgrid pcre pthread)
+  set(LIBRARIES_DEP simgrid pthread)
 endif()
 
 project(MY_SIMGRID_PROJECT C)
@@ -17,7 +17,6 @@ set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE)
 ###############################
 # Test the build dependencies #
 ###############################
-include(FindPcreWin.cmake)
 message(STATUS "Looking for lib Simgrid")
 if("$ENV{SIMGRID_ROOT}" STREQUAL "")
   message(STATUS "Looking for lib Simgrid - Not found")
diff --git a/doc/HelloWorld/FindPcreWin.cmake b/doc/HelloWorld/FindPcreWin.cmake
deleted file mode 100644 (file)
index d4628ea..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# LIB libpcre.dll
-find_library(PATH_PCRE_LIB
-  NAMES pcre
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES bin/ GnuWin32/bin
-  )
-
-find_path(PATH_PCRE_H "pcre.h"
-  HINTS
-  $ENV{SIMGRID_PCRE_LIBRARY_PATH}
-  $ENV{PCRE_LIBRARY_PATH}
-  PATH_SUFFIXES include/ GnuWin32/include
-  )
-
-message(STATUS "Looking for pcre.h")
-if(PATH_PCRE_H)
-  message(STATUS "Looking for pcre.h - found")
-else()
-  message(STATUS "Looking for pcre.h - not found")
-endif()
-
-message(STATUS "Looking for lib pcre")
-if(PATH_PCRE_LIB)
-  message(STATUS "Looking for lib pcre - found")
-else()
-  message(STATUS "Looking for lib pcre - not found")
-endif()
-
-if(PATH_PCRE_LIB AND PATH_PCRE_H)
-  string(REGEX REPLACE "/pcre.h" "" PATH_PCRE_H "${PATH_PCRE_H}")
-  string(REGEX MATCH "-I${PATH_PCRE_H} " operation "${CMAKE_C_FLAGS}")
-  if(NOT operation)
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-I${PATH_PCRE_H} ")
-  endif()
-  string(REGEX REPLACE "/libpcre.dll" "" PATH_PCRE_LIB  "${PATH_PCRE_LIB}")
-  link_directories(${PATH_PCRE_LIB})
-else()
-  message(FATAL_ERROR "Please install the pcre package before using SimGrid.")
-endif()
-
-mark_as_advanced(PATH_PCRE_H)
-mark_as_advanced(PATH_PCRE_LIB)
\ No newline at end of file
index 43b88f7..67b0585 100644 (file)
@@ -15,9 +15,6 @@ This is a very simple example to explain how to compile with simgrid.
        The example source file.
 - CMakeLists.txt
        It allows to configure the project.
-- FindPCRE.cmake
-       Simgrid needs pcre regular expression.
-       This finds and links to the pcre library (Normally included into Simgrid directory "GnuWin32").
 - README
        This explaination.
        
@@ -27,7 +24,7 @@ This is a very simple example to explain how to compile with simgrid.
 - Edit CMakeLists.txt :
        * In the Targets section add those two lines:
                add_executable(TARGET_NAME SOURCES)
-               target_link_libraries(TARGET_NAME simgrid pcre
+               target_link_libraries(TARGET_NAME simgrid) 
        * It creates a target called 'TARGET_NAME.exe' with the sources 'SOURCES'.
 - To initialize your project, you'll need to run 'cmake -G"Unix Makefiles" <path_to_HelloWorld_project>.'
 - To build you project, run "cmake ." 
index e48785c..8867f4c 100644 (file)
@@ -86,8 +86,7 @@ have access to your architecture to build SimGrid on it.
 
 SimGrid only uses very standard tools: 
   @li C compiler, C++ compiler, make and friends.
-  @li perl (but you may try to go without it) and libpcre (but we are
-      working on removing this dependency)
+  @li perl (but you may try to go without it)
   @li We use cmake to configure our compilation 
       (<a href="http://www.cmake.org/cmake/resources/software.html">download page</a>).
       You need cmake version 2.8 or higher. You may want to use ccmake
@@ -442,8 +441,6 @@ compiling a source file. There are:
 \verbatim
 - HelloWorld.c         The example source file.
 - CMakeLists.txt       It allows to configure the project.
-- FindPCRE.cmake       This finds and links to the pcre library (Normally included
-                        into Simgrid directory "GnuWin32").
 - README               This explaination.
 \endverbatim
 
@@ -469,8 +466,8 @@ create a target with the same name of the source.
 ################
 #It creates a target called 'TARGET_NAME.exe' with the sources 'SOURCES'
 add_executable(TARGET_NAME SOURCES)
-#Links TARGET_NAME with simgrid and pcre
-target_link_libraries(TARGET_NAME simgrid pcre)
+#Links TARGET_NAME with simgrid
+target_link_libraries(TARGET_NAME simgrid)
 \endverbatim
 \li To initialize and build your project, you'll need to run
 \verbatim
index 2ce0e11..c52f5f8 100644 (file)
@@ -195,7 +195,6 @@ Configuration of package `simgrid' on arch (=4):
        Compile Lua    :
        Compile Smpi   :        OFF
        Compile Static :        OFF
-       Compile pcre   :        AUTO
 
        Maintainer mode:        OFF
        Supernovae mode:        OFF
@@ -205,7 +204,7 @@ Configuration of package `simgrid' on arch (=4):
        Latency bound  :        OFF
         Graphviz mode  :
 
-       Simgrid dependencies:   -lm -lpcre -lpthread -lns3 -lrt
+       Simgrid dependencies:   -lm -lpthread -lns3 -lrt
        Smpi dependencies   :
 
        INSTALL_PREFIX:         /usr/local
index cb0ee89..c2bd2e7 100644 (file)
@@ -1,24 +1,23 @@
-<?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 <config id="General">
-       <prop id="network/coordinates" value="yes"></prop>
+       <prop id="network/coordinates" value="yes"/>
 </config>
 
-<AS  id="AS0"  routing="Vivaldi">
+<AS id="AS0" routing="Vivaldi">
    
-   <AS  id="AS1_dc1"  routing="RuleBased">
+   <AS id="AS1_dc1" routing="Full">
    <!--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.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_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+           <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.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_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+           <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.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
-           <link   id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>
+            <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"/>
+           <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">
                     <router id="gw_dc1_maindist"/>
                     <router id="gw_dc1_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4" />
+                    <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4"/>
                     <!-- links -->
-                    <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"/>  
+                    <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>
             </AS>
            
             <!-- internal routes between clusters -->
-            <ASroute src="AS1_cb(.*)" dst="AS1_cb(.*)" gw_src="cb$1src-AS1_cb$1src_router.dc1.acloud.com" gw_dst="cb$1dst-AS1_cb$1dst_router.dc1.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc1_cb$1src"/>
-                    <link_ctn id="link_dc1_cb$1dst"/>
+            <ASroute src="AS1_cb1" dst="AS1_cb1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb1"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb3"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="AS1_cb3" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb3"/>
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb3" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb2" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS1_cb(.*)" dst="gw_AS1_(.*)" gw_src="cb$1src-AS1_cb$1src_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc1_cb$1src"/>
+            <ASroute src="AS1_cb1" dst="gw_AS1_dc1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="gw_AS1_dc1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="gw_AS1_dc1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute> 
-            <ASroute dst="AS1_cb(.*)" src="gw_AS1_(.*)" gw_dst="cb$1dst-AS1_cb$1dst_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc1_cb$1dst"/>
+            <ASroute dst="AS1_cb1" src="gw_AS1_dc1" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute dst="AS1_cb3" src="gw_AS1_dc1" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute dst="AS1_cb2" src="gw_AS1_dc1" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute>    
    </AS>
 
-   <AS  id="AS2_dc2"  routing="RuleBased">
+   <AS id="AS2_dc2" routing="Full">
    <!--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.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_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
-            <link   id="link_dc2_cb6" bandwidth="1.25GBps" latency="100us"/>
+            <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"/>
+            <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">
                     <router id="gw_dc2_maindist"/>
                     <router id="gw_dc2_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4" />
+                    <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4"/>
                     <!-- links -->
-                    <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"/>  
+                    <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>
             </AS>
             
             <!-- internal routes between clusters -->
-            <ASroute src="AS2_cb(.*)" dst="AS2_cb(.*)" gw_src="cb$1src-AS2_cb$1src_router.dc2.acloud.com" gw_dst="cb$1dst-AS2_cb$1dst_router.dc2.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc2_cb$1src"/>
-                    <link_ctn id="link_dc2_cb$1dst"/>
+            <ASroute src="AS2_cb6" dst="AS2_cb6" gw_src="cb6-AS2_cb6_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb6"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb4"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="AS2_cb4" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb4"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb6" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb4" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb5" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb6" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb5" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb6" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb5" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb3" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb6" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb4" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb5" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb3" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb1" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS2_cb(.*)" dst="gw_AS2_(.*)" gw_src="cb$1src-AS2_cb$1src_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc2_cb$1src"/>
+            <ASroute src="AS2_cb6" dst="gw_AS2_dc2" gw_src="cb6-AS2_cb6_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="gw_AS2_dc2" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="gw_AS2_dc2" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="gw_AS2_dc2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="gw_AS2_dc2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="gw_AS2_dc2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute> 
-            <ASroute dst="AS2_cb(.*)" src="gw_AS2_(.*)" gw_dst="cb$1dst-AS2_cb$1dst_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc2_cb$1dst"/>
+            <ASroute dst="AS2_cb6" src="gw_AS2_dc2" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute dst="AS2_cb4" src="gw_AS2_dc2" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute dst="AS2_cb5" src="gw_AS2_dc2" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute dst="AS2_cb2" src="gw_AS2_dc2" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute dst="AS2_cb3" src="gw_AS2_dc2" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute dst="AS2_cb1" src="gw_AS2_dc2" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute> 
    </AS>
 
-   <AS  id="AS3_dc3"  routing="RuleBased">  
+   <AS id="AS3_dc3" routing="Full">  
    <!--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.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_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb3" prefix="cb3-" suffix=".dc3.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
-            <link   id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
+            <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"/>
+            <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">
                     <router id="gw_dc3_maindist"/>
                     <router id="gw_dc3_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6" />
+                    <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"/></route>
                     <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom"><link_ctn id="dc3_maindist_entranceroom"/></route>
             </AS>
             
             <!-- internal routes between clusters -->
-            <ASroute src="AS3_cb(.*)" dst="AS3_cb(.*)" gw_src="cb$1src-AS3_cb$1src_router.dc3.acloud.com" gw_dst="cb$1dst-AS3_cb$1dst_router.dc3.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc3_cb$1src"/>
-                    <link_ctn id="link_dc3_cb$1dst"/>
+            <ASroute src="AS3_cb3" dst="AS3_cb3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb3"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb2"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="AS3_cb2" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb2"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb2" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb1" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb2" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb1" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb4" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS3_cb(.*)" dst="gw_AS3_(.*)" gw_src="cb$1src-AS3_cb$1src_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc3_cb$1src"/>
+            <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="gw_AS3_dc3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="gw_AS3_dc3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="gw_AS3_dc3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>
-            <ASroute dst="AS3_cb(.*)" src="gw_AS3_(.*)" gw_dst="cb$1dst-AS3_cb$1dst_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc3_cb$1dst"/>
+            <ASroute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>  
    </AS>
               
index dae9a57..81e4582 100644 (file)
@@ -1,7 +1,6 @@
-<?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-       <AS id="AS_grid5000" routing="Floyd" >
+       <AS id="AS_grid5000" routing="Floyd">
                <AS id="AS_interne" routing="Floyd">
                        <router id="lille"/>
                        <router id="paris"/>
                        <router id="toulouse"/>
                        <router id="sophia"/>
 
-                       <link id="Lille_Paris"        bandwidth="1.25GBps" latency="100us"/>
-                       <link id="Paris_Nancy"        bandwidth="1.25GBps" latency="100us"/>
-                       <link id="Paris_Rennes"       bandwidth="1.25GBps" latency="100us"/>
-                       <link id="Paris_Lyon"         bandwidth="1.25GBps" latency="100us"/>
-                       <link id="Bordeaux_Lyon"      bandwidth="1.25GBps" latency="100us"/>
-                       <link id="Lyon_Grenoble"      bandwidth="1.25GBps" latency="100us"/>
-                       <link id="Lyon_Marseille"     bandwidth="1.25GBps" latency="100us"/>
-                       <link id="Marseille_Sophia"   bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Lille_Paris" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Paris_Nancy" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Paris_Rennes" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Paris_Lyon" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Bordeaux_Lyon" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Lyon_Grenoble" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Lyon_Marseille" bandwidth="1.25GBps" latency="100us"/>
+                       <link id="Marseille_Sophia" bandwidth="1.25GBps" latency="100us"/>
                        <link id="Marseille_Toulouse" bandwidth="1.25GBps" latency="100us"/>
 
-               <route src="lille"     dst="paris"     ><link_ctn id="Lille_Paris"/></route>
-               <route src="paris"     dst="nancy"     ><link_ctn id="Paris_Nancy"/></route>
-               <route src="paris"     dst="rennes"    ><link_ctn id="Paris_Rennes"/></route>
-               <route src="paris"     dst="lyon"      ><link_ctn id="Paris_Lyon"/></route>
-               <route src="bordeaux"  dst="lyon"      ><link_ctn id="Bordeaux_Lyon"/></route>
-               <route src="lyon"      dst="grenoble"  ><link_ctn id="Lyon_Grenoble"/></route>
-               <route src="lyon"      dst="marseille" ><link_ctn id="Lyon_Marseille"/></route>
-               <route src="marseille" dst="sophia"    ><link_ctn id="Marseille_Sophia"/></route>
-               <route src="marseille" dst="toulouse"  ><link_ctn id="Marseille_Toulouse"/></route>
+               <route src="lille" dst="paris"><link_ctn id="Lille_Paris"/></route>
+               <route src="paris" dst="nancy"><link_ctn id="Paris_Nancy"/></route>
+               <route src="paris" dst="rennes"><link_ctn id="Paris_Rennes"/></route>
+               <route src="paris" dst="lyon"><link_ctn id="Paris_Lyon"/></route>
+               <route src="bordeaux" dst="lyon"><link_ctn id="Bordeaux_Lyon"/></route>
+               <route src="lyon" dst="grenoble"><link_ctn id="Lyon_Grenoble"/></route>
+               <route src="lyon" dst="marseille"><link_ctn id="Lyon_Marseille"/></route>
+               <route src="marseille" dst="sophia"><link_ctn id="Marseille_Sophia"/></route>
+               <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=".bordeaux.grid5000.fr"
-                               radical="1-51" power="5.2297Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_bordeplage" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
-                               radical="1-93" power="8.8925Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_bordereau" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
-                               radical="1-10" power="13.357Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_borderline" bandwidth="1.25GBps" latency="100us"/>
+               <AS id="AS_bordeaux" routing="Full">
+                       <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr" radical="1-51" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_bordeplage" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr" radical="1-93" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_bordereau" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr" radical="1-10" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_borderline" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_bordeaux" routing="Full">
                                <router id="gw_bordeaux"/>
                        </AS>
-                       <link   id="link_gw_bordeaux" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_bordeaux" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_bordereau" dst="AS_bordereau" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordereau"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="AS_bordereau" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordeplage"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="AS_bordeplage" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordeplage"/>
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_bordereau" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_bordeplage" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_borderline" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="gw_AS_bordeaux" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="gw_AS_bordeaux" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_bordeaux" dst="AS_bordereau" gw_src="gw_bordeaux" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="gw_AS_bordeaux" dst="AS_bordeplage" gw_src="gw_bordeaux" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="gw_AS_bordeaux" dst="AS_borderline" gw_src="gw_bordeaux" gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_grenoble" routing="RuleBased" >
-                       <cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr"
-                               radical="1-12" power="23.681Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_adonis" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_edel" prefix="edel-" suffix=".grenoble.grid5000.fr"
-                               radical="1-72" power="23.492Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_edel" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr"
-                               radical="1-34" power="21.175Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_genepi" bandwidth="1.25GBps" latency="100us"/>
+               <AS id="AS_grenoble" routing="Full">
+                       <cluster id="AS_adonis" prefix="adonis-" suffix=".grenoble.grid5000.fr" radical="1-12" power="23.681Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_adonis" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_edel" prefix="edel-" suffix=".grenoble.grid5000.fr" radical="1-72" power="23.492Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_edel" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_genepi" prefix="genepi-" suffix=".grenoble.grid5000.fr" radical="1-34" power="21.175Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_genepi" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_grenoble" routing="Full">
                                <router id="gw_grenoble"/>
                        </AS>
-                       <link   id="link_gw_grenoble" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_grenoble" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_adonis" dst="AS_adonis" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_adonis"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="AS_adonis" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_genepi"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="AS_genepi" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_genepi"/>
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_adonis" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_genepi" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_edel" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="edel-AS_edel_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_adonis" dst="gw_AS_grenoble" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="gw_AS_grenoble" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="gw_AS_grenoble" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_grenoble" dst="AS_adonis" gw_src="gw_grenoble" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="gw_AS_grenoble" dst="AS_genepi" gw_src="gw_grenoble" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="gw_AS_grenoble" dst="AS_edel" gw_src="gw_grenoble" gw_dst="edel-AS_edel_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_lille" routing="RuleBased" >
-                       <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-                               radical="1-26" power="8.9618Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_chicon" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_chimint" prefix="chimint-" suffix=".lille.grid5000.fr"
-                               radical="1-20" power="23.531Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_chimint" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
-                               radical="1-46" power="22.27Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_chinqchint" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr"
-                               radical="1-8" power="24.473Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_chirloute" bandwidth="1.25GBps" latency="100us"/>
+               <AS id="AS_lille" routing="Full">
+                       <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr" radical="1-26" power="8.9618Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chicon" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_chimint" prefix="chimint-" suffix=".lille.grid5000.fr" radical="1-20" power="23.531Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chimint" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr" radical="1-46" power="22.27Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chinqchint" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_chirloute" prefix="chirloute-" suffix=".lille.grid5000.fr" radical="1-8" power="24.473Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_chirloute" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_lille" routing="Full">
                                <router id="gw_lille"/>
                        </AS>
-                       <link   id="link_gw_lille" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_lille" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_chinqchint" dst="AS_chinqchint" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chinqchint"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="AS_chinqchint" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chirloute"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="AS_chirloute" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chirloute"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chinqchint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chirloute" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chimint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chinqchint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chirloute" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chimint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chicon" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chicon-AS_chicon_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_chinqchint" dst="gw_AS_lille" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="gw_AS_lille" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="gw_AS_lille" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="gw_AS_lille" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_lille" dst="AS_chinqchint" gw_src="gw_lille" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chirloute" gw_src="gw_lille" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chimint" gw_src="gw_lille" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chicon" gw_src="gw_lille" gw_dst="chicon-AS_chicon_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_lyon" routing="RuleBased" >
-                       <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-                               radical="1-56" power="4.7233Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_capricorne" bandwidth="1.25GBps" latency="100us"/>
+               <AS id="AS_lyon" routing="Full">
+                       <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr" radical="1-56" power="4.7233Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_capricorne" bandwidth="1.25GBps" latency="100us"/>
 
-                       <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-                               radical="1-79" power="5.6693Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_sagittaire" bandwidth="1.25GBps" latency="100us"/>
+                       <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr" radical="1-79" power="5.6693Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_sagittaire" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_lyon" routing="Full">
                                <router id="gw_lyon"/>
                        </AS>
-                       <link   id="link_gw_lyon" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_lyon" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_sagittaire" dst="AS_sagittaire" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_sagittaire"/>
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="AS_sagittaire" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_capricorne"/>
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="AS_capricorne" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_capricorne"/>
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_sagittaire" dst="gw_AS_lyon" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="gw_lyon" symmetrical="NO">
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="gw_AS_lyon" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="gw_lyon" symmetrical="NO">
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_lyon" dst="AS_sagittaire" gw_src="gw_lyon" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="gw_AS_lyon" dst="AS_capricorne" gw_src="gw_lyon" gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_nancy" routing="RuleBased" >
-                       <AS id="AS_graphene" routing="RuleBased" >
-                               <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="1-39" power="16.673Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="40-74" power="16.673Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="75-104" power="16.673Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="105-144" power="16.673Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
+               <AS id="AS_nancy" routing="Full">
+                       <AS id="AS_graphene" routing="Full">
+                               <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="1-39" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="40-74" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="75-104" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="105-144" power="16.673Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
 
                                <AS id="gw_AS_graphene" routing="Full">
                                        <router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
                                </AS>
                                <link id="switch-graphene" bandwidth="1.25GBps" latency="500us"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgraphene4" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                               </ASroute><ASroute src="AS_sgraphene2" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene2" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene1" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene1_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="graphene-AS_graphene_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgraphene4" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene2" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_graphene" bandwidth="1.25GBps" latency="100us"/>
-
-                       <AS id="AS_griffon" routing="RuleBased" >
-                               <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="1-29,58-60" power="20.678Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="30-57" power="20.678Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="61-92" power="20.678Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
+                               </AS>
+                       <link id="link_graphene" bandwidth="1.25GBps" latency="100us"/>
+
+                       <AS id="AS_griffon" routing="Full">
+                               <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="1-29,58-60" power="20.678Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="30-57" power="20.678Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="61-92" power="20.678Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
 
                                <AS id="gw_AS_griffon" routing="Full">
                                        <router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
                                </AS>
                                <link id="switch-griffon" bandwidth="1.25GBps" latency="500us"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgriffon1" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                               </ASroute><ASroute src="AS_sgriffon2" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon2" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon3" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon3_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgriffon1" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon2" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_griffon" bandwidth="1.25GBps" latency="100us"/>
+                               </AS>
+                       <link id="link_griffon" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_nancy" routing="Full">
                                <router id="gw_nancy"/>
                        </AS>
-                       <link   id="link_gw_nancy" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_nancy" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_graphene" dst="AS_graphene" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_graphene"/>
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="AS_graphene" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_griffon"/>
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="AS_griffon" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_griffon"/>
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_graphene" dst="gw_AS_nancy" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="gw_nancy" symmetrical="NO">
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="gw_AS_nancy" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="gw_nancy" symmetrical="NO">
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_nancy" dst="AS_graphene" gw_src="gw_nancy" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="gw_AS_nancy" dst="AS_griffon" gw_src="gw_nancy" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_orsay" routing="RuleBased" >
-                       <AS id="AS_gdx" routing="RuleBased" >
-                               <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="1-36" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="37-72" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="73-108" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="109-144" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="145-180" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="193-216" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="217-252" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="253-288" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="289-310" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="181-186" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                               <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="187-192" power="4.7153Gf" bw="125MBps" lat="100us"
-                                       bb_bw="1.25GBps" bb_lat="100us"></cluster>
+               <AS id="AS_orsay" routing="Full">
+                       <AS id="AS_gdx" routing="Full">
+                               <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="1-36" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="37-72" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="73-108" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="109-144" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="145-180" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="193-216" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="217-252" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="253-288" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="289-310" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="181-186" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                               <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="187-192" power="4.7153Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
 
                                <AS id="gw_AS_gdx" routing="Full">
                                        <router id="gdx-AS_gdx_router.orsay.grid5000.fr"/>
                                </AS>
                                <link id="switch-gdx" bandwidth="1.25GBps" latency="500us"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+                               <ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear04.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="gdx-AS_gdx_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+                               <ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_gdx" bandwidth="1.25GBps" latency="100us"/>
+                               </AS>
+                       <link id="link_gdx" bandwidth="1.25GBps" latency="100us"/>
 
-                       <cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr"
-                               radical="1-30" power="4.7144Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_netgdx" bandwidth="1.25GBps" latency="100us"/>
+                       <cluster id="AS_netgdx" prefix="netgdx-" suffix=".orsay.grid5000.fr" radical="1-30" power="4.7144Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_netgdx" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_orsay" routing="Full">
                                <router id="gw_orsay"/>
                        </AS>
-                       <link   id="link_gw_orsay" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_orsay" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_netgdx" dst="AS_netgdx" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_netgdx"/>
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="AS_netgdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_gdx"/>
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="AS_gdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_gdx"/>
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_netgdx" dst="gw_AS_orsay" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="gw_orsay" symmetrical="NO">
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="gw_AS_orsay" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gw_orsay" symmetrical="NO">
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_orsay" dst="AS_netgdx" gw_src="gw_orsay" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="gw_AS_orsay" dst="AS_gdx" gw_src="gw_orsay" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_rennes" routing="RuleBased" >
-                       <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
-                               radical="1-64" power="21.496Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_paradent" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-                               radical="1-33" power="12.91Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_paramount" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
-                               radical="1-25" power="30.13Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_parapide" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr"
-                               radical="1-40" power="27.391Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_parapluie" bandwidth="1.25GBps" latency="100us"/>
+               <AS id="AS_rennes" routing="Full">
+                       <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr" radical="1-64" power="21.496Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_paradent" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr" radical="1-33" power="12.91Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_paramount" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr" radical="1-25" power="30.13Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_parapide" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_parapluie" prefix="parapluie-" suffix=".rennes.grid5000.fr" radical="1-40" power="27.391Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_parapluie" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_rennes" routing="Full">
                                <router id="gw_rennes"/>
                        </AS>
-                       <link   id="link_gw_rennes" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_rennes" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_paradent" dst="AS_paradent" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paradent"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="AS_paradent" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapluie"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="AS_parapluie" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapluie"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_paradent" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_parapluie" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_parapide" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_paradent" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_parapluie" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_parapide" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_paramount" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_paradent" dst="gw_AS_rennes" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="gw_AS_rennes" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="gw_AS_rennes" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="gw_AS_rennes" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_rennes" dst="AS_paradent" gw_src="gw_rennes" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_parapluie" gw_src="gw_rennes" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_parapide" gw_src="gw_rennes" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_paramount" gw_src="gw_rennes" gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_sophia" routing="RuleBased" >
-                       <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-                               radical="1-56" power="7.7318Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_helios" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
-                               radical="1-50" power="8.9388Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_sol" bandwidth="1.25GBps" latency="100us"/>
-
-                       <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
-                               radical="1-45" power="23.53Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_suno" bandwidth="1.25GBps" latency="100us"/>
+               <AS id="AS_sophia" routing="Full">
+                       <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr" radical="1-56" power="7.7318Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_helios" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr" radical="1-50" power="8.9388Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_sol" bandwidth="1.25GBps" latency="100us"/>
+
+                       <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr" radical="1-45" power="23.53Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_suno" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_sophia" routing="Full">
                                <router id="gw_sophia"/>
                        </AS>
-                       <link   id="link_gw_sophia" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_sophia" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_sol" dst="AS_sol" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_sol"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="AS_sol" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_helios"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="AS_helios" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_helios"/>
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_sol" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_helios" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_suno" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="suno-AS_suno_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_sol" dst="gw_AS_sophia" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="gw_AS_sophia" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="gw_AS_sophia" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_sophia" dst="AS_sol" gw_src="gw_sophia" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="gw_AS_sophia" dst="AS_helios" gw_src="gw_sophia" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="gw_AS_sophia" dst="AS_suno" gw_src="gw_sophia" gw_dst="suno-AS_suno_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_toulouse" routing="RuleBased" >
-                       <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-                               radical="1-80" power="9.5674Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_pastel" bandwidth="1.25GBps" latency="100us"/>
+               <AS id="AS_toulouse" routing="Full">
+                       <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr" radical="1-80" power="9.5674Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_pastel" bandwidth="1.25GBps" latency="100us"/>
 
-                       <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-                               radical="1-52" power="5.1143Gf" bw="125MBps" lat="100us"
-                               bb_bw="1.25GBps" bb_lat="100us"></cluster>
-                       <link   id="link_violette" bandwidth="1.25GBps" latency="100us"/>
+                       <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr" radical="1-52" power="5.1143Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+                       <link id="link_violette" bandwidth="1.25GBps" latency="100us"/>
 
                        <AS id="gw_AS_toulouse" routing="Full">
                                <router id="gw_toulouse"/>
                        </AS>
-                       <link   id="link_gw_toulouse" bandwidth="1.25GBps" latency="100us"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_toulouse" bandwidth="1.25GBps" latency="100us"/>
+
+                       <ASroute src="AS_pastel" dst="AS_pastel" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_pastel"/>
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="AS_pastel" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_violette"/>
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="AS_violette" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="violette-AS_violette_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_violette"/>
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_pastel" dst="gw_AS_toulouse" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="gw_toulouse" symmetrical="NO">
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="gw_AS_toulouse" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="gw_toulouse" symmetrical="NO">
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_toulouse" dst="AS_pastel" gw_src="gw_toulouse" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="gw_AS_toulouse" dst="AS_violette" gw_src="gw_toulouse" gw_dst="violette-AS_violette_router.toulouse.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
                </AS>
index cb0ee89..c2bd2e7 100644 (file)
@@ -1,24 +1,23 @@
-<?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 <config id="General">
-       <prop id="network/coordinates" value="yes"></prop>
+       <prop id="network/coordinates" value="yes"/>
 </config>
 
-<AS  id="AS0"  routing="Vivaldi">
+<AS id="AS0" routing="Vivaldi">
    
-   <AS  id="AS1_dc1"  routing="RuleBased">
+   <AS id="AS1_dc1" routing="Full">
    <!--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.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_cb1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+           <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.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_cb2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+           <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.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
-           <link   id="link_dc1_cb3" bandwidth="1.25GBps" latency="100us"/>
+            <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"/>
+           <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">
                     <router id="gw_dc1_maindist"/>
                     <router id="gw_dc1_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4" />
+                    <router id="router_AS1_dc1" coordinates="25.5 9.4 1.4"/>
                     <!-- links -->
-                    <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"/>  
+                    <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>
             </AS>
            
             <!-- internal routes between clusters -->
-            <ASroute src="AS1_cb(.*)" dst="AS1_cb(.*)" gw_src="cb$1src-AS1_cb$1src_router.dc1.acloud.com" gw_dst="cb$1dst-AS1_cb$1dst_router.dc1.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc1_cb$1src"/>
-                    <link_ctn id="link_dc1_cb$1dst"/>
+            <ASroute src="AS1_cb1" dst="AS1_cb1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb1"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="AS1_cb1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb3"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="AS1_cb3" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb3"/>
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb3" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="AS1_cb2" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc1_cb2"/>
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS1_cb(.*)" dst="gw_AS1_(.*)" gw_src="cb$1src-AS1_cb$1src_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc1_cb$1src"/>
+            <ASroute src="AS1_cb1" dst="gw_AS1_dc1" gw_src="cb1-AS1_cb1_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute src="AS1_cb3" dst="gw_AS1_dc1" gw_src="cb3-AS1_cb3_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute src="AS1_cb2" dst="gw_AS1_dc1" gw_src="cb2-AS1_cb2_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute> 
-            <ASroute dst="AS1_cb(.*)" src="gw_AS1_(.*)" gw_dst="cb$1dst-AS1_cb$1dst_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc1_cb$1dst"/>
+            <ASroute dst="AS1_cb1" src="gw_AS1_dc1" gw_dst="cb1-AS1_cb1_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb1"/>
+            </ASroute><ASroute dst="AS1_cb3" src="gw_AS1_dc1" gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb3"/>
+            </ASroute><ASroute dst="AS1_cb2" src="gw_AS1_dc1" gw_dst="cb2-AS1_cb2_router.dc1.acloud.com" gw_src="gw_dc1_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc1_cb2"/>
             </ASroute>    
    </AS>
 
-   <AS  id="AS2_dc2"  routing="RuleBased">
+   <AS id="AS2_dc2" routing="Full">
    <!--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.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_cb1" prefix="cb1-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb2" prefix="cb2-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb3" prefix="cb3-" suffix=".dc2.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb4" prefix="cb4-" suffix=".dc2.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb5" prefix="cb5-" suffix=".dc2.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
-            <link   id="link_dc2_cb6" bandwidth="1.25GBps" latency="100us"/>
+            <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"/>
+            <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">
                     <router id="gw_dc2_maindist"/>
                     <router id="gw_dc2_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4" />
+                    <router id="router_AS2_dc2" coordinates="12.8 14.4 6.4"/>
                     <!-- links -->
-                    <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"/>  
+                    <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>
             </AS>
             
             <!-- internal routes between clusters -->
-            <ASroute src="AS2_cb(.*)" dst="AS2_cb(.*)" gw_src="cb$1src-AS2_cb$1src_router.dc2.acloud.com" gw_dst="cb$1dst-AS2_cb$1dst_router.dc2.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc2_cb$1src"/>
-                    <link_ctn id="link_dc2_cb$1dst"/>
+            <ASroute src="AS2_cb6" dst="AS2_cb6" gw_src="cb6-AS2_cb6_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb6"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="AS2_cb6" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb4"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="AS2_cb4" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb4"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb6" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb4" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="AS2_cb5" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb5"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb6" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb4" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb5" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="AS2_cb2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb2"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb6" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb4" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb5" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="AS2_cb3" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb3"/>
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb6" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb4" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb5" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb3" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="AS2_cb1" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc2_cb1"/>
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS2_cb(.*)" dst="gw_AS2_(.*)" gw_src="cb$1src-AS2_cb$1src_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc2_cb$1src"/>
+            <ASroute src="AS2_cb6" dst="gw_AS2_dc2" gw_src="cb6-AS2_cb6_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute src="AS2_cb4" dst="gw_AS2_dc2" gw_src="cb4-AS2_cb4_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute src="AS2_cb5" dst="gw_AS2_dc2" gw_src="cb5-AS2_cb5_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute src="AS2_cb2" dst="gw_AS2_dc2" gw_src="cb2-AS2_cb2_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute src="AS2_cb3" dst="gw_AS2_dc2" gw_src="cb3-AS2_cb3_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute src="AS2_cb1" dst="gw_AS2_dc2" gw_src="cb1-AS2_cb1_router.dc2.acloud.com" gw_dst="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute> 
-            <ASroute dst="AS2_cb(.*)" src="gw_AS2_(.*)" gw_dst="cb$1dst-AS2_cb$1dst_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc2_cb$1dst"/>
+            <ASroute dst="AS2_cb6" src="gw_AS2_dc2" gw_dst="cb6-AS2_cb6_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb6"/>
+            </ASroute><ASroute dst="AS2_cb4" src="gw_AS2_dc2" gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb4"/>
+            </ASroute><ASroute dst="AS2_cb5" src="gw_AS2_dc2" gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb5"/>
+            </ASroute><ASroute dst="AS2_cb2" src="gw_AS2_dc2" gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb2"/>
+            </ASroute><ASroute dst="AS2_cb3" src="gw_AS2_dc2" gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb3"/>
+            </ASroute><ASroute dst="AS2_cb1" src="gw_AS2_dc2" gw_dst="cb1-AS2_cb1_router.dc2.acloud.com" gw_src="gw_dc2_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc2_cb1"/>
             </ASroute> 
    </AS>
 
-   <AS  id="AS3_dc3"  routing="RuleBased">  
+   <AS id="AS3_dc3" routing="Full">  
    <!--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.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_cb1" prefix="cb1-" suffix=".dc3.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb2" prefix="cb2-" suffix=".dc3.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.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_cb3" prefix="cb3-" suffix=".dc3.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+            <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.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"></cluster>
-            <link   id="link_dc3_cb4" bandwidth="1.25GBps" latency="100us"/>
+            <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"/>
+            <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">
                     <router id="gw_dc3_maindist"/>
                     <router id="gw_dc3_entranceroom"/>
                     <!-- ISP end point, entering the cloud, so it has coordinates -->
-                    <router id="router_AS3_dc3" coordinates="6.0 5.7 6.6" />
+                    <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"/></route>
                     <route src="gw_dc3_maindist" dst="gw_dc3_entranceroom"><link_ctn id="dc3_maindist_entranceroom"/></route>
             </AS>
             
             <!-- internal routes between clusters -->
-            <ASroute src="AS3_cb(.*)" dst="AS3_cb(.*)" gw_src="cb$1src-AS3_cb$1src_router.dc3.acloud.com" gw_dst="cb$1dst-AS3_cb$1dst_router.dc3.acloud.com" symmetrical="YES">
-                    <link_ctn id="link_dc3_cb$1src"/>
-                    <link_ctn id="link_dc3_cb$1dst"/>
+            <ASroute src="AS3_cb3" dst="AS3_cb3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb3"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="AS3_cb3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb2"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="AS3_cb2" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb2"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb2" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="AS3_cb1" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb1"/>
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb2" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb1" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="AS3_cb4" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com" symmetrical="YES">
+                    <link_ctn id="link_dc3_cb4"/>
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>
             <!-- clusters to exit AS -->
-            <ASroute src="AS3_cb(.*)" dst="gw_AS3_(.*)" gw_src="cb$1src-AS3_cb$1src_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc3_cb$1src"/>
+            <ASroute src="AS3_cb3" dst="gw_AS3_dc3" gw_src="cb3-AS3_cb3_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute src="AS3_cb2" dst="gw_AS3_dc3" gw_src="cb2-AS3_cb2_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute src="AS3_cb1" dst="gw_AS3_dc3" gw_src="cb1-AS3_cb1_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute src="AS3_cb4" dst="gw_AS3_dc3" gw_src="cb4-AS3_cb4_router.dc3.acloud.com" gw_dst="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>
-            <ASroute dst="AS3_cb(.*)" src="gw_AS3_(.*)" gw_dst="cb$1dst-AS3_cb$1dst_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
-                    <link_ctn id="link_dc3_cb$1dst"/>
+            <ASroute dst="AS3_cb3" src="gw_AS3_dc3" gw_dst="cb3-AS3_cb3_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb3"/>
+            </ASroute><ASroute dst="AS3_cb2" src="gw_AS3_dc3" gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb2"/>
+            </ASroute><ASroute dst="AS3_cb1" src="gw_AS3_dc3" gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb1"/>
+            </ASroute><ASroute dst="AS3_cb4" src="gw_AS3_dc3" gw_dst="cb4-AS3_cb4_router.dc3.acloud.com" gw_src="gw_dc3_horizdist" symmetrical="NO">
+                    <link_ctn id="link_dc3_cb4"/>
             </ASroute>  
    </AS>
               
diff --git a/examples/platforms/cluster_routing_rulebased.xml b/examples/platforms/cluster_routing_rulebased.xml
deleted file mode 100644 (file)
index a1feaa0..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
-<AS id="AS_orsay" routing="RuleBased">
-
-       <cluster id="AS_gdx-switch15" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="181-186" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch18" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="145-162" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch17" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="163-180" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>       
-       <cluster id="AS_gdx-switch05" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="91-108" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch03" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="109-126" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch02" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="127-144" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch08" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="55-72" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch06" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="73-90" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch09" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="37-54" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch12" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="19-36" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-       <cluster id="AS_gdx-switch11" prefix="gdx-" suffix=".orsay.grid5000.fr"
-       radical="1-18" power="3.388Gf" bw="125MBps" lat="17.8us"
-       bb_bw="125MBps" bb_lat="17.8us"/>
-
-       <AS id="AS_network" routing="Floyd" >
-       <link id="gdx_main" bandwidth="125MBps" latency="17.8us"/>
-       </AS>
-       
-       <ASroute src="AS_(.*)"    dst="AS_(.*)"
-         gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-         gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
-               <link_ctn id="gdx_main"/>
-       </ASroute>
-
-</AS>
-</platform>
index 86f7d24..009a8e1 100644 (file)
@@ -1,21 +1,20 @@
-<?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 <config id="General">
-    <prop id="network/coordinates" value="yes"></prop>
+    <prop id="network/coordinates" value="yes"/>
 </config>
 
-<AS  id="AS0"  routing="Vivaldi">
-    <AS  id="dataCenter1"  routing="RuleBased">
+<AS id="AS0" routing="Vivaldi">
+    <AS id="dataCenter1" routing="Full">
       
     <!-- 3 cabinets, no zone dist area, 1 horiz dist area, no multi-homing, telecom and operation rooms omitted because not a part of the production platform  -->
     <!-- cabinets -->
-    <cluster id="cabinet1" 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="cabinet2" 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="cabinet3" 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"/>
+    <cluster id="cabinet1" prefix="cb1-" suffix=".dc1.acloud.com" radical="1-40" power="5.2297Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+    <link id="link_dc1_cb1" bandwidth="1.25GBps" latency="100us"/>
+    <cluster id="cabinet2" prefix="cb2-" suffix=".dc1.acloud.com" radical="1-50" power="8.8925Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+    <link id="link_dc1_cb2" bandwidth="1.25GBps" latency="100us"/>
+    <cluster id="cabinet3" prefix="cb3-" suffix=".dc1.acloud.com" radical="1-30" power="13.357Gf" bw="125MBps" lat="100us" bb_bw="1.25GBps" bb_lat="100us"/>
+    <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_dataCenter1" routing="Floyd">
         <router id="gw_dc1_entranceroom"/>
                     
         <!-- ISP end point, entering the cloud, so it has coordinates -->
-        <router id="router_dataCenter1" coordinates="25.5 9.4 1.4" />
+        <router id="router_dataCenter1" coordinates="25.5 9.4 1.4"/>
                     
         <!-- links -->
-        <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"/> 
+        <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>
     </AS>
            
     <!-- internal routes between cabinets -->
-    <ASroute src="cabinet(.*)" dst="cabinet(.*)" gw_src="cb$1src-cabinet$1src_router.dc1.acloud.com" gw_dst="cb$1dst-cabinet$1dst_router.dc1.acloud.com" symmetrical="YES">
-        <link_ctn id="link_dc1_cb$1src"/>
-        <link_ctn id="link_dc1_cb$1dst"/>
+    <ASroute src="cabinet3" dst="cabinet3" gw_src="cb3-cabinet3_router.dc1.acloud.com" gw_dst="cb3-cabinet3_router.dc1.acloud.com" symmetrical="YES">
+        <link_ctn id="link_dc1_cb3"/>
+        <link_ctn id="link_dc1_cb3"/>
+    </ASroute><ASroute src="cabinet2" dst="cabinet3" gw_src="cb2-cabinet2_router.dc1.acloud.com" gw_dst="cb3-cabinet3_router.dc1.acloud.com" symmetrical="YES">
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb3"/>
+    </ASroute><ASroute src="cabinet2" dst="cabinet2" gw_src="cb2-cabinet2_router.dc1.acloud.com" gw_dst="cb2-cabinet2_router.dc1.acloud.com" symmetrical="YES">
+        <link_ctn id="link_dc1_cb2"/>
+        <link_ctn id="link_dc1_cb2"/>
+    </ASroute><ASroute src="cabinet1" dst="cabinet3" gw_src="cb1-cabinet1_router.dc1.acloud.com" gw_dst="cb3-cabinet3_router.dc1.acloud.com" symmetrical="YES">
+        <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb3"/>
+    </ASroute><ASroute src="cabinet1" dst="cabinet2" gw_src="cb1-cabinet1_router.dc1.acloud.com" gw_dst="cb2-cabinet2_router.dc1.acloud.com" symmetrical="YES">
+        <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb2"/>
+    </ASroute><ASroute src="cabinet1" dst="cabinet1" gw_src="cb1-cabinet1_router.dc1.acloud.com" gw_dst="cb1-cabinet1_router.dc1.acloud.com" symmetrical="YES">
+        <link_ctn id="link_dc1_cb1"/>
+        <link_ctn id="link_dc1_cb1"/>
     </ASroute>
     <!-- cabinets to exit AS -->
-    <ASroute src="cabinet(.*)" dst="gw_AS1_(.*)" gw_src="cb$1src-cabinet$1src_router.dc1.acloud.com" gw_dst="gw_dc1_horizdist" symmetrical="NO">
-        <link_ctn id="link_dc1_cb$1src"/>
-    </ASroute> 
-    <ASroute src="gw_AS1_(.*)" dst="cabinet(.*)" gw_src="gw_dc1_horizdist" gw_dst="cb$1dst-cabinet$1dst_router.dc1.acloud.com" symmetrical="NO">
-        <link_ctn id="link_dc1_cb$1dst"/>
-    </ASroute>    
-   </AS>
+    </AS>
 
 </AS>
 </platform>
index 9d20e6c..6e5df8f 100644 (file)
@@ -1,7 +1,6 @@
-<?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
-       <AS id="AS_grid5000" routing="Floyd" >
+       <AS id="AS_grid5000" routing="Floyd">
                <AS id="AS_interne" routing="Floyd">
                        <router id="lille"/>
                        <router id="paris"/>
                        <router id="toulouse"/>
                        <router id="sophia"/>
 
-                       <link id="Lille_Paris"        bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Paris_Nancy"        bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Paris_Rennes"       bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Paris_Lyon"         bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Bordeaux_Lyon"      bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Lyon_Grenoble"      bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Lyon_Marseille"     bandwidth="1.25E9" latency="1.0E-4"/>
-                       <link id="Marseille_Sophia"   bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Lille_Paris" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Paris_Nancy" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Paris_Rennes" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Paris_Lyon" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Bordeaux_Lyon" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Lyon_Grenoble" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Lyon_Marseille" bandwidth="1.25E9" latency="1.0E-4"/>
+                       <link id="Marseille_Sophia" bandwidth="1.25E9" latency="1.0E-4"/>
                        <link id="Marseille_Toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
 
-               <route src="lille"     dst="paris"     ><link_ctn id="Lille_Paris"/></route>
-               <route src="paris"     dst="nancy"     ><link_ctn id="Paris_Nancy"/></route>
-               <route src="paris"     dst="rennes"    ><link_ctn id="Paris_Rennes"/></route>
-               <route src="paris"     dst="lyon"      ><link_ctn id="Paris_Lyon"/></route>
-               <route src="bordeaux"  dst="lyon"      ><link_ctn id="Bordeaux_Lyon"/></route>
-               <route src="lyon"      dst="grenoble"  ><link_ctn id="Lyon_Grenoble"/></route>
-               <route src="lyon"      dst="marseille" ><link_ctn id="Lyon_Marseille"/></route>
-               <route src="marseille" dst="sophia"    ><link_ctn id="Marseille_Sophia"/></route>
-               <route src="marseille" dst="toulouse"  ><link_ctn id="Marseille_Toulouse"/></route>
+               <route src="lille" dst="paris"><link_ctn id="Lille_Paris"/></route>
+               <route src="paris" dst="nancy"><link_ctn id="Paris_Nancy"/></route>
+               <route src="paris" dst="rennes"><link_ctn id="Paris_Rennes"/></route>
+               <route src="paris" dst="lyon"><link_ctn id="Paris_Lyon"/></route>
+               <route src="bordeaux" dst="lyon"><link_ctn id="Bordeaux_Lyon"/></route>
+               <route src="lyon" dst="grenoble"><link_ctn id="Lyon_Grenoble"/></route>
+               <route src="lyon" dst="marseille"><link_ctn id="Lyon_Marseille"/></route>
+               <route src="marseille" dst="sophia"><link_ctn id="Marseille_Sophia"/></route>
+               <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=".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=".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=".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"/>
+               <AS id="AS_bordeaux" routing="Full">
+                       <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"/>
+                       <link id="link_bordeplage" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_bordereau" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_borderline" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_bordeaux" routing="Full">
                                <router id="gw_bordeaux"/>
                        </AS>
-                       <link   id="link_gw_bordeaux" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_bordeaux" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_bordereau" dst="AS_bordereau" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordereau"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="AS_bordereau" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordeplage"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="AS_bordeplage" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_bordeplage"/>
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_bordereau" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_bordeplage" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="AS_borderline" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_borderline"/>
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.bordeaux.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_bordereau" dst="gw_AS_bordeaux" gw_src="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="AS_bordeplage" dst="gw_AS_bordeaux" gw_src="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="AS_borderline" dst="gw_AS_bordeaux" gw_src="borderline-AS_borderline_router.bordeaux.grid5000.fr" gw_dst="gw_bordeaux" symmetrical="NO">
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.bordeaux.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_bordeaux" dst="AS_bordereau" gw_src="gw_bordeaux" gw_dst="bordereau-AS_bordereau_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_bordereau"/>
+                       </ASroute><ASroute src="gw_AS_bordeaux" dst="AS_bordeplage" gw_src="gw_bordeaux" gw_dst="bordeplage-AS_bordeplage_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_bordeplage"/>
+                       </ASroute><ASroute src="gw_AS_bordeaux" dst="AS_borderline" gw_src="gw_bordeaux" gw_dst="borderline-AS_borderline_router.bordeaux.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_borderline"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_grenoble" routing="RuleBased" >
-                       <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=".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=".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"/>
+               <AS id="AS_grenoble" routing="Full">
+                       <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"/>
+                       <link id="link_adonis" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_edel" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_genepi" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_grenoble" routing="Full">
                                <router id="gw_grenoble"/>
                        </AS>
-                       <link   id="link_gw_grenoble" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_grenoble" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_adonis" dst="AS_adonis" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_adonis"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="AS_adonis" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_genepi"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="AS_genepi" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_genepi"/>
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_adonis" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_genepi" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="AS_edel" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="edel-AS_edel_router.grenoble.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_edel"/>
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.grenoble.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_adonis" dst="gw_AS_grenoble" gw_src="adonis-AS_adonis_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="AS_genepi" dst="gw_AS_grenoble" gw_src="genepi-AS_genepi_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="AS_edel" dst="gw_AS_grenoble" gw_src="edel-AS_edel_router.grenoble.grid5000.fr" gw_dst="gw_grenoble" symmetrical="NO">
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.grenoble.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_grenoble" dst="AS_adonis" gw_src="gw_grenoble" gw_dst="adonis-AS_adonis_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_adonis"/>
+                       </ASroute><ASroute src="gw_AS_grenoble" dst="AS_genepi" gw_src="gw_grenoble" gw_dst="genepi-AS_genepi_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_genepi"/>
+                       </ASroute><ASroute src="gw_AS_grenoble" dst="AS_edel" gw_src="gw_grenoble" gw_dst="edel-AS_edel_router.grenoble.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_edel"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_lille" routing="RuleBased" >
-                       <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_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="AS_lille" routing="Full">
+                       <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"/>
+                       <link id="link_chicon" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <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"/>
+                       <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"/>
+                       <link id="link_chirloute" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_lille" routing="Full">
                                <router id="gw_lille"/>
                        </AS>
-                       <link   id="link_gw_lille" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_lille" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_chinqchint" dst="AS_chinqchint" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chinqchint"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="AS_chinqchint" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chirloute"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="AS_chirloute" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chirloute"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chinqchint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chirloute" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="AS_chimint" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chimint"/>
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chinqchint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chirloute" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chimint" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="AS_chicon" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="chicon-AS_chicon_router.lille.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_chicon"/>
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lille.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_chinqchint" dst="gw_AS_lille" gw_src="chinqchint-AS_chinqchint_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="AS_chirloute" dst="gw_AS_lille" gw_src="chirloute-AS_chirloute_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="AS_chimint" dst="gw_AS_lille" gw_src="chimint-AS_chimint_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="AS_chicon" dst="gw_AS_lille" gw_src="chicon-AS_chicon_router.lille.grid5000.fr" gw_dst="gw_lille" symmetrical="NO">
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.lille.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_lille" dst="AS_chinqchint" gw_src="gw_lille" gw_dst="chinqchint-AS_chinqchint_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chinqchint"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chirloute" gw_src="gw_lille" gw_dst="chirloute-AS_chirloute_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chirloute"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chimint" gw_src="gw_lille" gw_dst="chimint-AS_chimint_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chimint"/>
+                       </ASroute><ASroute src="gw_AS_lille" dst="AS_chicon" gw_src="gw_lille" gw_dst="chicon-AS_chicon_router.lille.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_chicon"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_lyon" routing="RuleBased" >
-                       <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"/>
+               <AS id="AS_lyon" routing="Full">
+                       <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"/>
+                       <link id="link_capricorne" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <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"/>
+                       <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"/>
+                       <link id="link_sagittaire" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_lyon" routing="Full">
                                <router id="gw_lyon"/>
                        </AS>
-                       <link   id="link_gw_lyon" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_lyon" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_sagittaire" dst="AS_sagittaire" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_sagittaire"/>
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="AS_sagittaire" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_capricorne"/>
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="AS_capricorne" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_capricorne"/>
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.lyon.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_sagittaire" dst="gw_AS_lyon" gw_src="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" gw_dst="gw_lyon" symmetrical="NO">
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="AS_capricorne" dst="gw_AS_lyon" gw_src="capricorne-AS_capricorne_router.lyon.grid5000.fr" gw_dst="gw_lyon" symmetrical="NO">
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.lyon.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_lyon" dst="AS_sagittaire" gw_src="gw_lyon" gw_dst="sagittaire-AS_sagittaire_router.lyon.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_sagittaire"/>
+                       </ASroute><ASroute src="gw_AS_lyon" dst="AS_capricorne" gw_src="gw_lyon" gw_dst="capricorne-AS_capricorne_router.lyon.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_capricorne"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_nancy" routing="RuleBased" >
-                       <AS id="AS_graphene" routing="RuleBased" >
-                               <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="1-39" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="40-74" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="75-104" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr"
-                                       radical="105-144" power="16.673E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+               <AS id="AS_nancy" routing="Full">
+                       <AS id="AS_graphene" routing="Full">
+                               <cluster id="AS_sgraphene1" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="1-39" power="16.673E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_sgraphene2" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="40-74" power="16.673E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_sgraphene3" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="75-104" power="16.673E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_sgraphene4" prefix="graphene-" suffix=".nancy.grid5000.fr" radical="105-144" power="16.673E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
 
                                <AS id="gw_AS_graphene" routing="Full">
                                        <router id="graphene-AS_graphene_router.nancy.grid5000.fr"/>
                                </AS>
                                <link id="switch-graphene" bandwidth="1250000000" latency="5E-4"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgraphene4" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="graphene-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                               </ASroute><ASroute src="AS_sgraphene2" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene2" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene4" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene4_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene2" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene3" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene3_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="AS_sgraphene1" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_sgraphene1_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="graphene-AS_graphene_router.nancy.grid5000.fr"
-                                gw_dst="graphene-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgraphene4" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene4_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene2" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene2_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene3" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene3_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-graphene"/>
+                               </ASroute><ASroute src="AS_sgraphene1" dst="gw_AS_graphene" gw_src="graphene-AS_sgraphene1_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-graphene"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <AS id="AS_griffon" routing="RuleBased" >
-                               <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="1-29,58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-                                       radical="61-92" power="20.678E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+                               </AS>
+                       <link id="link_graphene" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <AS id="AS_griffon" routing="Full">
+                               <cluster id="AS_sgriffon1" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="1-29,58-60" power="20.678E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_sgriffon2" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="30-57" power="20.678E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_sgriffon3" prefix="griffon-" suffix=".nancy.grid5000.fr" radical="61-92" power="20.678E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
 
                                <AS id="gw_AS_griffon" routing="Full">
                                        <router id="griffon-AS_griffon_router.nancy.grid5000.fr"/>
                                </AS>
                                <link id="switch-griffon" bandwidth="1250000000" latency="5E-4"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgriffon1" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="griffon-AS_$1src_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                               </ASroute><ASroute src="AS_sgriffon2" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon2" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon1" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon1_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon2" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon2_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="AS_sgriffon3" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_sgriffon3_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="griffon-AS_griffon_router.nancy.grid5000.fr"
-                                gw_dst="griffon-AS_$1dst_router.nancy.grid5000.fr">
+                               <ASroute src="AS_sgriffon1" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon1_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon2" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon2_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
+                                       <link_ctn id="switch-griffon"/>
+                               </ASroute><ASroute src="AS_sgriffon3" dst="gw_AS_griffon" gw_src="griffon-AS_sgriffon3_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr">
                                        <link_ctn id="switch-griffon"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
+                               </AS>
+                       <link id="link_griffon" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_nancy" routing="Full">
                                <router id="gw_nancy"/>
                        </AS>
-                       <link   id="link_gw_nancy" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_nancy" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_graphene" dst="AS_graphene" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_graphene"/>
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="AS_graphene" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_griffon"/>
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="AS_griffon" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_griffon"/>
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.nancy.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_graphene" dst="gw_AS_nancy" gw_src="graphene-AS_graphene_router.nancy.grid5000.fr" gw_dst="gw_nancy" symmetrical="NO">
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="AS_griffon" dst="gw_AS_nancy" gw_src="griffon-AS_griffon_router.nancy.grid5000.fr" gw_dst="gw_nancy" symmetrical="NO">
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.nancy.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_nancy" dst="AS_graphene" gw_src="gw_nancy" gw_dst="graphene-AS_graphene_router.nancy.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_graphene"/>
+                       </ASroute><ASroute src="gw_AS_nancy" dst="AS_griffon" gw_src="gw_nancy" gw_dst="griffon-AS_griffon_router.nancy.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_griffon"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_orsay" routing="RuleBased" >
-                       <AS id="AS_gdx" routing="RuleBased" >
-                               <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="1-36" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="37-72" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="73-108" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="109-144" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="145-180" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="193-216" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="217-252" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="253-288" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="289-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="181-186" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
-                               <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr"
-                                       radical="187-192" power="4.7153E9" bw="1.25E8" lat="1.0E-4"
-                                       bb_bw="1.25E9" bb_lat="1.0E-4"></cluster>
+               <AS id="AS_orsay" routing="Full">
+                       <AS id="AS_gdx" routing="Full">
+                               <cluster id="AS_netgear01.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="1-36" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_netgear02.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="37-72" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_netgear03.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="73-108" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_netgear04.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="109-144" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_netgear05.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="145-180" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_netgear06.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="193-216" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_netgear07.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="217-252" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_netgear08.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="253-288" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_procurve-bmc-09.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="289-310" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_switch14.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="181-186" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
+                               <cluster id="AS_switch15.orsay.grid5000.fr" prefix="gdx-" suffix=".orsay.grid5000.fr" radical="187-192" power="4.7153E9" bw="1.25E8" lat="1.0E-4" bb_bw="1.25E9" bb_lat="1.0E-4"/>
 
                                <AS id="gw_AS_gdx" routing="Full">
                                        <router id="gdx-AS_gdx_router.orsay.grid5000.fr"/>
                                </AS>
                                <link id="switch-gdx" bandwidth="1250000000" latency="5E-4"/>
 
-                               <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+                               <ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
-                               </ASroute>
-                               <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                                gw_src="gdx-AS_$1src_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_procurve-bmc-09.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear06.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear08.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch14.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear05.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear03.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear07.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear01.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_switch15.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear02.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="AS_netgear04.orsay.grid5000.fr" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
                                </ASroute>
-                               <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                                gw_src="gdx-AS_gdx_router.orsay.grid5000.fr"
-                                gw_dst="gdx-AS_$1dst_router.orsay.grid5000.fr">
+                               <ASroute src="AS_procurve-bmc-09.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_procurve-bmc-09.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear06.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear06.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear08.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear08.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch14.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch14.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear05.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear05.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear03.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear03.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear07.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear07.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear01.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear01.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_switch15.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_switch15.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear02.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear02.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
+                                       <link_ctn id="switch-gdx"/>
+                               </ASroute><ASroute src="AS_netgear04.orsay.grid5000.fr" dst="gw_AS_gdx" gw_src="gdx-AS_netgear04.orsay.grid5000.fr_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr">
                                        <link_ctn id="switch-gdx"/>
                                </ASroute>
-                       </AS>
-                       <link   id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
+                               </AS>
+                       <link id="link_gdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <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"/>
+                       <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"/>
+                       <link id="link_netgdx" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_orsay" routing="Full">
                                <router id="gw_orsay"/>
                        </AS>
-                       <link   id="link_gw_orsay" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_orsay" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_netgdx" dst="AS_netgdx" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_netgdx"/>
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="AS_netgdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_gdx"/>
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="AS_gdx" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_gdx"/>
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.orsay.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_netgdx" dst="gw_AS_orsay" gw_src="netgdx-AS_netgdx_router.orsay.grid5000.fr" gw_dst="gw_orsay" symmetrical="NO">
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="AS_gdx" dst="gw_AS_orsay" gw_src="gdx-AS_gdx_router.orsay.grid5000.fr" gw_dst="gw_orsay" symmetrical="NO">
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.orsay.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_orsay" dst="AS_netgdx" gw_src="gw_orsay" gw_dst="netgdx-AS_netgdx_router.orsay.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_netgdx"/>
+                       </ASroute><ASroute src="gw_AS_orsay" dst="AS_gdx" gw_src="gw_orsay" gw_dst="gdx-AS_gdx_router.orsay.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_gdx"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_rennes" routing="RuleBased" >
-                       <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=".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=".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=".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"/>
+               <AS id="AS_rennes" routing="Full">
+                       <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"/>
+                       <link id="link_paradent" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_paramount" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_parapide" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_parapluie" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_rennes" routing="Full">
                                <router id="gw_rennes"/>
                        </AS>
-                       <link   id="link_gw_rennes" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_rennes" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_paradent" dst="AS_paradent" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paradent"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="AS_paradent" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapluie"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="AS_parapluie" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapluie"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_paradent" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_parapluie" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="AS_parapide" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_parapide"/>
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_paradent" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_parapluie" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_parapide" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="AS_paramount" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_paramount"/>
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.rennes.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_paradent" dst="gw_AS_rennes" gw_src="paradent-AS_paradent_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="AS_parapluie" dst="gw_AS_rennes" gw_src="parapluie-AS_parapluie_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="AS_parapide" dst="gw_AS_rennes" gw_src="parapide-AS_parapide_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="AS_paramount" dst="gw_AS_rennes" gw_src="paramount-AS_paramount_router.rennes.grid5000.fr" gw_dst="gw_rennes" symmetrical="NO">
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.rennes.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_rennes" dst="AS_paradent" gw_src="gw_rennes" gw_dst="paradent-AS_paradent_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_paradent"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_parapluie" gw_src="gw_rennes" gw_dst="parapluie-AS_parapluie_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_parapluie"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_parapide" gw_src="gw_rennes" gw_dst="parapide-AS_parapide_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_parapide"/>
+                       </ASroute><ASroute src="gw_AS_rennes" dst="AS_paramount" gw_src="gw_rennes" gw_dst="paramount-AS_paramount_router.rennes.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_paramount"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_sophia" routing="RuleBased" >
-                       <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=".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=".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"/>
+               <AS id="AS_sophia" routing="Full">
+                       <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"/>
+                       <link id="link_helios" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_sol" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <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"/>
+                       <link id="link_suno" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_sophia" routing="Full">
                                <router id="gw_sophia"/>
                        </AS>
-                       <link   id="link_gw_sophia" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_sophia" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_sol" dst="AS_sol" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_sol"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="AS_sol" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_helios"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="AS_helios" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_helios"/>
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_sol" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_helios" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="AS_suno" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="suno-AS_suno_router.sophia.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_suno"/>
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.sophia.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_sol" dst="gw_AS_sophia" gw_src="sol-AS_sol_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="AS_helios" dst="gw_AS_sophia" gw_src="helios-AS_helios_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="AS_suno" dst="gw_AS_sophia" gw_src="suno-AS_suno_router.sophia.grid5000.fr" gw_dst="gw_sophia" symmetrical="NO">
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.sophia.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_sophia" dst="AS_sol" gw_src="gw_sophia" gw_dst="sol-AS_sol_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_sol"/>
+                       </ASroute><ASroute src="gw_AS_sophia" dst="AS_helios" gw_src="gw_sophia" gw_dst="helios-AS_helios_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_helios"/>
+                       </ASroute><ASroute src="gw_AS_sophia" dst="AS_suno" gw_src="gw_sophia" gw_dst="suno-AS_suno_router.sophia.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_suno"/>
                        </ASroute>
 
                </AS>
-               <AS id="AS_toulouse" routing="RuleBased" >
-                       <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"/>
+               <AS id="AS_toulouse" routing="Full">
+                       <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"/>
+                       <link id="link_pastel" bandwidth="1.25E9" latency="1.0E-4"/>
 
-                       <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"/>
+                       <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"/>
+                       <link id="link_violette" bandwidth="1.25E9" latency="1.0E-4"/>
 
                        <AS id="gw_AS_toulouse" routing="Full">
                                <router id="gw_toulouse"/>
                        </AS>
-                       <link   id="link_gw_toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
-
-                       <ASroute src="^AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-                               gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-                               symmetrical="YES">
-                                       <link_ctn id="link_$1src"/>
-                                       <link_ctn id="link_$1dst"/>
+                       <link id="link_gw_toulouse" bandwidth="1.25E9" latency="1.0E-4"/>
+
+                       <ASroute src="AS_pastel" dst="AS_pastel" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_pastel"/>
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="AS_pastel" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_violette"/>
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="AS_violette" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="violette-AS_violette_router.toulouse.grid5000.fr" symmetrical="YES">
+                                       <link_ctn id="link_violette"/>
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
-                       <ASroute src="^AS_(.*)$" dst="^gw_AS_(.*)$"
-                               gw_src="$1src-AS_$1src_router.toulouse.grid5000.fr"
-                               gw_dst="gw_$1dst"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1src"/>
+                       <ASroute src="AS_pastel" dst="gw_AS_toulouse" gw_src="pastel-AS_pastel_router.toulouse.grid5000.fr" gw_dst="gw_toulouse" symmetrical="NO">
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="AS_violette" dst="gw_AS_toulouse" gw_src="violette-AS_violette_router.toulouse.grid5000.fr" gw_dst="gw_toulouse" symmetrical="NO">
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
-                       <ASroute src="^gw_AS_(.*)$" dst="^AS_(.*)$"
-                               gw_src="gw_$1src"
-                               gw_dst="$1dst-AS_$1dst_router.toulouse.grid5000.fr"
-                               symmetrical="NO">
-                                       <link_ctn id="link_$1dst"/>
+                       <ASroute src="gw_AS_toulouse" dst="AS_pastel" gw_src="gw_toulouse" gw_dst="pastel-AS_pastel_router.toulouse.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_pastel"/>
+                       </ASroute><ASroute src="gw_AS_toulouse" dst="AS_violette" gw_src="gw_toulouse" gw_dst="violette-AS_violette_router.toulouse.grid5000.fr" symmetrical="NO">
+                                       <link_ctn id="link_violette"/>
                        </ASroute>
 
                </AS>
index f619d05..d4a8e66 100644 (file)
@@ -183,7 +183,7 @@ typedef int AT_surfxml_cluster_loopback___bw;
 #define AU_surfxml_cluster_loopback___bw NULL
 typedef int AT_surfxml_ASroute_gw___src;
 #define AU_surfxml_ASroute_gw___src NULL
-typedef enum { AU_surfxml_AS_routing, A_surfxml_AS_routing_Full,A_surfxml_AS_routing_Floyd,A_surfxml_AS_routing_Dijkstra,A_surfxml_AS_routing_DijkstraCache,A_surfxml_AS_routing_None,A_surfxml_AS_routing_RuleBased,A_surfxml_AS_routing_Vivaldi,A_surfxml_AS_routing_Cluster } AT_surfxml_AS_routing;
+typedef enum { AU_surfxml_AS_routing, A_surfxml_AS_routing_Full,A_surfxml_AS_routing_Floyd,A_surfxml_AS_routing_Dijkstra,A_surfxml_AS_routing_DijkstraCache,A_surfxml_AS_routing_None,A_surfxml_AS_routing_Vivaldi,A_surfxml_AS_routing_Cluster } AT_surfxml_AS_routing;
 typedef int AT_surfxml_link_bandwidth;
 #define AU_surfxml_link_bandwidth NULL
 typedef int AT_surfxml_cluster_id;
index 777a664..581b06d 100644 (file)
@@ -320,7 +320,6 @@ int console_AS_open(lua_State *L) {
  else if(!strcmp(mode,"Floyd")) mode_int = A_surfxml_AS_routing_Floyd;
  else if(!strcmp(mode,"Dijkstra")) mode_int = A_surfxml_AS_routing_Dijkstra;
  else if(!strcmp(mode,"DijkstraCache")) mode_int = A_surfxml_AS_routing_DijkstraCache;
- else if(!strcmp(mode,"RuleBased")) mode_int = A_surfxml_AS_routing_RuleBased;
  else if(!strcmp(mode,"Vivaldi")) mode_int = A_surfxml_AS_routing_Vivaldi;
  else if(!strcmp(mode,"Cluster")) mode_int = A_surfxml_AS_routing_Cluster;
  else if(!strcmp(mode,"none")) mode_int = A_surfxml_AS_routing_None;
index ed8b8eb..9259c4a 100644 (file)
@@ -27,7 +27,7 @@
 
 <!ELEMENT AS ((prop*),(((AS|include|storage_type|storage|link|backbone|cabinet|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect|bypassASroute)*,(trace|trace_connect)*)|((include|storage_type|storage|host|gpu|cabinet|router|link|backbone|trace|trace_connect|host_link)*,(route|trace|trace_connect|bypassRoute)*)))>
 <!ATTLIST AS id CDATA #REQUIRED>
-<!ATTLIST AS routing (Full|Floyd|Dijkstra|DijkstraCache|None|RuleBased|Vivaldi|Cluster) "None">
+<!ATTLIST AS routing (Full|Floyd|Dijkstra|DijkstraCache|None|Vivaldi|Cluster) "None">
 
 <!ELEMENT storage_type (prop*)>
 <!ATTLIST storage_type id       CDATA #REQUIRED>
index eacf7fd..f8e78c5 100644 (file)
@@ -403,8 +403,8 @@ static void yy_fatal_error (yyconst char msg[]  );
        *yy_cp = '\0'; \
        (yy_c_buf_p) = yy_cp;
 
-#define YY_NUM_RULES 564
-#define YY_END_OF_BUFFER 565
+#define YY_NUM_RULES 562
+#define YY_END_OF_BUFFER 563
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -412,7 +412,7 @@ struct yy_trans_info
        flex_int32_t yy_verify;
        flex_int32_t yy_nxt;
        };
-static yyconst flex_int16_t yy_accept[3299] =
+static yyconst flex_int16_t yy_accept[3279] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -441,51 +441,51 @@ static yyconst flex_int16_t yy_accept[3299] =
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  565,  563,   15,   10,   10,   15,   15,  543,
-       10,  543,    5,    6,    5,    8,    9,    8,  559,  551,
-      552,  560,  557,  560,  558,  562,  551,  552,  562,  563,
+        0,    0,  563,  561,   15,   10,   10,   15,   15,  541,
+       10,  541,    5,    6,    5,    8,    9,    8,  557,  549,
+      550,  558,  555,  558,  556,  560,  549,  550,  560,  561,
        22,   10,   22,   22,   22,   20,   22,   26,   10,   26,
-       26,  563,   26,  563,  563,   26,   33,   10,   33,   33,
+       26,  561,   26,  561,  561,   26,   33,   10,   33,   33,
 
        33,   31,   33,   37,   10,   37,   37,   48,   10,   48,
-       48,   48,   46,   48,   48,   48,  560,  559,   78,   10,
+       48,   48,   46,   48,   48,   48,  558,  557,   78,   10,
        78,   78,   78,   76,   78,   78,   78,   78,   78,   82,
        10,   82,  101,   10,  101,  101,  101,   99,  101,  101,
-      101,  105,   10,  105,  128,   10,  128,  128,  128,  126,
-      128,  128,  132,   10,  132,  132,  563,  132,  563,  132,
-      132,  563,  563,  132,  563,  132,  563,  132,  145,   10,
-      145,  145,  145,  143,  145,  145,  145,  145,  149,   10,
-      149,  149,  160,   10,  160,  160,  160,  158,  160,  160,
-      160,  164,   10,  164,  164,  173,   10,  173,  173,  173,
-
-      171,  173,  173,  177,   10,  177,  186,   10,  186,  186,
-      186,  184,  186,  186,  190,   10,  190,  213,   10,  213,
-      213,  213,  211,  213,  213,  213,  213,  213,  217,   10,
-      217,  563,  217,  224,   10,  224,  224,  224,  222,  224,
-      228,   10,  228,  239,   10,  239,  239,  239,  237,  239,
-      239,  239,  243,   10,  243,  290,   10,  290,  290,  290,
-      288,  290,  290,  290,  290,  290,  290,  290,  290,  294,
-       10,  294,  313,   10,  313,  313,  313,  311,  313,  313,
-      313,  313,  313,  313,  317,   10,  317,  338,   10,  338,
-      338,  338,  336,  338,  338,  338,  338,  338,  338,  338,
-
-      342,   10,  342,  351,   10,  351,  351,  351,  349,  351,
-      351,  355,   10,  355,  366,   10,  366,  366,  366,  364,
-      366,  366,  366,  370,   10,  370,  397,   10,  397,  397,
-      397,  395,  397,  397,  397,  397,  401,   10,  401,  401,
-      414,   10,  414,  414,  414,  412,  414,  414,  418,   10,
-      418,  563,  418,  435,   10,  435,  435,  435,  433,  435,
-      435,  435,  439,   10,  439,  439,  452,   10,  452,  452,
-      452,  450,  452,  452,  456,   10,  456,  465,   10,  465,
-      465,  465,  463,  465,  465,  469,   10,  469,  469,  482,
-       10,  482,  482,  482,  480,  482,  482,  482,  486,   10,
-
-      486,  486,  503,   10,  503,  503,  503,  501,  503,  503,
-      503,  503,  503,  507,   10,  507,  563,  507,  514,   10,
-      514,  514,  514,  512,  514,  518,   10,  518,  525,   10,
-      525,  525,  525,  523,  525,  529,   10,  529,  529,  538,
-       10,  538,  538,  538,  536,  538,  538,  542,   10,  542,
-       10,    0,    2,    2,    0,    4,    7,  554,  553,    0,
+      101,  105,   10,  105,  126,   10,  126,  126,  126,  124,
+      126,  126,  130,   10,  130,  130,  561,  130,  561,  130,
+      130,  561,  561,  130,  561,  130,  561,  130,  143,   10,
+      143,  143,  143,  141,  143,  143,  143,  143,  147,   10,
+      147,  147,  158,   10,  158,  158,  158,  156,  158,  158,
+      158,  162,   10,  162,  162,  171,   10,  171,  171,  171,
+
+      169,  171,  171,  175,   10,  175,  184,   10,  184,  184,
+      184,  182,  184,  184,  188,   10,  188,  211,   10,  211,
+      211,  211,  209,  211,  211,  211,  211,  211,  215,   10,
+      215,  561,  215,  222,   10,  222,  222,  222,  220,  222,
+      226,   10,  226,  237,   10,  237,  237,  237,  235,  237,
+      237,  237,  241,   10,  241,  288,   10,  288,  288,  288,
+      286,  288,  288,  288,  288,  288,  288,  288,  288,  292,
+       10,  292,  311,   10,  311,  311,  311,  309,  311,  311,
+      311,  311,  311,  311,  315,   10,  315,  336,   10,  336,
+      336,  336,  334,  336,  336,  336,  336,  336,  336,  336,
+
+      340,   10,  340,  349,   10,  349,  349,  349,  347,  349,
+      349,  353,   10,  353,  364,   10,  364,  364,  364,  362,
+      364,  364,  364,  368,   10,  368,  395,   10,  395,  395,
+      395,  393,  395,  395,  395,  395,  399,   10,  399,  399,
+      412,   10,  412,  412,  412,  410,  412,  412,  416,   10,
+      416,  561,  416,  433,   10,  433,  433,  433,  431,  433,
+      433,  433,  437,   10,  437,  437,  450,   10,  450,  450,
+      450,  448,  450,  450,  454,   10,  454,  463,   10,  463,
+      463,  463,  461,  463,  463,  467,   10,  467,  467,  480,
+       10,  480,  480,  480,  478,  480,  480,  480,  484,   10,
+
+      484,  484,  501,   10,  501,  501,  501,  499,  501,  501,
+      501,  501,  501,  505,   10,  505,  561,  505,  512,   10,
+      512,  512,  512,  510,  512,  516,   10,  516,  523,   10,
+      523,  523,  523,  521,  523,  527,   10,  527,  527,  536,
+       10,  536,  536,  536,  534,  536,  536,  540,   10,  540,
+       10,    0,    2,    2,    0,    4,    7,  552,  551,    0,
         0,    0,    0,    0,    0,    0,   21,   23,   23,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -493,281 +493,279 @@ static yyconst flex_int16_t yy_accept[3299] =
 
        49,   49,    0,    0,    0,   77,   79,   79,   79,   79,
        79,   79,   79,   79,   79,    0,  100,  102,  102,  102,
-      102,    0,  127,  129,  129,  129,    0,    0,    0,    0,
+      102,    0,  125,  127,  127,  127,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  144,  146,  146,  146,  146,
-      146,    0,  159,  161,  161,  161,  161,    0,  172,  174,
-      174,  174,    0,  185,  187,  187,  187,    0,  212,  214,
-      214,  214,  214,  214,  214,    0,    0,  223,  225,  225,
-        0,  238,  240,  240,  240,  240,    0,  289,  291,  291,
-      291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-
-      291,  291,  291,  291,    0,  312,  314,  314,  314,  314,
-      314,  314,  314,  314,    0,  337,  339,  339,  339,  339,
-      339,  339,  339,  339,    0,  350,  352,  352,  352,    0,
-      365,  367,  367,  367,  367,    0,  396,  398,  398,  398,
-      398,  398,  398,    0,  413,  415,  415,  415,  415,    0,
-        0,  434,  436,  436,  436,  436,  436,    0,  451,  453,
-      453,  453,    0,  464,  466,  466,  466,    0,  481,  483,
-      483,  483,  483,    0,  502,  504,  504,  504,  504,  504,
-      504,    0,    0,  513,  515,  515,    0,  524,  526,  526,
-        0,  537,  539,  539,  539,    0,    0,    0,    0,    0,
-
-        3,    0,    0,    0,    0,    0,    0,    0,  561,    0,
+        0,    0,    0,    0,    0,  142,  144,  144,  144,  144,
+      144,    0,  157,  159,  159,  159,  159,    0,  170,  172,
+      172,  172,    0,  183,  185,  185,  185,    0,  210,  212,
+      212,  212,  212,  212,  212,    0,    0,  221,  223,  223,
+        0,  236,  238,  238,  238,  238,    0,  287,  289,  289,
+      289,  289,  289,  289,  289,  289,  289,  289,  289,  289,
+
+      289,  289,  289,  289,    0,  310,  312,  312,  312,  312,
+      312,  312,  312,  312,    0,  335,  337,  337,  337,  337,
+      337,  337,  337,  337,    0,  348,  350,  350,  350,    0,
+      363,  365,  365,  365,  365,    0,  394,  396,  396,  396,
+      396,  396,  396,    0,  411,  413,  413,  413,  413,    0,
+        0,  432,  434,  434,  434,  434,  434,    0,  449,  451,
+      451,  451,    0,  462,  464,  464,  464,    0,  479,  481,
+      481,  481,  481,    0,  500,  502,  502,  502,  502,  502,
+      502,    0,    0,  511,  513,  513,    0,  522,  524,  524,
+        0,  535,  537,  537,  537,    0,    0,    0,    0,    0,
+
+        3,    0,    0,    0,    0,    0,    0,    0,  559,    0,
        23,    0,    0,  107,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,  106,    0,    0,    0,    0,
         0,    0,   34,    0,    0,   49,    0,    0,   49,    0,
-        0,    0,  556,   79,    0,    0,   79,   79,   79,   79,
+        0,    0,  554,   79,    0,    0,   79,   79,   79,   79,
        79,   79,    0,    0,  102,  102,  102,    0,    0,    0,
-        0,  129,    0,    0,  107,    0,    0,    0,    0,    0,
-        0,    0,    0,  106,    0,    0,    0,    0,  146,    0,
-        0,  146,  146,    0,    0,  161,    0,    0,  161,    0,
-
-        0,    0,    0,  174,    0,    0,  187,  187,    0,    0,
-      214,  214,  214,    0,    0,  214,  214,    0,    0,    0,
-        0,  225,    0,    0,  240,    0,    0,    0,    0,    0,
-        0,  291,  291,    0,    0,  291,    0,    0,  291,  291,
-      291,  291,  291,  291,  291,  291,  291,  291,    0,    0,
-        0,    0,    0,    0,  314,  314,  314,  314,  314,    0,
-        0,  339,  339,  339,    0,    0,  339,  339,  339,    0,
-        0,  352,    0,    0,    0,    0,  367,    0,    0,  367,
-        0,    0,  398,    0,    0,  398,  398,  398,    0,    0,
-      415,  415,  415,    0,    0,    0,  436,  436,  436,  436,
-
-        0,    0,  453,    0,    0,    0,    0,  466,  466,    0,
-        0,  483,  483,  483,    0,    0,  504,  504,  504,  504,
-      504,    0,    0,    0,  515,    0,    0,    0,    0,    0,
-        0,    0,    0,  539,    0,    0,    0,   14,    1,    0,
-        0,  549,    0,    0,    0,  546,  545,    0,    0,   23,
+        0,  127,    0,    0,  107,    0,    0,    0,    0,    0,
+        0,    0,    0,  106,    0,    0,    0,    0,  144,    0,
+        0,  144,  144,    0,    0,  159,    0,    0,  159,    0,
+
+        0,    0,    0,  172,    0,    0,  185,  185,    0,    0,
+      212,  212,  212,    0,    0,  212,  212,    0,    0,    0,
+        0,  223,    0,    0,  238,    0,    0,    0,    0,    0,
+        0,  289,  289,    0,    0,  289,    0,    0,  289,  289,
+      289,  289,  289,  289,  289,  289,  289,  289,    0,    0,
+        0,    0,    0,    0,  312,  312,  312,  312,  312,    0,
+        0,  337,  337,  337,    0,    0,  337,  337,  337,    0,
+        0,  350,    0,    0,    0,    0,  365,    0,    0,  365,
+        0,    0,  396,    0,    0,  396,  396,  396,    0,    0,
+      413,  413,  413,    0,    0,    0,  434,  434,  434,  434,
+
+        0,    0,  451,    0,    0,    0,    0,  464,  464,    0,
+        0,  481,  481,  481,    0,    0,  502,  502,  502,  502,
+      502,    0,    0,    0,  513,    0,    0,    0,    0,    0,
+        0,    0,    0,  537,    0,    0,    0,   14,    1,    0,
+        0,  547,    0,    0,    0,  544,  543,    0,    0,   23,
         0,    0,   25,    0,  107,    0,    0,    0,    0,    0,
-        0,    0,  218,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,  216,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,  106,    0,    0,
         0,    0,    0,    0,   34,    0,    0,   36,    0,   49,
         0,   41,   40,   49,    0,    0,    0,   51,    0,   79,
 
         0,   55,   54,    0,    0,   79,    0,    0,   79,   79,
        79,    0,    0,   81,    0,  102,  102,  102,    0,    0,
-      104,    0,    0,  109,  108,  129,    0,    0,  131,    0,
-        0,    0,    0,  219,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  146,    0,  136,  135,  14