Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
cosmetic fix: generic_set_bypassroute was being logged in generic_get_bypassroute
[simgrid.git] / src / surf / surf_routing.c
index d8f8b7c..eaa3f87 100644 (file)
@@ -1,10 +1,11 @@
-/* Copyright (c) 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2009, 2010. The SimGrid Team. 
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <float.h>
+#include <pcre.h> /* regular expresion library */
 #include "surf_private.h"
 #include "xbt/dynar.h"
 #include "xbt/str.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route,surf,"Routing part of surf");
 
-    
-////////////////////////////////////////////////////////////////////////////////
-// HERE START THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
-
-//...... DEBUG ONLY .... //
-static void print_tree(routing_component_t rc);
-static void print_global();
-static void print_AS_start(void);
-static void print_AS_end(void);
-static void print_host(void);
-static void print_link(void);
-static void print_route(void);
-static void print_ctn(void);
-static void DEBUG_exit(void);
-
-////////////////////////////////////////////////////////////////////////////////
-// HERE START THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
-
 /* Global vars */
 routing_global_t global_routing = NULL;
 routing_component_t current_routing = NULL;
@@ -50,35 +31,32 @@ static void  model_floyd_load(void);   /* load parse functions for floyd routing
 static void  model_floyd_unload(void); /* unload parse functions for floyd routing model */
 static void  model_floyd_end(void);    /* finalize the creation of floyd routing model */
 
-static void* model_dijkstra_create(void); /* create structures for dijkstra routing model */
-static void  model_dijkstra_load(void);   /* load parse functions for dijkstra routing model */
-static void  model_dijkstra_unload(void); /* unload parse functions for dijkstra routing model */
-static void  model_dijkstra_end(void);    /* finalize the creation of dijkstra routing model */
-
+static void* model_dijkstra_both_create(int cached); /* create by calling dijkstra or dijkstracache */
+static void* model_dijkstra_create(void);      /* create structures for dijkstra routing model */
 static void* model_dijkstracache_create(void); /* create structures for dijkstracache routing model */
-static void  model_dijkstracache_load(void);   /* load parse functions for dijkstracache routing model */
-static void  model_dijkstracache_unload(void); /* unload parse functions for dijkstracache routing model */
-static void  model_dijkstracache_end(void);    /* finalize the creation of dijkstracache routing model */
+static void  model_dijkstra_both_load(void);   /* load parse functions for dijkstra routing model */
+static void  model_dijkstra_both_unload(void); /* unload parse functions for dijkstra routing model */
+static void  model_dijkstra_both_end(void);    /* finalize the creation of dijkstra routing model */
+
+static void* model_rulebased_create(void); /* create structures for rulebased routing model */
+static void  model_rulebased_load(void);   /* load parse functions for rulebased routing model */
+static void  model_rulebased_unload(void); /* unload parse functions for rulebased routing model */
+static void  model_rulebased_end(void);    /* finalize the creation of rulebased routing model */
 
 static void* model_none_create(void); /* none routing model */
 static void  model_none_load(void);   /* none routing model */
 static void  model_none_unload(void); /* none routing model */
 static void  model_none_end(void);    /* none routing model */
 
-/* Table of routing models */
-// typedef enum {
-//   SURF_MODEL_FULL = 0,
-//   SURF_MODEL_FLOYD,
-//   SURF_MODEL_DIJKSTRA,
-//   SURF_MODEL_DIJKSTRACACHE,
-//   SURF_MODEL_NONE
-// } e_surf_model_type_t;
+static void routing_full_parse_Scluster(void);/*cluster bypass*/
 
+/* this lines are olny for replace use like index in the model table */
 #define SURF_MODEL_FULL           0
 #define SURF_MODEL_FLOYD          1
 #define SURF_MODEL_DIJKSTRA       2
 #define SURF_MODEL_DIJKSTRACACHE  3
-#define SURF_MODEL_NONE           4
+#define SURF_MODEL_RULEBASED      4
+#define SURF_MODEL_NONE           5
 
 /* must be finish with null and carefull if change de order */
 struct s_model_type routing_models[] =
@@ -87,15 +65,45 @@ struct s_model_type routing_models[] =
   {"Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
   model_floyd_create, model_floyd_load, model_floyd_unload, model_floyd_end },
   {"Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
-  model_dijkstra_create ,model_dijkstra_load, model_dijkstra_unload, model_dijkstra_end },
+  model_dijkstra_create ,model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end },
   {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
-  model_dijkstracache_create, model_dijkstracache_load, model_dijkstracache_unload, model_dijkstracache_end },
+  model_dijkstracache_create, model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end },
+  {"RuleBased", "Rule-Based routing data (...)",
+  model_rulebased_create, model_rulebased_load, model_rulebased_unload, model_rulebased_end },
   {"none", "No routing (usable with Constant network only)",
   model_none_create, model_none_load, model_none_unload, model_none_end },
   {NULL,NULL,NULL,NULL,NULL,NULL}};
 
-/* global parse functions */
+/* ************************************************************************** */
+/* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
+
+static void generic_set_processing_unit(routing_component_t rc, const char* name);
+static void generic_set_autonomous_system(routing_component_t rc, const char* name);
+static void generic_set_route(routing_component_t rc, const char* src, const char* dst, route_t route);
+static void generic_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route);
+static void generic_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route);
+
+/* ************************************************************************** */
+/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
+
+static xbt_dict_t generic_get_onelink_routes (void);
+static int generic_is_router (const char *name);
+static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst);
+
+/* ************************************************************************** */
+/* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */
+
+static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void* data, int order);
+static void generic_free_route(route_t route);
+static void generic_free_extended_route(route_extended_t e_route);
+static routing_component_t generic_autonomous_system_exist(routing_component_t rc, char* element);
+static routing_component_t generic_processing_units_exist(routing_component_t rc, char* element);
+static void generic_src_dst_check(routing_component_t rc, const char* src, const char* dst);
 
+/* ************************************************************************** */
+/* **************************** GLOBAL FUNCTIONS **************************** */
+  
+/* global parse functions */
 static char* src = NULL;    /* temporary store the source name of a route */
 static char* dst = NULL;    /* temporary store the destination name of a route */
 static char* gw_src = NULL; /* temporary store the gateway source name of a route */
@@ -105,17 +113,35 @@ static xbt_dynar_t link_list = NULL; /* temporary store of current list link of
 /**
  * \brief Add a "host" to the network element list
  */
-static void  parse_S_host(void) {
+static void  parse_S_host(char* host_id) {
   if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE;
-  xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_host_id),
-      "Reading a host, processing unit \"%s\" already exist",A_surfxml_host_id);
-// FIXME: checked by parser
-//   xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE,
-//       "Bad declaration of processing unit \"%s\"",A_surfxml_host_id);
-  (*(current_routing->set_processing_units))(current_routing,A_surfxml_host_id);
-  xbt_dict_set(global_routing->where_network_elements,A_surfxml_host_id,(void*)current_routing,NULL); 
+  xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,host_id),
+      "Reading a host, processing unit \"%s\" already exist",host_id);
+  xbt_assert1(current_routing->set_processing_unit,
+      "no defined method \"set_processing_unit\" in \"%s\"",current_routing->name);
+  (*(current_routing->set_processing_unit))(current_routing,host_id);
+  xbt_dict_set(global_routing->where_network_elements,host_id,(void*)current_routing,NULL);
+}
+
+/*
+ * \brief Add a host to the network element list from XML
+ */
+static void parse_S_host_XML(void)
+{
+       parse_S_host(A_surfxml_host_id);
 }
 
+/*
+ * \brief Add a host to the network element list from lua script
+ */
+static void parse_S_host_lua(char *host_id)
+{
+       parse_S_host(host_id);
+}
+/*
+ *
+ */
+
 /**
  * \brief Add a "router" to the network element list
  */
@@ -123,62 +149,109 @@ static void parse_S_router(void) {
   if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE;
   xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_router_id),
       "Reading a router, processing unit \"%s\" already exist",A_surfxml_router_id);
-// FIXME: checked by parser
-//   xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE,
-//       "Bad declaration of processing unit \"%s\"",A_surfxml_host_id);
-  (*(current_routing->set_processing_units))(current_routing,A_surfxml_router_id);
+  xbt_assert1(current_routing->set_processing_unit,
+      "no defined method \"set_processing_unit\" in \"%s\"",current_routing->name);
+  (*(current_routing->set_processing_unit))(current_routing,A_surfxml_router_id);
   xbt_dict_set(global_routing->where_network_elements,A_surfxml_router_id,(void*)current_routing,NULL); 
+  #ifdef HAVE_TRACING
+    TRACE_surf_host_declaration (A_surfxml_router_id, 0);
+  #endif
 }
 
 /**
  * \brief Set the endponints for a route
  */
-static void parse_S_route_new_and_endpoints(void) {
-  // FIXME: checked by parser
-//   xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE,
-//     "Bad declaration of route in \"%s\"",current_routing->name);
+static void parse_S_route_new_and_endpoints(char *src_id,char *dst_id) {
   if( src != NULL && dst != NULL && link_list != NULL )
-    THROW2(arg_error,0,"Route between %s to %s can not be defined",A_surfxml_route_src,A_surfxml_route_dst);
-  src = A_surfxml_route_src;
-  dst = A_surfxml_route_dst;
+    THROW2(arg_error,0,"Route between %s to %s can not be defined",src_id,dst_id);
+  src = src_id;
+  dst = dst_id;
+  xbt_assert2(strlen(src)>0||strlen(dst)>0,
+      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
   link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
 }
 
+/**
+ * \breif Set the endpoints for a route from XML
+ */
+static void parse_S_route_new_and_endpoints_XML(void)
+{
+       parse_S_route_new_and_endpoints(A_surfxml_route_src,A_surfxml_route_dst);
+}
+
+/**
+ * \breif Set the endpoints for a route from lua
+ */
+static void parse_S_route_new_and_endpoints_lua(char *id_src,char *id_dst)
+{
+       parse_S_route_new_and_endpoints(id_src,id_dst);
+}
+
 /**
  * \brief Set the endponints and gateways for a ASroute
  */
 static void parse_S_ASroute_new_and_endpoints(void) {
-// FIXME: checked by parser
-//   xbt_assert1(current_routing->hierarchy==SURF_ROUTING_RECURSIVE,
-//     "Bad declaration of ASroute in \"%s\"",current_routing->name);
   if( src != NULL && dst != NULL && link_list != NULL )
     THROW2(arg_error,0,"Route between %s to %s can not be defined",A_surfxml_ASroute_src,A_surfxml_ASroute_dst);
   src = A_surfxml_ASroute_src;
   dst = A_surfxml_ASroute_dst;
   gw_src = A_surfxml_ASroute_gw_src;
   gw_dst = A_surfxml_ASroute_gw_dst;
+  xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0,
+      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
+  link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
+}
+
+/**
+ * \brief Set the endponints for a bypassRoute
+ */
+static void parse_S_bypassRoute_new_and_endpoints(void) {
+  if( src != NULL && dst != NULL && link_list != NULL )
+    THROW2(arg_error,0,"Bypass Route between %s to %s can not be defined",A_surfxml_bypassRoute_src,A_surfxml_bypassRoute_dst);
+  src = A_surfxml_bypassRoute_src;
+  dst = A_surfxml_bypassRoute_dst;
+  gw_src = A_surfxml_bypassRoute_gw_src;
+  gw_dst = A_surfxml_bypassRoute_gw_dst;
+  xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0,
+      "Some limits are null in the route between \"%s\" and \"%s\"",src,dst);
   link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref);
 }
 
 /**
  * \brief Set a new link on the actual list of link for a route or ASroute
  */
-static void parse_E_link_c_ctn_new_elem(void) {
+static void parse_E_link_ctn_new_elem(char *link_id) {
   char *val;
-  val = xbt_strdup(A_surfxml_link_c_ctn_id);
+  val = xbt_strdup(link_id);
   xbt_dynar_push(link_list, &val);
 }
 
 /**
- * \brief Store de route by calling the set_route function of the current routing component
+ * \brief Set a new link on the actual list of link for a route or ASroute from XML
+ */
+
+static void parse_E_link_ctn_new_elem_XML(void)
+{
+       parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id);
+}
+
+/**
+ * \brief Set a new link on the actual list of link for a route or ASroute from lua
+ */
+static void parse_E_link_c_ctn_new_elem_lua(char *link_id) {
+
+       parse_E_link_ctn_new_elem(link_id);
+}
+
+/**
+ * \brief Store the route by calling the set_route function of the current routing component
  */
 static void parse_E_route_store_route(void) {
-// FIXME: checked by parser
-//   xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE,
-//     "Bad declaration of route in \"%s\"",current_routing->name);
-  route_t route = xbt_new(s_route_t,1);
+  route_t route = xbt_new0(s_route_t,1);
   route->link_list = link_list;
-  // TODO check if are correct
+//   xbt_assert1(generic_processing_units_exist(current_routing,src),"the \"%s\" processing units gateway does not exist",src);
+//   xbt_assert1(generic_processing_units_exist(current_routing,dst),"the \"%s\" processing units gateway does not exist",dst);
+    xbt_assert1(current_routing->set_route,"no defined method \"set_route\" in \"%s\"",current_routing->name);
   (*(current_routing->set_route))(current_routing,src,dst,route);
   link_list = NULL;
   src = NULL;
@@ -186,17 +259,18 @@ static void parse_E_route_store_route(void) {
 }
 
 /**
- * \brief Store de ASroute by calling the set_ASroute function of the current routing component
+ * \brief Store the ASroute by calling the set_ASroute function of the current routing component
  */
 static void parse_E_ASroute_store_route(void) {
-// FIXME: checked by parser
-//   xbt_assert1(current_routing->hierarchy==SURF_ROUTING_RECURSIVE,
-//     "Bad declaration of ASroute in \"%s\"",current_routing->name);
-  route_extended_t e_route = xbt_new(s_route_extended_t,1);
+  route_extended_t e_route = xbt_new0(s_route_extended_t,1);
   e_route->generic_route.link_list = link_list;
   e_route->src_gateway = xbt_strdup(gw_src);
-  e_route->dst_gateway = xbt_strdup(gw_dst);
-  // TODO check if are correct
+  e_route->dst_gateway = xbt_strdup(gw_dst);  
+//   xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
+//   xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
+//   xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
+//   xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
+  xbt_assert1(current_routing->set_ASroute,"no defined method \"set_ASroute\" in \"%s\"",current_routing->name);
   (*(current_routing->set_ASroute))(current_routing,src,dst,e_route);
   link_list = NULL;
   src = NULL;
@@ -205,16 +279,37 @@ static void parse_E_ASroute_store_route(void) {
   gw_dst = NULL;
 }
 
+/**
+ * \brief Store the bypass route by calling the set_bypassroute function of the current routing component
+ */
+static void parse_E_bypassRoute_store_route(void) {
+  route_extended_t e_route = xbt_new0(s_route_extended_t,1);
+  e_route->generic_route.link_list = link_list;
+  e_route->src_gateway = xbt_strdup(gw_src);
+  e_route->dst_gateway = xbt_strdup(gw_dst);
+//   xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
+//   xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
+//   xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
+//   xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
+  xbt_assert1(current_routing->set_bypassroute,"no defined method \"set_bypassroute\" in \"%s\"",current_routing->name);
+  (*(current_routing->set_bypassroute))(current_routing,src,dst,e_route);
+  link_list = NULL;
+  src = NULL;
+  dst = NULL;
+  gw_src = NULL;
+  gw_dst = NULL;
+}
+
 /**
  * \brief Make a new routing component
  *
- * Detect the routing model type of the routing component, make the new structure and
+ * make the new structure and
  * set the parsing functions to allows parsing the part of the routing tree
  */
-static void parse_S_AS(void) { 
+static void parse_S_AS(char* AS_id,char* AS_routing) {
   routing_component_t new_routing;
   model_type_t model = NULL;
-  char* wanted = A_surfxml_AS_routing;
+  char* wanted = AS_routing;
   int cpt;
   /* seach the routing model */
   for (cpt=0;routing_models[cpt].name;cpt++)
@@ -231,24 +326,11 @@ static void parse_S_AS(void) {
 
   /* make a new routing component */
   new_routing = (routing_component_t)(*(model->create))();
-  
-  /* FIXME: for now, if I forget to declare */  
-  xbt_assert1( new_routing->set_processing_units,
-       "Bad routing type, \"set_processing_units\" is not declared for \"%s\"",A_surfxml_AS_id);
-  xbt_assert1( new_routing->set_autonomous_system,
-       "Bad routing type, \"set_autonomous_system\" is not declared for \"%s\"",A_surfxml_AS_id);
-  xbt_assert1( new_routing->set_route,
-       "Bad routing type, \"set_route\" is not declared for \"%s\"",A_surfxml_AS_id);
-  xbt_assert1( new_routing->set_ASroute,
-       "Bad routing type, \"set_ASroute\" is not declared for \"%s\"",A_surfxml_AS_id);
-  xbt_assert1( new_routing->finalize,
-       "Bad routing type, \"finalize\" is not declared for \"%s\"",A_surfxml_AS_id);
-       
   new_routing->routing = model;
   new_routing->hierarchy = SURF_ROUTING_NULL;
-  new_routing->name = xbt_strdup(A_surfxml_AS_id);
+  new_routing->name = xbt_strdup(AS_id);
   new_routing->routing_sons = xbt_dict_new();
-  INFO2("Routing %s for AS %s",A_surfxml_AS_routing,A_surfxml_AS_id);
+  //INFO2("Routing %s for AS %s",A_surfxml_AS_routing,A_surfxml_AS_id);
   
   if( current_routing == NULL && global_routing->root == NULL ){
     
@@ -258,19 +340,16 @@ static void parse_S_AS(void) {
     
   } else if( current_routing != NULL && global_routing->root != NULL ) { 
     
-    xbt_assert1(!xbt_dict_get_or_null(current_routing->routing_sons,A_surfxml_AS_id),
-           "The AS \"%s\" already exist",A_surfxml_AS_id);
+    xbt_assert1(!xbt_dict_get_or_null(current_routing->routing_sons,AS_id),
+           "The AS \"%s\" already exist",AS_id);
      /* it is a part of the tree */
     new_routing->routing_father = current_routing;
     /* set the father behavior */
     if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_RECURSIVE;
-// FIXME: checked by parser
-//     xbt_assert1(current_routing->hierarchy==SURF_ROUTING_RECURSIVE,
-//       "Bad declaration of AS \"%s\"",A_surfxml_AS_id);
     /* add to the sons dictionary */
-    xbt_dict_set(current_routing->routing_sons,A_surfxml_AS_id,(void*)new_routing,NULL);
+    xbt_dict_set(current_routing->routing_sons,AS_id,(void*)new_routing,NULL);
     /* add to the father element list */
-    (*(current_routing->set_autonomous_system))(current_routing,A_surfxml_AS_id);
+    (*(current_routing->set_autonomous_system))(current_routing,AS_id);
     /* unload the prev parse rules */
     (*(current_routing->routing->unload))();
     
@@ -283,17 +362,37 @@ static void parse_S_AS(void) {
   current_routing = new_routing;
 }
 
+/*
+ * Detect the routing model type of the routing component from XML platforms
+ */
+static void parse_S_AS_XML(void)
+{
+       parse_S_AS(A_surfxml_AS_id,A_surfxml_AS_routing);
+}
+
+/*
+ * define the routing model type of routing component from lua script
+ */
+static void parse_S_AS_lua(char* id,char* mode)
+{
+       parse_S_AS(id,mode);
+}
+
+
 /**
  * \brief Finish the creation of a new routing component
  *
  * When you finish to read the routing component, other structures must be created. 
  * the "end" method allow to do that for any routing model type
  */
-static void parse_E_AS(void) {
+static void parse_E_AS(char *AS_id) {
 
   if( current_routing == NULL ) {
-    THROW1(arg_error,0,"Close AS(%s), that never open",A_surfxml_AS_id);
+    THROW1(arg_error,0,"Close AS(%s), that never open",AS_id);
   } else {
+      xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,current_routing->name),
+          "The AS \"%s\" already exist",current_routing->name);
+      xbt_dict_set(global_routing->where_network_elements,current_routing->name,current_routing->routing_father,NULL);
       (*(current_routing->routing->unload))();
       (*(current_routing->routing->end))();
       current_routing = current_routing->routing_father;
@@ -302,32 +401,20 @@ static void parse_E_AS(void) {
   }
 }
 
-/**
- * \brief Recursive function for add the differents AS to global dict of network element
- *
- * This fuction is call by "parse_E_platform_add_parse_AS". It allow to add the 
- * AS or routing components, to the where_network_elements dictionary. In the same
- * way as "parse_S_host", "parse_S_router" and "parse_S_gateway" do.
+/*
+ * \brief Finish the creation of a new routing component from XML
  */
-static void _add_parse_AS(routing_component_t rc) {
-  xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,rc->name),
-     "The AS \"%s\" already exist",rc->name);
-  xbt_dict_set(global_routing->where_network_elements,rc->name,rc->routing_father,NULL);
-  xbt_dict_cursor_t cursor = NULL;
-  char *key;
-  routing_component_t elem;
-  xbt_dict_foreach(rc->routing_sons, cursor, key, elem) {
-    _add_parse_AS(elem);
-  } 
+static void parse_E_AS_XML(void)
+{
+       parse_E_AS(A_surfxml_AS_id);
 }
 
-/**
- * \brief Add all "AS" to the global dict of network element
- *
- * Allows find a "AS" in any routing component
+/*
+ * \brief Finish the creation of a new routing component from lua
  */
-static void parse_E_platform_add_parse_AS(void) {
-  _add_parse_AS(global_routing->root);
+static void parse_E_AS_lua(char *id)
+{
+       parse_E_AS(id);
 }
 
 /* Aux Business methods */
@@ -345,7 +432,7 @@ static xbt_dynar_t elements_father(const char* src,const char* dst) {
   
   xbt_assert0(src&&dst,"bad parameters for \"elements_father\" method");
   
-  xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL); // &xbt_free_ref
+  xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL);
   
   routing_component_t src_as, dst_as;
   int index_src, index_dst, index_father_src, index_father_dst;
@@ -401,9 +488,9 @@ static xbt_dynar_t elements_father(const char* src,const char* dst) {
     father = xbt_dynar_get_ptr(path_src,index_father_src);
   
   /* (5) result generation */
-  xbt_dynar_push(result,father); // first same the father of src and dst
-  xbt_dynar_push(result,current_src); // second the first different father of src 
-  xbt_dynar_push(result,current_dst); // three  the first different father of dst
+  xbt_dynar_push(result,father); /* first same the father of src and dst */
+  xbt_dynar_push(result,current_src); /* second the first different father of src */
+  xbt_dynar_push(result,current_dst); /* three  the first different father of dst */
   
   xbt_dynar_free(&path_src);
   xbt_dynar_free(&path_dst);
@@ -431,7 +518,7 @@ static route_extended_t _get_route(const char* src,const char* dst) {
      
   xbt_assert0(src&&dst,"bad parameters for \"_get_route\" method");
   
-  route_extended_t e_route, e_route_cnt, e_route_src, e_route_dst;
+  route_extended_t e_route, e_route_cnt, e_route_src=NULL, e_route_dst=NULL;
   
   xbt_dynar_t elem_father_list = elements_father(src,dst);
   
@@ -448,47 +535,56 @@ static route_extended_t _get_route(const char* src,const char* dst) {
     
     if( strcmp(src,dst) ){
       e_route_cnt = (*(common_father->get_route))(common_father,src,dst);
+      xbt_assert2(e_route_cnt,"no route between \"%s\" and \"%s\"",src,dst);
       xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
         xbt_dynar_push(e_route->generic_route.link_list,&link);
       }
-      xbt_dynar_free( &(e_route_cnt->generic_route.link_list) );
-      xbt_free(e_route_cnt);
+      generic_free_extended_route(e_route_cnt);
     }
     
   } else { /* SURF_ROUTING_RECURSIVE */
+
+    route_extended_t e_route_bypass = NULL;
     
+    if(common_father->get_bypass_route)
+      e_route_bypass = (*(common_father->get_bypass_route))(common_father,src,dst);
+    
+    if(e_route_bypass)
+      e_route_cnt = e_route_bypass;    
+    else
       e_route_cnt = (*(common_father->get_route))(common_father,src_father->name,dst_father->name);
-      
-      xbt_assert2( (e_route_cnt->src_gateway==NULL) == (e_route_cnt->dst_gateway==NULL) ,
-        "bad gateway for route between \"%s\" and \"%s\"",src,dst);
+    
+    xbt_assert2(e_route_cnt,"no route between \"%s\" and \"%s\"",src_father->name,dst_father->name);
 
-      if( src != e_route_cnt->src_gateway ) {
-        e_route_src = _get_route(src,e_route_cnt->src_gateway);
-        xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) {
-          xbt_dynar_push(e_route->generic_route.link_list,&link);
-        }
-      }
-      
-      xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
+    xbt_assert2( (e_route_cnt->src_gateway==NULL) == (e_route_cnt->dst_gateway==NULL) ,
+      "bad gateway for route between \"%s\" and \"%s\"",src,dst);
+
+    if( src != e_route_cnt->src_gateway ) {
+      e_route_src = _get_route(src,e_route_cnt->src_gateway);
+      xbt_assert2(e_route_src,"no route between \"%s\" and \"%s\"",src,e_route_cnt->src_gateway);
+      xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) {
         xbt_dynar_push(e_route->generic_route.link_list,&link);
       }
-      
-      if( e_route_cnt->dst_gateway != dst ) {
-        e_route_dst = _get_route(e_route_cnt->dst_gateway,dst);
-        xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) {
-          xbt_dynar_push(e_route->generic_route.link_list,&link);
-        }
+    }
+    
+    xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
+      xbt_dynar_push(e_route->generic_route.link_list,&link);
+    }
+    
+    if( e_route_cnt->dst_gateway != dst ) {
+      e_route_dst = _get_route(e_route_cnt->dst_gateway,dst);
+      xbt_assert2(e_route_dst,"no route between \"%s\" and \"%s\"",e_route_cnt->dst_gateway,dst);
+      xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) {
+        xbt_dynar_push(e_route->generic_route.link_list,&link);
       }
-      
-      e_route->src_gateway = e_route_cnt->src_gateway;
-      e_route->dst_gateway = e_route_cnt->dst_gateway;
-
-      xbt_dynar_free( &(e_route_src->generic_route.link_list) );
-      xbt_free(e_route_src);
-      xbt_dynar_free( &(e_route_cnt->generic_route.link_list) );
-      xbt_free(e_route_cnt);
-      xbt_dynar_free( &(e_route_dst->generic_route.link_list) );
-      xbt_free(e_route_dst);
+    }
+    
+    e_route->src_gateway = xbt_strdup(e_route_cnt->src_gateway);
+    e_route->dst_gateway = xbt_strdup(e_route_cnt->dst_gateway);
+
+    generic_free_extended_route(e_route_src);
+    generic_free_extended_route(e_route_cnt);
+    generic_free_extended_route(e_route_dst);
   }
   
   xbt_dynar_free(&elem_father_list);
@@ -507,8 +603,6 @@ static route_extended_t _get_route(const char* src,const char* dst) {
  */
 static xbt_dynar_t get_route(const char* src,const char* dst) {
   
-  if(global_routing->last_route) xbt_dynar_free( &(global_routing->last_route) );
-  
   route_extended_t e_route;
   xbt_dynar_t elem_father_list = elements_father(src,dst);
   routing_component_t common_father = xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
@@ -518,8 +612,14 @@ static xbt_dynar_t get_route(const char* src,const char* dst) {
   else
     e_route = (*(common_father->get_route))(common_father,src,dst);
   
+  xbt_assert2(e_route,"no route between \"%s\" and \"%s\"",src,dst);
+  
+  if(global_routing->last_route) xbt_dynar_free( &(global_routing->last_route) );
   global_routing->last_route = e_route->generic_route.link_list;
  
+  if(e_route->src_gateway) xbt_free(e_route->src_gateway);
+  if(e_route->dst_gateway) xbt_free(e_route->dst_gateway);
+  
   xbt_free(e_route);
   xbt_dynar_free(&elem_father_list);
   
@@ -549,6 +649,7 @@ static void _finalize(routing_component_t rc) {
     char* tmp_name = rc->name;
     xbt_dict_free(&tmp_sons);
     xbt_free(tmp_name);
+    xbt_assert1(rc->finalize,"no defined method \"finalize\" in \"%s\"",current_routing->name);
     (*(rc->finalize))(rc);
   }
 }
@@ -570,6 +671,16 @@ static void finalize(void) {
   xbt_free(global_routing);
 }
 
+static xbt_dict_t get_onelink_routes(void)
+{
+       xbt_die("global \"get_onelink_routes\" function not implemented yet");
+}
+
+static int is_router(const char *name)
+{
+       xbt_die("global \"is_router\" function not implemented yet");
+}
+
 /**
  * \brief Generic method: create the global routing schema
  * 
@@ -582,6 +693,8 @@ void routing_model_create(size_t size_of_links, void* loopback) {
   global_routing->where_network_elements = xbt_dict_new();
   global_routing->root = NULL;
   global_routing->get_route = get_route;
+  global_routing->get_onelink_routes = get_onelink_routes;
+  global_routing->is_router = is_router;
   global_routing->finalize = finalize;
   global_routing->loopback = loopback;
   global_routing->size_of_link = size_of_links;
@@ -591,39 +704,25 @@ void routing_model_create(size_t size_of_links, void* loopback) {
   current_routing = NULL;
 
   /* parse generic elements */
-  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host);
+  surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML);
   surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router);
 
-  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_S_route_new_and_endpoints);
+  surfxml_add_callback(STag_surfxml_route_cb_list, &parse_S_route_new_and_endpoints_XML);
   surfxml_add_callback(STag_surfxml_ASroute_cb_list, &parse_S_ASroute_new_and_endpoints);
+  surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, &parse_S_bypassRoute_new_and_endpoints);
   
-  surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_E_link_c_ctn_new_elem);
+  surfxml_add_callback(ETag_surfxml_link_ctn_cb_list, &parse_E_link_ctn_new_elem_XML);
   
   surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_E_route_store_route);
   surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &parse_E_ASroute_store_route);
+  surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, &parse_E_bypassRoute_store_route);
   
-  surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS);
-  surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS);
-  
-  /* set all the as in the global where table (recursive fuction) */
-  surfxml_add_callback(ETag_surfxml_platform_cb_list, &parse_E_platform_add_parse_AS);
-  
-  /* DEBUG ONLY */  
-  //surfxml_add_callback(ETag_surfxml_platform_cb_list, &DEBUG_exit);
-}
-
-/* ************************************************************************** */
-/* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */
-
-static void generic_set_processing_units(routing_component_t rc, const char* name);
-static void generic_set_autonomous_system(routing_component_t rc, const char* name);
-static void generic_set_route(routing_component_t rc, const char* src, const char* dst, route_t route);
-static void generic_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route);
+  surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS_XML);
+  surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML);
 
-/* ************************************************************************** */
-/* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */
+  surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_full_parse_Scluster);
 
-static route_extended_t generic_new_extended_route(routing_component_t rc, void* data);
+}
 
 /* ************************************************************************** */
 /* *************************** FULL ROUTING ********************************* */
@@ -636,48 +735,50 @@ typedef struct {
   s_routing_component_t generic_routing;
   xbt_dict_t parse_routes; /* store data during the parse process */
   xbt_dict_t to_index; /* char* -> network_element_t */
+  xbt_dict_t bypassRoutes;
   route_extended_t *routing_table;
 } s_routing_component_full_t,*routing_component_full_t;
 
 /* Business methods */
+static xbt_dict_t full_get_onelink_routes(void)
+{
+  xbt_die("\"full_get_onelink_routes\" function not implemented yet");
+}
 
-static route_extended_t full_get_route(routing_component_t rc, const char* src,const char* dst) {
+static int full_is_router(const char *name)
+{
+  xbt_die("\"full_is_router\" function not implemented yet");
+}
 
+static route_extended_t full_get_route(routing_component_t rc, const char* src,const char* dst) {
+  xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
+  
+  /* set utils vars */
   routing_component_full_t routing = (routing_component_full_t)rc;
   int table_size = xbt_dict_length(routing->to_index);
   
-  xbt_assert1(src && dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
-   
-  routing_component_t src_as, dst_as;
-  int *src_id,*dst_id;
-
-  src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
-  dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst);
-   
-  xbt_assert3(src_as != NULL && dst_as  != NULL, "Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",src,dst,rc->name);
-  xbt_assert4(src_as == dst_as, "The src(%s in %s) and dst(%s in %s) are in differents AS",src,src_as->name,dst,dst_as->name);
-  xbt_assert2(rc == dst_as, "The routing component of src and dst is not the same as the network elements belong (%s==%s)",rc->name,dst_as->name);
-
-  src_id = xbt_dict_get(routing->to_index,src);
-  dst_id = xbt_dict_get(routing->to_index,dst);
+  generic_src_dst_check(rc,src,dst);
+  int *src_id = xbt_dict_get_or_null(routing->to_index,src);
+  int *dst_id = xbt_dict_get_or_null(routing->to_index,dst);
   xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",src,dst); 
-  
+
+  route_extended_t e_route = NULL;
+  route_extended_t new_e_route = NULL;
   void* link;
   unsigned int cpt=0;
-  route_extended_t new_e_route;
-  route_extended_t e_route = TO_ROUTE_FULL(*src_id,*dst_id);
+
+  e_route = TO_ROUTE_FULL(*src_id,*dst_id);
+  
   if(e_route) {
     new_e_route = xbt_new0(s_route_extended_t,1);
-    new_e_route->src_gateway = e_route->src_gateway;
-    new_e_route->dst_gateway = e_route->dst_gateway;
+    new_e_route->src_gateway = xbt_strdup(e_route->src_gateway);
+    new_e_route->dst_gateway = xbt_strdup(e_route->dst_gateway);
     new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
     xbt_dynar_foreach(e_route->generic_route.link_list, cpt, link) {
       xbt_dynar_push(new_e_route->generic_route.link_list,&link);
     }
-  } else {
-    new_e_route = NULL;
   }
-    return new_e_route;
+  return new_e_route;
 }
 
 static void full_finalize(routing_component_t rc) {
@@ -686,18 +787,12 @@ static void full_finalize(routing_component_t rc) {
   int i,j;
   if (routing) {
     /* Delete routing table */
-    for (i=0;i<table_size;i++) {
-      for (j=0;j<table_size;j++) {
-        route_extended_t e_route = TO_ROUTE_FULL(i,j);
-        if(e_route) {
-          xbt_dynar_free(&(e_route->generic_route.link_list));
-          if(e_route->src_gateway) xbt_free(e_route->src_gateway);
-          if(e_route->dst_gateway) xbt_free(e_route->dst_gateway);
-          xbt_free(e_route);
-        }
-      }
-    }
+    for (i=0;i<table_size;i++)
+      for (j=0;j<table_size;j++)
+        generic_free_extended_route(TO_ROUTE_FULL(i,j));
     xbt_free(routing->routing_table);
+    /* Delete bypass dict */
+    xbt_dict_free(&routing->bypassRoutes);
     /* Delete index dict */
     xbt_dict_free(&(routing->to_index));
     /* Delete structure */
@@ -707,32 +802,37 @@ static void full_finalize(routing_component_t rc) {
 
 /* Creation routing model functions */
 
-static void* model_full_create() {
+static void* model_full_create(void) {
   routing_component_full_t new_component =  xbt_new0(s_routing_component_full_t,1);
-  new_component->generic_routing.set_processing_units = generic_set_processing_units;
+  new_component->generic_routing.set_processing_unit = generic_set_processing_unit;
   new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system;
   new_component->generic_routing.set_route = generic_set_route;
   new_component->generic_routing.set_ASroute = generic_set_ASroute;
+  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
   new_component->generic_routing.get_route = full_get_route;
+  new_component->generic_routing.get_onelink_routes = full_get_onelink_routes;
+  new_component->generic_routing.is_router = full_is_router;
+  new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
   new_component->generic_routing.finalize = full_finalize;
   new_component->to_index = xbt_dict_new();
+  new_component->bypassRoutes = xbt_dict_new();
   new_component->parse_routes = xbt_dict_new();
   return new_component;
 }
 
-static void model_full_load() {
+static void model_full_load(void) {
  /* use "surfxml_add_callback" to add a parse function call */
 }
 
-static void model_full_unload() {
+static void model_full_unload(void) {
  /* use "surfxml_del_callback" to remove a parse function call */
 }
 
-static void  model_full_end() {
+static void  model_full_end(void) {
   
-  char *key, *src_name, *dst_name;
+  char *key, *end;
   const char* sep = "#";
-  int *src_id, *dst_id;
+  int src_id, dst_id;
   unsigned int i, j;
   route_t route;
   route_extended_t e_route;
@@ -750,20 +850,10 @@ static void  model_full_end() {
   
   /* Put the routes in position */
   xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    
     keys = xbt_str_split_str(key, sep);
-
-    src_name = xbt_dynar_get_as(keys, 0, char*);
-    dst_name = xbt_dynar_get_as(keys, 1, char*);
-    
-    src_id = xbt_dict_get_or_null(routing->to_index, src_name);
-    dst_id = xbt_dict_get_or_null(routing->to_index, dst_name);
-    
-    if (src_id == NULL || dst_id == NULL )
-      THROW2(mismatch_error,0,"Network elements %s or %s not found", src_name, dst_name);
-    
-    TO_ROUTE_FULL(*src_id,*dst_id) = generic_new_extended_route(current_routing,data);
-
+    src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
+    dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
+    TO_ROUTE_FULL(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,1);
      xbt_dynar_free(&keys);
    }
 
@@ -778,15 +868,17 @@ static void  model_full_end() {
   xbt_dict_free(&(routing->parse_routes));
 
   /* Add the loopback if needed */
-  for (i = 0; i < table_size; i++) {
-    e_route = TO_ROUTE_FULL(i, i);
-    if(!e_route) { // && !xbt_dynar_length(e_route->generic_route.link_list)
-      e_route = xbt_new0(s_route_extended_t,1);
-      e_route->src_gateway = NULL;
-      e_route->dst_gateway = NULL;
-      e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
-      xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback);
-      TO_ROUTE_FULL(i, i) = e_route;
+  if(current_routing->hierarchy == SURF_ROUTING_BASE) {
+    for (i = 0; i < table_size; i++) {
+      e_route = TO_ROUTE_FULL(i, i);
+      if(!e_route) {
+        e_route = xbt_new0(s_route_extended_t,1);
+        e_route->src_gateway = NULL;
+        e_route->dst_gateway = NULL;
+        e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+        xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback);
+        TO_ROUTE_FULL(i, i) = e_route;
+      }
     }
   }
 
@@ -812,41 +904,52 @@ typedef struct {
   int *predecessor_table;
   route_extended_t *link_table; /* char* -> int* */
   xbt_dict_t to_index;
+  xbt_dict_t bypassRoutes;
   /* store data during the parse process */  
   xbt_dict_t parse_routes; 
 } s_routing_component_floyd_t,*routing_component_floyd_t;
 
 /* Business methods */
+static xbt_dict_t floyd_get_onelink_routes(void)
+{
+  xbt_die("\"floyd_get_onelink_routes\" function not implemented yet");
+}
+
+static int floyd_is_router(const char *name)
+{
+  xbt_die("\"floyd_is_router\" function not implemented yet");
+}
 
 static route_extended_t floyd_get_route(routing_component_t rc, const char* src,const char* dst) {
-  
-  xbt_assert1(src && dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
+  xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
   
   /* set utils vars */
   routing_component_floyd_t routing = (routing_component_floyd_t) rc;
   int table_size = xbt_dict_length(routing->to_index);
   
+  generic_src_dst_check(rc,src,dst);
+  int *src_id = xbt_dict_get_or_null(routing->to_index,src);
+  int *dst_id = xbt_dict_get_or_null(routing->to_index,dst);
+  xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",src,dst); 
+  
+  /* create a result route */
   route_extended_t new_e_route = xbt_new0(s_route_extended_t,1);
   new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
   new_e_route->src_gateway = NULL;
   new_e_route->dst_gateway = NULL;
   
-  int *src_id = xbt_dict_get(routing->to_index,src);
-  int *dst_id = xbt_dict_get(routing->to_index,dst);
-  xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",src,dst); 
-
   int first = 1;
   int pred = *dst_id;
   int prev_pred = 0;
-  char *gw_src,*gw_dst, *prev_gw_src,*prev_gw_dst, *first_gw;
+  char *gw_src=NULL,*gw_dst=NULL, *prev_gw_src,*prev_gw_dst, *first_gw=NULL;
   unsigned int cpt;
   void* link;
   xbt_dynar_t links;
-  route_extended_t e_route_as_to_as;
+  
   do {
     prev_pred = pred;
     pred = TO_FLOYD_PRED(*src_id, pred);
-    if(pred == -1) // if no pred in route -> no route to host
+    if(pred == -1) /* if no pred in route -> no route to host */
       break;      
     xbt_assert2(TO_FLOYD_LINK(pred,prev_pred),"Invalid link for the route between \"%s\" or \"%s\"", src, dst);
     
@@ -857,23 +960,22 @@ static route_extended_t floyd_get_route(routing_component_t rc, const char* src,
     gw_src = e_route->src_gateway;
     gw_dst = e_route->dst_gateway;
     
-    if(first) first_gw = gw_src;
+    if(first) first_gw = gw_dst;
     
-    if(rc->hierarchy == SURF_ROUTING_RECURSIVE && !first && strcmp(prev_gw_dst,gw_src)) {
-      
-      routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,prev_gw_dst);
-      routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,gw_src);
-      xbt_assert2(src_as==dst_as,"bad routing, differents AS gateways in route \"%s\" to \"%s\"",src,dst);
-      e_route_as_to_as = (*(src_as->get_route))(src_as,prev_gw_dst,gw_src);
-      links = e_route_as_to_as->generic_route.link_list;
+    if(rc->hierarchy == SURF_ROUTING_RECURSIVE && !first && strcmp(gw_dst,prev_gw_src)) {
+      xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route))(gw_dst,prev_gw_src);
+      xbt_assert2(e_route_as_to_as,"no route between \"%s\" and \"%s\"",gw_dst,prev_gw_src);
+      links = e_route_as_to_as;
+      int pos = 0;
       xbt_dynar_foreach(links, cpt, link) {
-        xbt_dynar_push(new_e_route->generic_route.link_list,&link);
+        xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link);
+        pos++;
       }
     }
     
     links = e_route->generic_route.link_list;
     xbt_dynar_foreach(links, cpt, link) {
-      xbt_dynar_push(new_e_route->generic_route.link_list,&link);
+      xbt_dynar_unshift(new_e_route->generic_route.link_list,&link);
     }
     first=0;
     
@@ -881,8 +983,8 @@ static route_extended_t floyd_get_route(routing_component_t rc, const char* src,
   xbt_assert4(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", *src_id, *dst_id,src,dst);
   
   if(rc->hierarchy == SURF_ROUTING_RECURSIVE) {
-    new_e_route->src_gateway = first_gw;
-    new_e_route->dst_gateway = gw_dst;
+    new_e_route->src_gateway = xbt_strdup(gw_src);
+    new_e_route->dst_gateway = xbt_strdup(first_gw);
   }
   
   return new_e_route;
@@ -894,18 +996,12 @@ static void floyd_finalize(routing_component_t rc) {
   if (routing) {
     table_size = xbt_dict_length(routing->to_index);
     /* Delete link_table */
-    for (i=0;i<table_size;i++) {
-      for (j=0;j<table_size;j++) {
-        route_extended_t e_route = TO_FLOYD_LINK(i,j);
-        if(e_route) {
-          xbt_dynar_free(&(e_route->generic_route.link_list));
-          if(e_route->src_gateway) xbt_free(e_route->src_gateway);
-          if(e_route->dst_gateway) xbt_free(e_route->dst_gateway);
-          xbt_free(e_route);
-        }
-      }
-    }
+    for (i=0;i<table_size;i++)
+      for (j=0;j<table_size;j++)
+        generic_free_extended_route(TO_FLOYD_LINK(i,j));
     xbt_free(routing->link_table);
+    /* Delete bypass dict */
+    xbt_dict_free(&routing->bypassRoutes);
     /* Delete index dict */
     xbt_dict_free(&(routing->to_index));
     /* Delete dictionary index dict, predecessor and links table */
@@ -917,91 +1013,86 @@ static void floyd_finalize(routing_component_t rc) {
 
 static void* model_floyd_create(void) {
   routing_component_floyd_t new_component = xbt_new0(s_routing_component_floyd_t,1);
-  new_component->generic_routing.set_processing_units = generic_set_processing_units;
+  new_component->generic_routing.set_processing_unit = generic_set_processing_unit;
   new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system;
   new_component->generic_routing.set_route = generic_set_route;
   new_component->generic_routing.set_ASroute = generic_set_ASroute;
+  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
   new_component->generic_routing.get_route = floyd_get_route;
+  new_component->generic_routing.get_onelink_routes = floyd_get_onelink_routes;
+  new_component->generic_routing.is_router = floyd_is_router;
+  new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
   new_component->generic_routing.finalize = floyd_finalize;
   new_component->to_index = xbt_dict_new();
+  new_component->bypassRoutes = xbt_dict_new();
   new_component->parse_routes = xbt_dict_new();
   return new_component;
 }
 
-static void  model_floyd_load() {
+static void  model_floyd_load(void) {
  /* use "surfxml_add_callback" to add a parse function call */
 }
 
-static void  model_floyd_unload() {
+static void  model_floyd_unload(void) {
  /* use "surfxml_del_callback" to remove a parse function call */
 }
 
-static void  model_floyd_end() {
+static void  model_floyd_end(void) {
   
   routing_component_floyd_t routing = ((routing_component_floyd_t)current_routing);
   xbt_dict_cursor_t cursor = NULL;
   double * cost_table;
-  char *key,*data, *src_name, *dst_name;
+  char *key,*data, *end;
   const char *sep = "#";
   xbt_dynar_t keys;
-  int *src_id, *dst_id;
+  int src_id, dst_id;
   unsigned int i,j,a,b,c;
 
   /* set the size of inicial table */
   int table_size = xbt_dict_length(routing->to_index);
   
   /* Create Cost, Predecessor and Link tables */
-  cost_table = xbt_new0(double, table_size*table_size); //link cost from host to host
-  routing->predecessor_table = xbt_new0(int, table_size*table_size); //predecessor host numbers
-  routing->link_table = xbt_new0(route_extended_t, table_size*table_size); //actual link between src and dst
+  cost_table = xbt_new0(double, table_size*table_size); /* link cost from host to host */
+  routing->predecessor_table = xbt_new0(int, table_size*table_size); /* predecessor host numbers */
+  routing->link_table = xbt_new0(route_extended_t, table_size*table_size); /* actual link between src and dst */
 
   /* Initialize costs and predecessors*/
   for(i = 0; i<table_size;i++)
     for(j = 0; j<table_size;j++) {
         TO_FLOYD_COST(i,j) = DBL_MAX;
         TO_FLOYD_PRED(i,j) = -1;
-        TO_FLOYD_LINK(i,j) = NULL; // FIXED DAVID
+        TO_FLOYD_LINK(i,j) = NULL; /* fixed, missing in the previous version */
     }
 
    /* Put the routes in position */
   xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
-    
     keys = xbt_str_split_str(key, sep);
-
-    src_name = xbt_dynar_get_as(keys, 0, char*);
-    dst_name = xbt_dynar_get_as(keys, 1, char*);
-    
-    src_id = xbt_dict_get_or_null(routing->to_index, src_name);
-    dst_id = xbt_dict_get_or_null(routing->to_index, dst_name);
-    
-    if (src_id == NULL || dst_id == NULL )
-      THROW2(mismatch_error,0,"Network elements %s or %s not found", src_name, dst_name);
-
-    TO_FLOYD_LINK(*src_id,*dst_id) = generic_new_extended_route(current_routing,data);
-    TO_FLOYD_PRED(*src_id,*dst_id) = *src_id;
-    
-    //link cost
-    TO_FLOYD_COST(*src_id,*dst_id) = 1; // assume 1 for now
-    
+    src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
+    dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
+    TO_FLOYD_LINK(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,0);
+    TO_FLOYD_PRED(src_id,dst_id) = src_id;
+    /* set link cost */
+    TO_FLOYD_COST(src_id,dst_id) = ((TO_FLOYD_LINK(src_id,dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
     xbt_dynar_free(&keys);
   }
 
   /* Add the loopback if needed */
-  for (i = 0; i < table_size; i++) {
-    route_extended_t e_route = TO_FLOYD_LINK(i, i);
-    if(!e_route) { // && !xbt_dynar_length(e_route->generic_route.link_list)
-      e_route = xbt_new0(s_route_extended_t,1);
-      e_route->src_gateway = NULL;
-      e_route->dst_gateway = NULL;
-      e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
-      xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback);
-      TO_FLOYD_LINK(i,i) = e_route;
-      TO_FLOYD_PRED(i,i) = i;
-      TO_FLOYD_COST(i,i) = 1;
+  if(current_routing->hierarchy == SURF_ROUTING_BASE) {
+    for (i = 0; i < table_size; i++) {
+      route_extended_t e_route = TO_FLOYD_LINK(i, i);
+      if(!e_route) {
+        e_route = xbt_new0(s_route_extended_t,1);
+        e_route->src_gateway = NULL;
+        e_route->dst_gateway = NULL;
+        e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+        xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback);
+        TO_FLOYD_LINK(i,i) = e_route;
+        TO_FLOYD_PRED(i,i) = i;
+        TO_FLOYD_COST(i,i) = 1;
+      }
     }
   }
-
-  //Calculate path costs 
+  /* Calculate path costs */
   for(c=0;c<table_size;c++) {
     for(a=0;a<table_size;a++) {
       for(b=0;b<table_size;b++) {
@@ -1026,8 +1117,8 @@ static void  model_floyd_end() {
   /* delete parse dict */
   xbt_dict_free(&(routing->parse_routes));
 
-  //cleanup
-  free(cost_table);
+  /* cleanup */
+  xbt_free(cost_table);
 }
 
 /* ************************************************************************** */
@@ -1035,175 +1126,1113 @@ static void  model_floyd_end() {
 
 typedef struct {
   s_routing_component_t generic_routing;
-  xbt_graph_t route_graph;
-  xbt_dict_t graph_node_map;
-  xbt_dict_t route_cache;
-  xbt_dynar_t last_route;
+  xbt_dict_t to_index;
+  xbt_dict_t bypassRoutes;
+  xbt_graph_t route_graph;   /* xbt_graph */
+  xbt_dict_t graph_node_map; /* map */
+  xbt_dict_t route_cache;    /* use in cache mode */
   int cached;
+  xbt_dict_t parse_routes;
 } s_routing_component_dijkstra_t,*routing_component_dijkstra_t;
 
-/* Parse routing model functions */
-
-/* Business methods */
-
-/* Creation routing model functions */
 
-static void* model_dijkstra_create() {
-  return NULL;
-}
+typedef struct graph_node_data {
+  int id; 
+  int graph_id; /* used for caching internal graph id's */
+} s_graph_node_data_t, * graph_node_data_t;
 
-static void  model_dijkstra_load() {
-}
+typedef struct graph_node_map_element {
+  xbt_node_t node;
+} s_graph_node_map_element_t, * graph_node_map_element_t;
 
-static void  model_dijkstra_unload() {
-}
+typedef struct route_cache_element {
+  int * pred_arr;
+  int size;
+} s_route_cache_element_t, * route_cache_element_t;    
 
-static void  model_dijkstra_end() {
-}
+/* Free functions */
 
-static void* model_dijkstracache_create() {
-  return NULL;
+static void route_cache_elem_free(void *e) {
+  route_cache_element_t elm=(route_cache_element_t)e;
+  if (elm) {
+    xbt_free(elm->pred_arr);
+    xbt_free(elm);
+  }
 }
 
-static void  model_dijkstracache_load() {
+static void graph_node_map_elem_free(void *e) {
+  graph_node_map_element_t elm = (graph_node_map_element_t)e;
+  if(elm) {
+    xbt_free(elm);
+  }
 }
 
-static void  model_dijkstracache_unload() {
+static void graph_edge_data_free(void *e) {
+  route_extended_t e_route = (route_extended_t)e;
+  if(e_route) {
+    xbt_dynar_free(&(e_route->generic_route.link_list));
+    if(e_route->src_gateway) xbt_free(e_route->src_gateway);
+    if(e_route->dst_gateway) xbt_free(e_route->dst_gateway);
+    xbt_free(e_route);
+  }
 }
 
-static void  model_dijkstracache_end() {
-}
+/* Utility functions */
 
+static xbt_node_t route_graph_new_node(routing_component_dijkstra_t rc, int id, int graph_id) {
+  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+  xbt_node_t node = NULL;
+  graph_node_data_t data = NULL;
+  graph_node_map_element_t elm = NULL;
 
-/* ************************************************************************** */
-/* ******************************* NO ROUTING ******************************* */
+  data = xbt_new0(struct graph_node_data, 1);
+  data->id = id;
+  data->graph_id = graph_id;
+  node = xbt_graph_new_node(routing->route_graph, data);
 
-/* Routing model structure */
-typedef struct {
-  s_routing_component_t generic_routing;
-} s_routing_component_none_t,*routing_component_none_t;
+  elm = xbt_new0(struct graph_node_map_element, 1);
+  elm->node = node;
+  xbt_dict_set_ext(routing->graph_node_map, (char*)(&id), sizeof(int), (xbt_set_elm_t)elm, &graph_node_map_elem_free);
 
-/* Business methods */
-static route_extended_t none_get_route(routing_component_t rc, const char* src,const char* dst){
-  return NULL;
+  return node;
 }
-static void none_finalize(routing_component_t rc) {
-  xbt_free(rc);
+static graph_node_map_element_t graph_node_map_search(routing_component_dijkstra_t rc, int id) {
+  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+  graph_node_map_element_t elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&id), sizeof(int));
+  return elm;
 }
 
-/* Creation routing model functions */
-static void* model_none_create() {
-  routing_component_none_t new_component =  xbt_new0(s_routing_component_none_t,1);
-  new_component->generic_routing.set_processing_units = NULL;
-  new_component->generic_routing.set_autonomous_system = NULL;
-  new_component->generic_routing.set_route = NULL;
-  new_component->generic_routing.set_ASroute = NULL;
-  new_component->generic_routing.get_route = none_get_route;
-  new_component->generic_routing.finalize = none_finalize;
-  return new_component;
-}
+/* Parsing */
 
-static void  model_none_load() {}
-static void  model_none_unload() {}
-static void  model_none_end() {}
+static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int dst_id, route_extended_t e_route ) {
+  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
 
-/* ************************************************** */
-/* ********** PATERN FOR NEW ROUTING **************** */
+  xbt_node_t src = NULL;
+  xbt_node_t dst = NULL;
+  graph_node_map_element_t src_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&src_id), sizeof(int));
+  graph_node_map_element_t dst_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&dst_id), sizeof(int));
 
-/* The minimal configuration of a new routing model need the next functions,
- * also you need to set at the start of the file, the new model in the model
- * list. Remember keep the null ending of the list.
- */
-/* Routing model structure */
-typedef struct {
-  s_routing_component_t generic_routing;
-  /* things that your routing model need */
-} s_routing_component_NEW_t,*routing_component_NEW_t;
+  if(src_elm)
+    src = src_elm->node;
 
-/* Parse routing model functions */
-static void NEW_parse_S_host(void) {} /* example*/
+  if(dst_elm)
+    dst = dst_elm->node;
 
-/* Business methods */
-static route_extended_t NEW_get_route(routing_component_t rc, const char* src,const char* dst) {return NULL;} /* mandatory */
-static void NEW_finalize(routing_component_t rc) {} /* mandatory */
+  /* add nodes if they don't exist in the graph */
+  if(src_id == dst_id && src == NULL && dst == NULL) {
+    src = route_graph_new_node(rc,src_id, -1);
+    dst = src;
+  } else {
+    if(src == NULL) {
+      src = route_graph_new_node(rc,src_id, -1);
+    }
+    if(dst == NULL) {
+      dst = route_graph_new_node(rc,dst_id, -1);
+    }
+  }
 
-/* Creation routing model functions */
-static void* model_NEW_create() {return NULL;} /* mandatory */
-static void  model_NEW_load() {}   /* mandatory */
-static void  model_NEW_unload() {} /* mandatory */
-static void  model_NEW_end() {}    /* mandatory */
+  /* add link as edge to graph */
+  xbt_graph_new_edge(routing->route_graph, src, dst, e_route);
+}
 
-/* ************************************************************************** */
-/* ************************* GENERIC PARSE FUNCTIONS ************************ */ 
+static void add_loopback_dijkstra(routing_component_dijkstra_t rc) {
+  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
 
-static void generic_set_processing_units(routing_component_t rc, const char* name) {
-   DEBUG1("Full - Load process unit \"%s\"",name);
-   model_type_t modeltype = rc->routing;
-   int *id = xbt_new0(int,1); // xbt_malloc(sizeof(int)); ?
-   xbt_dict_t index;
-   if(modeltype==&routing_models[SURF_MODEL_FULL])
-     index = ((routing_component_full_t)current_routing)->to_index;
-   else if(modeltype==&routing_models[SURF_MODEL_FLOYD])
-     index = ((routing_component_floyd_t)current_routing)->to_index;   
-   else xbt_die("\"generic_set_processing_units\" not support");
-   *id = xbt_dict_length(index);
-   xbt_dict_set(index,name,id,xbt_free);
-}
+  xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
 
-static void generic_set_autonomous_system(routing_component_t rc, const char* name) {
-   DEBUG1("Full - Load Autonomous system \"%s\"",name);
-   model_type_t modeltype = rc->routing;
-   int *id = xbt_new0(int,1); // xbt_malloc(sizeof(int)); ?
-   xbt_dict_t index;
-   if(modeltype==&routing_models[SURF_MODEL_FULL])
-     index = ((routing_component_full_t)current_routing)->to_index;
-   else if(modeltype==&routing_models[SURF_MODEL_FLOYD])
-     index = ((routing_component_floyd_t)current_routing)->to_index;
-   else xbt_die("\"generic_set_autonomous_system\" not support");
-   *id = xbt_dict_length(index);
-   xbt_dict_set(index,name,id,xbt_free);
+  xbt_node_t node = NULL;
+  unsigned int cursor2;
+  xbt_dynar_foreach(nodes, cursor2, node) {
+    xbt_dynar_t out_edges = xbt_graph_node_get_outedges(node); 
+    xbt_edge_t edge = NULL;
+    unsigned int cursor;
+
+    int found = 0;
+    xbt_dynar_foreach(out_edges, cursor, edge) {
+      xbt_node_t other_node = xbt_graph_edge_get_target(edge);
+      if(other_node == node) {
+        found = 1;
+        break;
+      }
+    }
+
+    if(!found) {
+      route_extended_t e_route = xbt_new0(s_route_extended_t,1);
+      e_route->src_gateway = NULL;
+      e_route->dst_gateway = NULL;
+      e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+      xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback);
+      xbt_graph_new_edge(routing->route_graph, node, node, e_route);
+    }
+  }
 }
 
-static void generic_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {
-  DEBUG2("Full - Load Route from \"%s\" to \"%s\"",src,dst);
+/* Business methods */
+static xbt_dict_t dijkstra_get_onelink_routes(void)
+{
+  xbt_die("\"dijkstra_get_onelink_routes\" function not implemented yet");
+}
+
+static int dijkstra_is_router(const char *name)
+{
+  xbt_die("\"dijkstra_is_router\" function not implemented yet");
+}
+
+static route_extended_t dijkstra_get_route(routing_component_t rc, const char* src,const char* dst) {
+  xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
+  
+  /* set utils vars */
+  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+  
+  generic_src_dst_check(rc,src,dst);
+  int *src_id = xbt_dict_get_or_null(routing->to_index,src);
+  int *dst_id = xbt_dict_get_or_null(routing->to_index,dst);
+  xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",src,dst); 
+  
+  /* create a result route */
+  route_extended_t new_e_route = xbt_new0(s_route_extended_t,1);
+  new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+  new_e_route->src_gateway = NULL;
+  new_e_route->dst_gateway = NULL;
+  
+  int *pred_arr = NULL;
+  int src_node_id = 0;
+  int dst_node_id = 0;
+  int * nodeid = NULL;
+  int v;
+  route_extended_t e_route;
+  int size = 0;
+  unsigned int cpt;
+  void* link;
+  xbt_dynar_t links = NULL;
+  route_cache_element_t elm = NULL;
+  xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
+  
+  /* Use the graph_node id mapping set to quickly find the nodes */
+  graph_node_map_element_t src_elm = graph_node_map_search(routing,*src_id);
+  graph_node_map_element_t dst_elm = graph_node_map_search(routing,*dst_id);
+  xbt_assert2(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", *src_id, *dst_id);
+  src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id;
+  dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id;
+
+  /* if the src and dst are the same */  /* fixed, missing in the previous version */
+  if( src_node_id == dst_node_id ) {
+    
+    xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t);
+    xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t);
+    xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_s_v, node_e_v);
+
+    xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, *dst_id);
+    
+    e_route = (route_extended_t)xbt_graph_edge_get_data(edge);
+
+    links = e_route->generic_route.link_list;
+    xbt_dynar_foreach(links, cpt, link) {
+      xbt_dynar_unshift(new_e_route->generic_route.link_list,&link);
+    }
+  
+    return new_e_route;
+  }
+  
+  if(routing->cached) {
+    /*check if there is a cached predecessor list avail */
+    elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routing->route_cache, (char*)(&src_id), sizeof(int));
+  }
+
+  if(elm) { /* cached mode and cache hit */
+    pred_arr = elm->pred_arr;
+  } else { /* not cached mode or cache miss */
+    double * cost_arr = NULL;
+    xbt_heap_t pqueue = NULL;
+    int i = 0;
+
+    int nr_nodes = xbt_dynar_length(nodes);
+    cost_arr = xbt_new0(double, nr_nodes); /* link cost from src to other hosts */
+    pred_arr = xbt_new0(int, nr_nodes);    /* predecessors in path from src */
+    pqueue = xbt_heap_new(nr_nodes, xbt_free);
+
+    /* initialize */
+    cost_arr[src_node_id] = 0.0;
+
+    for(i = 0; i < nr_nodes; i++) {
+      if(i != src_node_id) {
+        cost_arr[i] = DBL_MAX;
+      }
+
+      pred_arr[i] = 0;
+
+      /* initialize priority queue */
+      nodeid = xbt_new0(int, 1);
+      *nodeid = i;
+      xbt_heap_push(pqueue, nodeid, cost_arr[i]);
+
+    }
+
+    /* apply dijkstra using the indexes from the graph's node array */
+    while(xbt_heap_size(pqueue) > 0) {
+      int * v_id = xbt_heap_pop(pqueue);
+      xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
+      xbt_dynar_t out_edges = xbt_graph_node_get_outedges(v_node); 
+      xbt_edge_t edge = NULL;
+      unsigned int cursor;
+
+      xbt_dynar_foreach(out_edges, cursor, edge) {
+        xbt_node_t u_node = xbt_graph_edge_get_target(edge);
+        graph_node_data_t data = xbt_graph_node_get_data(u_node);
+        int u_id = data->graph_id;
+       route_extended_t tmp_e_route = (route_extended_t)xbt_graph_edge_get_data(edge);
+        int cost_v_u = (tmp_e_route->generic_route.link_list)->used;  /* count of links, old model assume 1 */
+
+        if(cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) {
+          pred_arr[u_id] = *v_id;
+          cost_arr[u_id] = cost_v_u + cost_arr[*v_id];
+          nodeid = xbt_new0(int, 1);
+          *nodeid = u_id;
+          xbt_heap_push(pqueue, nodeid, cost_arr[u_id]);
+        }
+      }
+
+      /* free item popped from pqueue */
+      xbt_free(v_id);
+    }
+
+    xbt_free(cost_arr);
+    xbt_heap_free(pqueue);
+  }
+  
+  /* compose route path with links */
+  char *gw_src=NULL,*gw_dst=NULL, *prev_gw_src,*prev_gw_dst, *first_gw=NULL;
+  
+  for(v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
+    xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
+    xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t);
+    xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v);
+
+    xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, *dst_id);
+    
+    prev_gw_src = gw_src;
+    prev_gw_dst = gw_dst;
+    
+    e_route = (route_extended_t)xbt_graph_edge_get_data(edge);
+    gw_src = e_route->src_gateway;
+    gw_dst = e_route->dst_gateway;
+    
+    if(v==dst_node_id) first_gw = gw_dst;
+    
+    if(rc->hierarchy == SURF_ROUTING_RECURSIVE && v!=dst_node_id && strcmp(gw_dst,prev_gw_src)) {
+      xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route))(gw_dst,prev_gw_src);
+      xbt_assert2(e_route_as_to_as,"no route between \"%s\" and \"%s\"",gw_dst,prev_gw_src);
+      links = e_route_as_to_as;
+      int pos = 0;
+      xbt_dynar_foreach(links, cpt, link) {
+        xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link);
+        pos++;
+      }
+    }
+    
+    links = e_route->generic_route.link_list;
+    xbt_dynar_foreach(links, cpt, link) {
+      xbt_dynar_unshift(new_e_route->generic_route.link_list,&link);
+    }
+    size++;
+  }
+
+  if(rc->hierarchy == SURF_ROUTING_RECURSIVE) {
+    new_e_route->src_gateway = xbt_strdup(gw_src);
+    new_e_route->dst_gateway = xbt_strdup(first_gw);
+  }
+
+  if(routing->cached && elm == NULL) {
+    /* add to predecessor list of the current src-host to cache */
+    elm = xbt_new0(struct route_cache_element, 1);
+    elm->pred_arr = pred_arr;
+    elm->size = size;
+    xbt_dict_set_ext(routing->route_cache, (char*)(&src_id), sizeof(int), (xbt_set_elm_t)elm, &route_cache_elem_free);
+  }
+
+  if(!routing->cached)
+    xbt_free(pred_arr);
+  
+  return new_e_route;
+}
+
+static void dijkstra_finalize(routing_component_t rc) {
+  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+
+  if (routing) {
+    xbt_graph_free_graph(routing->route_graph, &xbt_free, &graph_edge_data_free, &xbt_free);
+    xbt_dict_free(&routing->graph_node_map);
+    if(routing->cached)
+      xbt_dict_free(&routing->route_cache);
+    /* Delete bypass dict */
+    xbt_dict_free(&routing->bypassRoutes);
+    /* Delete index dict */
+    xbt_dict_free(&(routing->to_index));
+    /* Delete structure */
+    xbt_free(routing);
+  }
+}
+
+/* Creation routing model functions */
+
+static void* model_dijkstra_both_create(int cached) {
+  routing_component_dijkstra_t new_component = xbt_new0(s_routing_component_dijkstra_t,1);
+  new_component->generic_routing.set_processing_unit = generic_set_processing_unit;
+  new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system;
+  new_component->generic_routing.set_route = generic_set_route;
+  new_component->generic_routing.set_ASroute = generic_set_ASroute;
+  new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
+  new_component->generic_routing.get_route = dijkstra_get_route;
+  new_component->generic_routing.get_onelink_routes = dijkstra_get_onelink_routes;
+  new_component->generic_routing.is_router = dijkstra_is_router;
+  new_component->generic_routing.get_bypass_route = generic_get_bypassroute;
+  new_component->generic_routing.finalize = dijkstra_finalize;
+  new_component->cached = cached;
+  new_component->to_index = xbt_dict_new();
+  new_component->bypassRoutes = xbt_dict_new();
+  new_component->parse_routes = xbt_dict_new();
+  return new_component;
+}
+
+static void* model_dijkstra_create(void) {
+  return model_dijkstra_both_create(0);
+}
+
+static void* model_dijkstracache_create(void) {
+  return model_dijkstra_both_create(1);
+}
+
+static void  model_dijkstra_both_load(void) {
+ /* use "surfxml_add_callback" to add a parse function call */
+}
+
+static void  model_dijkstra_both_unload(void) {
+ /* use "surfxml_del_callback" to remove a parse function call */
+}
+
+static void  model_dijkstra_both_end(void) {
+  routing_component_dijkstra_t routing = (routing_component_dijkstra_t) current_routing;
+   xbt_dict_cursor_t cursor = NULL;
+   char *key, *data, *end;
+   const char *sep = "#";
+   xbt_dynar_t keys;
+  xbt_node_t node = NULL;
+  unsigned int cursor2;
+  xbt_dynar_t nodes = NULL;
+  int src_id, dst_id;
+  route_t route;
+  
+  /* Create the topology graph */
+  routing->route_graph = xbt_graph_new_graph(1, NULL);
+  routing->graph_node_map = xbt_dict_new();
+  
+  if(routing->cached)
+    routing->route_cache = xbt_dict_new();
+
+  /* Put the routes in position */
+  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
+    keys = xbt_str_split_str(key, sep);
+    src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
+    dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
+    route_extended_t e_route = generic_new_extended_route(current_routing->hierarchy,data,0);
+    route_new_dijkstra(routing,src_id,dst_id,e_route);
+    xbt_dynar_free(&keys);
+  }
+
+  /* delete the parse table */
+  xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
+    route = (route_t)data;
+    xbt_dynar_free(&(route->link_list));
+    xbt_free(data);
+  }
+      
+  /* delete parse dict */
+  xbt_dict_free(&(routing->parse_routes));
+  
+  /* Add the loopback if needed */
+  if(current_routing->hierarchy == SURF_ROUTING_BASE)
+    add_loopback_dijkstra(routing);
+
+  /* initialize graph indexes in nodes after graph has been built */
+  nodes = xbt_graph_get_nodes(routing->route_graph);
+
+  xbt_dynar_foreach(nodes, cursor2, node) {
+    graph_node_data_t data = xbt_graph_node_get_data(node);
+    data->graph_id = cursor2;
+  }
+  
+}
+
+/* ************************************************** */
+/* ************** RULE-BASED ROUTING **************** */
+
+/* Routing model structure */
+
+typedef struct {
+  s_routing_component_t generic_routing;
+  xbt_dict_t  dict_processing_units;
+  xbt_dict_t  dict_autonomous_systems;
+  xbt_dynar_t list_route;
+  xbt_dynar_t list_ASroute;
+} s_routing_component_rulebased_t,*routing_component_rulebased_t;
+
+typedef struct s_rule_route s_rule_route_t, *rule_route_t;
+typedef struct s_rule_route_extended s_rule_route_extended_t, *rule_route_extended_t;
+
+struct s_rule_route {
+  xbt_dynar_t re_str_link; // dynar of char*
+  pcre* re_src;
+  pcre* re_dst;
+};
+
+struct s_rule_route_extended {
+  s_rule_route_t generic_rule_route;
+  char* re_src_gateway;
+  char* re_dst_gateway;
+};
+
+static void rule_route_free(void *e) {
+  rule_route_t* elem = (rule_route_t*)(e);
+  if (*elem) {
+    xbt_dynar_free(&(*elem)->re_str_link);
+    pcre_free((*elem)->re_src);
+    pcre_free((*elem)->re_dst);
+    xbt_free((*elem));
+  }
+  (*elem) = NULL;
+}
+
+static void rule_route_extended_free(void *e) {
+  rule_route_extended_t* elem = (rule_route_extended_t*)e;
+  if (*elem) {
+    xbt_dynar_free(&(*elem)->generic_rule_route.re_str_link);
+    pcre_free((*elem)->generic_rule_route.re_src);
+    pcre_free((*elem)->generic_rule_route.re_dst);
+    xbt_free((*elem)->re_src_gateway);
+    xbt_free((*elem)->re_dst_gateway);
+    xbt_free((*elem));
+  }
+}
+
+/* Parse routing model functions */
+
+static void model_rulebased_set_processing_unit(routing_component_t rc, const char* name) {
+  routing_component_rulebased_t routing = (routing_component_rulebased_t) rc;
+  xbt_dict_set(routing->dict_processing_units, name, (void*)(-1), NULL);
+}
+
+static void model_rulebased_set_autonomous_system(routing_component_t rc, const char* name) {
+  routing_component_rulebased_t routing = (routing_component_rulebased_t) rc;
+  xbt_dict_set(routing->dict_autonomous_systems, name, (void*)(-1), NULL);  
+}
+
+static void model_rulebased_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {
+  routing_component_rulebased_t routing = (routing_component_rulebased_t) rc;
+  rule_route_t ruleroute = xbt_new0(s_rule_route_t,1);
+  const char *error;
+  int erroffset;
+  ruleroute->re_src = pcre_compile(src,0,&error,&erroffset,NULL);
+  xbt_assert3(ruleroute->re_src,"PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, src, error);
+  ruleroute->re_dst = pcre_compile(dst,0,&error,&erroffset,NULL);
+  xbt_assert3(ruleroute->re_src,"PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error);
+  ruleroute->re_str_link = route->link_list;
+  xbt_dynar_push(routing->list_route,&ruleroute);
+  xbt_free(route);
+}
+
+static void model_rulebased_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t route) {
+  routing_component_rulebased_t routing = (routing_component_rulebased_t) rc;
+  rule_route_extended_t ruleroute_e = xbt_new0(s_rule_route_extended_t,1);
+  const char *error;
+  int erroffset;
+  ruleroute_e->generic_rule_route.re_src = pcre_compile(src,0,&error,&erroffset,NULL);
+  xbt_assert3(ruleroute_e->generic_rule_route.re_src,"PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, src, error);
+  ruleroute_e->generic_rule_route.re_dst = pcre_compile(dst,0,&error,&erroffset,NULL);
+  xbt_assert3(ruleroute_e->generic_rule_route.re_src,"PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error);
+  ruleroute_e->generic_rule_route.re_str_link = route->generic_route.link_list;
+  ruleroute_e->re_src_gateway = route->src_gateway;
+  ruleroute_e->re_dst_gateway = route->dst_gateway;
+  xbt_dynar_push(routing->list_ASroute,&ruleroute_e);
+  xbt_free(route->src_gateway);
+  xbt_free(route->dst_gateway);
+  xbt_free(route);
+}
+
+static void model_rulebased_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {
+  xbt_die("bypass routing not supported for Route-Based model");
+}
+
+#define BUFFER_SIZE 4096  /* result buffer size */
+#define OVECCOUNT 30      /* should be a multiple of 3 */
+
+static char* remplace(char* value, const char** src_list, int src_size, const char** dst_list, int dst_size ) {
+
+  char result_result[BUFFER_SIZE];
+  int i_result_buffer;
+  int value_length = (int)strlen(value);
+  int number=0;
+  
+  int i=0;
+  i_result_buffer = 0;
+  do {
+    if( value[i] == '$' ) {
+      i++; // skip $
+      
+      // find the number      
+      int number_length = 0;
+      while( '0' <= value[i+number_length] && value[i+number_length] <= '9' ) {
+        number_length++;
+      }
+      xbt_assert2( number_length!=0, "bad string parameter, no number indication, at offset: %d (\"%s\")",i,value);
+      
+      // solve number
+      number = atoi(value+i);
+      i=i+number_length;
+      xbt_assert2(i+2<value_length,"bad string parameter, too few chars, at offset: %d (\"%s\")",i,value);
+      
+      // solve the indication
+      const char** param_list;
+      int param_size;
+      if( value[i] == 's' && value[i+1] == 'r' && value[i+2] == 'c' ) {
+        param_list = src_list;
+        param_size = src_size;
+      } else  if( value[i] == 'd' && value[i+1] == 's' && value[i+2] == 't' ) {
+        param_list = dst_list;
+        param_size = dst_size;
+      } else {
+        xbt_assert2(0,"bad string parameter, support only \"src\" and \"dst\", at offset: %d (\"%s\")",i,value);
+      }
+      i=i+3;
+      
+      xbt_assert4( param_size >= number, "bad string parameter, not enough length param_size, at offset: %d (\"%s\") %d %d",i,value,param_size,number);
+      
+      const char* param = param_list[number];
+      int size = strlen(param);
+      int cp;
+      for(cp = 0; cp < size; cp++ ) {
+        result_result[i_result_buffer] = param[cp];
+        i_result_buffer++;
+        if( i_result_buffer >= BUFFER_SIZE ) break;
+      }
+    } else {
+      result_result[i_result_buffer] = value[i];
+      i_result_buffer++;
+      i++; // next char
+    }
+    
+  } while(i<value_length && i_result_buffer < BUFFER_SIZE);
+  
+  xbt_assert2( i_result_buffer < BUFFER_SIZE, "solving string \"%s\", small buffer size (%d)",value,BUFFER_SIZE);
+  result_result[i_result_buffer] = 0;
+  return xbt_strdup(result_result);
+}
+
+static xbt_dict_t rulebased_get_onelink_routes(void)
+{
+  xbt_die("\"rulebased_get_onelink_routes\" function not implemented yet");
+}
+
+static int rulebased_is_router(const char *name)
+{
+  xbt_die("\"rulebased_is_router\" function not implemented yet");
+}
+
+/* Business methods */
+static route_extended_t rulebased_get_route(routing_component_t rc, const char* src,const char* dst) {
+  xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name);
+
+  /* set utils vars */
+  routing_component_rulebased_t routing = (routing_component_rulebased_t) rc;
+
+  int are_processing_units;
+  xbt_dynar_t rule_list;
+  if( xbt_dict_get_or_null(routing->dict_processing_units,src) && xbt_dict_get_or_null(routing->dict_processing_units,dst) ) {
+    are_processing_units = 1;
+    rule_list = routing->list_route;
+  } else if( xbt_dict_get_or_null(routing->dict_autonomous_systems,src) && xbt_dict_get_or_null(routing->dict_autonomous_systems,dst) ) {
+    are_processing_units = 0;
+    rule_list = routing->list_ASroute;    
+  } else
+     xbt_assert2(NULL, "Ask for route \"from\"(%s)  or \"to\"(%s) no found in the local table",src,dst); 
+
+  int rc_src = -1;
+  int rc_dst = -1;
+  int src_length = (int)strlen(src);
+  int dst_length = (int)strlen(dst);
+  
+  xbt_dynar_t links_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+  
+  rule_route_t ruleroute;
+  unsigned int cpt;
+  int ovector_src[OVECCOUNT];
+  int ovector_dst[OVECCOUNT];
+  const char** list_src = NULL;
+  const char** list_dst = NULL;
+  xbt_dynar_foreach(rule_list, cpt, ruleroute) {
+    rc_src = pcre_exec(ruleroute->re_src,NULL,src,src_length,0,0,ovector_src,OVECCOUNT);
+    if( rc_src >= 0 ) {
+      rc_dst = pcre_exec(ruleroute->re_dst,NULL,dst,dst_length,0,0,ovector_dst,OVECCOUNT);
+      if( rc_dst >= 0 ) {
+        xbt_assert1(!pcre_get_substring_list(src,ovector_src,rc_src,&list_src),"error solving substring list for src \"%s\"",src);
+        xbt_assert1(!pcre_get_substring_list(dst,ovector_dst,rc_dst,&list_dst),"error solving substring list for src \"%s\"",dst);
+        char* link_name;
+        xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) {
+          char* new_link_name = remplace(link_name,list_src,rc_src,list_dst,rc_dst);
+          void* link = xbt_dict_get_or_null(surf_network_model->resource_set, new_link_name);
+          if (link)
+            xbt_dynar_push(links_list,&link);
+          else
+            THROW1(mismatch_error,0,"Link %s not found", new_link_name);
+          xbt_free(new_link_name);
+        }
+      }
+    }
+    if( rc_src >= 0 && rc_dst >= 0 ) break;
+  }
+  
+  route_extended_t new_e_route = NULL;
+  if(rc_src >= 0 && rc_dst >= 0) {
+    new_e_route = xbt_new0(s_route_extended_t,1);
+    new_e_route->generic_route.link_list = links_list;
+  } else if( !strcmp(src,dst) && are_processing_units ) {
+    new_e_route = xbt_new0(s_route_extended_t,1);
+    xbt_dynar_push(links_list,&(global_routing->loopback));
+    new_e_route->generic_route.link_list = links_list;
+  } else { 
+    xbt_dynar_free(&link_list);
+  }
+
+  if(!are_processing_units && new_e_route)
+  {
+    rule_route_extended_t ruleroute_extended = (rule_route_extended_t)ruleroute;
+    new_e_route->src_gateway = remplace(ruleroute_extended->re_src_gateway,list_src,rc_src,list_dst,rc_dst);
+    new_e_route->dst_gateway = remplace(ruleroute_extended->re_dst_gateway,list_src,rc_src,list_dst,rc_dst);
+  }
+  
+  if(list_src) pcre_free_substring_list(list_src);
+  if(list_dst) pcre_free_substring_list(list_dst);
+  
+  return new_e_route;
+}
+
+static route_extended_t rulebased_get_bypass_route(routing_component_t rc, const char* src,const char* dst) {
+  return NULL;
+}
+
+static void rulebased_finalize(routing_component_t rc) {
+  routing_component_rulebased_t routing = (routing_component_rulebased_t) rc;
+  if (routing) {
+    xbt_dict_free(&routing->dict_processing_units);
+    xbt_dict_free(&routing->dict_autonomous_systems);
+    xbt_dynar_free(&routing->list_route);
+    xbt_dynar_free(&routing->list_ASroute);
+    /* Delete structure */
+    xbt_free(routing);
+  }
+}
+
+/* Creation routing model functions */
+static void* model_rulebased_create(void) {  
+  routing_component_rulebased_t new_component =  xbt_new0(s_routing_component_rulebased_t,1);
+  new_component->generic_routing.set_processing_unit = model_rulebased_set_processing_unit;
+  new_component->generic_routing.set_autonomous_system = model_rulebased_set_autonomous_system;
+  new_component->generic_routing.set_route = model_rulebased_set_route;
+  new_component->generic_routing.set_ASroute = model_rulebased_set_ASroute;
+  new_component->generic_routing.set_bypassroute = model_rulebased_set_bypassroute;
+  new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes;
+  new_component->generic_routing.is_router = rulebased_is_router;
+  new_component->generic_routing.get_route = rulebased_get_route;
+  new_component->generic_routing.get_bypass_route = NULL; //rulebased_get_bypass_route;
+  new_component->generic_routing.finalize = rulebased_finalize;
+  /* initialization of internal structures */
+  new_component->dict_processing_units = xbt_dict_new();
+  new_component->dict_autonomous_systems = xbt_dict_new();
+  new_component->list_route = xbt_dynar_new(sizeof(rule_route_t), &rule_route_free);
+  new_component->list_ASroute = xbt_dynar_new(sizeof(rule_route_extended_t), &rule_route_extended_free);
+  return new_component;
+}
+
+static void  model_rulebased_load(void) {
+ /* use "surfxml_add_callback" to add a parse function call */
+}
+
+static void  model_rulebased_unload(void) {
+ /* use "surfxml_del_callback" to remove a parse function call */
+}
+
+static void  model_rulebased_end(void) {
+}
+
+/* ************************************************************************** */
+/* ******************************* NO ROUTING ******************************* */
+
+/* Routing model structure */
+typedef struct {
+  s_routing_component_t generic_routing;
+} s_routing_component_none_t,*routing_component_none_t;
+
+/* Business methods */
+static xbt_dict_t none_get_onelink_routes(void){
+  return NULL;
+}
+static int none_is_router(const char *name){
+  return -1;
+}
+static route_extended_t none_get_route(routing_component_t rc, const char* src,const char* dst){
+  return NULL;
+}
+static route_extended_t none_get_bypass_route(routing_component_t rc, const char* src,const char* dst){
+  return NULL;
+}
+static void none_finalize(routing_component_t rc) {
+  xbt_free(rc);
+}
+
+static void none_set_processing_unit(routing_component_t rc, const char* name) {}
+static void none_set_autonomous_system(routing_component_t rc, const char* name) {}
+
+/* Creation routing model functions */
+static void* model_none_create(void) {
+  routing_component_none_t new_component =  xbt_new0(s_routing_component_none_t,1);
+  new_component->generic_routing.set_processing_unit = none_set_processing_unit;
+  new_component->generic_routing.set_autonomous_system = none_set_autonomous_system;
+  new_component->generic_routing.set_route = NULL;
+  new_component->generic_routing.set_ASroute = NULL;
+  new_component->generic_routing.set_bypassroute = NULL;
+  new_component->generic_routing.get_route = none_get_route;
+  new_component->generic_routing.get_onelink_routes = none_get_onelink_routes;
+  new_component->generic_routing.is_router = none_is_router;
+  new_component->generic_routing.get_bypass_route = none_get_bypass_route;
+  new_component->generic_routing.finalize = none_finalize;
+  return new_component;
+}
+
+static void  model_none_load(void) {}
+static void  model_none_unload(void) {}
+static void  model_none_end(void) {}
+
+/* ************************************************** */
+/* ********** PATERN FOR NEW ROUTING **************** */
+
+/* The minimal configuration of a new routing model need the next functions,
+ * also you need to set at the start of the file, the new model in the model
+ * list. Remember keep the null ending of the list.
+ */
+/*** Routing model structure ***/
+// typedef struct {
+//   s_routing_component_t generic_routing;
+//   /* things that your routing model need */
+// } s_routing_component_NEW_t,*routing_component_NEW_t;
+
+/*** Parse routing model functions ***/
+// static void model_NEW_set_processing_unit(routing_component_t rc, const char* name) {}
+// static void model_NEW_set_autonomous_system(routing_component_t rc, const char* name) {}
+// static void model_NEW_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {}
+// static void model_NEW_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t route) {}
+// static void model_NEW_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {}
+
+/*** Business methods ***/
+// static route_extended_t NEW_get_route(routing_component_t rc, const char* src,const char* dst) {return NULL;}
+// static route_extended_t NEW_get_bypass_route(routing_component_t rc, const char* src,const char* dst) {return NULL;}
+// static void NEW_finalize(routing_component_t rc) { xbt_free(rc);}
+
+/*** Creation routing model functions ***/
+// static void* model_NEW_create(void) {
+//   routing_component_NEW_t new_component =  xbt_new0(s_routing_component_NEW_t,1);
+//   new_component->generic_routing.set_processing_unit = model_NEW_set_processing_unit;
+//   new_component->generic_routing.set_autonomous_system = model_NEW_set_autonomous_system;
+//   new_component->generic_routing.set_route = model_NEW_set_route;
+//   new_component->generic_routing.set_ASroute = model_NEW_set_ASroute;
+//   new_component->generic_routing.set_bypassroute = model_NEW_set_bypassroute;
+//   new_component->generic_routing.get_route = NEW_get_route;
+//   new_component->generic_routing.get_bypass_route = NEW_get_bypass_route;
+//   new_component->generic_routing.finalize = NEW_finalize;
+//   /* initialization of internal structures */
+//   return new_component;
+// } /* mandatory */
+// static void  model_NEW_load(void) {}   /* mandatory */
+// static void  model_NEW_unload(void) {} /* mandatory */
+// static void  model_NEW_end(void) {}    /* mandatory */
+
+/* ************************************************************************** */
+/* ************************* GENERIC PARSE FUNCTIONS ************************ */ 
+
+static void generic_set_processing_unit(routing_component_t rc, const char* name) {
+  DEBUG1("Load process unit \"%s\"",name);
+  model_type_t modeltype = rc->routing;
+  int *id = xbt_new0(int,1);
+  xbt_dict_t _to_index;
+  if(modeltype==&routing_models[SURF_MODEL_FULL])
+    _to_index = ((routing_component_full_t)rc)->to_index;
+  
+  else if(modeltype==&routing_models[SURF_MODEL_FLOYD])
+    _to_index = ((routing_component_floyd_t)rc)->to_index;
+  
+  else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
+          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE])
+    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
+  
+  else xbt_die("\"generic_set_processing_unit\" not supported");
+  *id = xbt_dict_length(_to_index);
+  xbt_dict_set(_to_index,name,id,xbt_free);
+}
+
+static void generic_set_autonomous_system(routing_component_t rc, const char* name) {
+  DEBUG1("Load Autonomous system \"%s\"",name);
   model_type_t modeltype = rc->routing;
-  xbt_dict_t parseroutes;
+  int *id = xbt_new0(int,1);
+  xbt_dict_t _to_index;
   if(modeltype==&routing_models[SURF_MODEL_FULL])
-    parseroutes = ((routing_component_full_t)current_routing)->parse_routes;
+    _to_index = ((routing_component_full_t)rc)->to_index;
+  
   else if(modeltype==&routing_models[SURF_MODEL_FLOYD])
-    parseroutes = ((routing_component_floyd_t)current_routing)->parse_routes;
-  else xbt_die("\"generic_set_autonomous_system\" not support");
+    _to_index = ((routing_component_floyd_t)rc)->to_index;
+  
+  else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
+          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE])
+    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
+  
+  else xbt_die("\"generic_set_autonomous_system\" not supported");
+  *id = xbt_dict_length(_to_index);
+  xbt_dict_set(_to_index,name,id,xbt_free);
+}
+
+static void generic_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {
+  DEBUG2("Load Route from \"%s\" to \"%s\"",src,dst);
+  model_type_t modeltype = rc->routing;
+  xbt_dict_t _parse_routes;
+  xbt_dict_t _to_index;
   char *route_name;
-  route_name = bprintf("%s#%s",src,dst);
-  xbt_assert2(xbt_dynar_length(link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);   
-  xbt_assert2(!xbt_dict_get_or_null(parseroutes,route_name),
+  int *src_id, *dst_id;
+  
+  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
+    _parse_routes = ((routing_component_full_t)rc)->parse_routes;
+    _to_index = ((routing_component_full_t)rc)->to_index;
+    
+  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
+    _parse_routes = ((routing_component_floyd_t)rc)->parse_routes;
+    _to_index = ((routing_component_floyd_t)rc)->to_index;
+    
+  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
+          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
+    _parse_routes = ((routing_component_dijkstra_t)rc)->parse_routes;
+    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
+  
+  } else xbt_die("\"generic_set_route\" not supported");
+
+  src_id = xbt_dict_get_or_null(_to_index, src);
+  dst_id = xbt_dict_get_or_null(_to_index, dst);
+  
+  xbt_assert2(src_id&&dst_id,"Network elements %s or %s not found", src, dst);
+  route_name = bprintf("%d#%d",*src_id,*dst_id);
+  
+  xbt_assert2(xbt_dynar_length(route->link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);   
+  xbt_assert2(!xbt_dict_get_or_null(_parse_routes,route_name),
     "The route between \"%s\" and \"%s\" already exist",src,dst);
-  xbt_dict_set(parseroutes, route_name, route, NULL);
-  free(route_name);
+
+  xbt_dict_set(_parse_routes, route_name, route, NULL);
+  xbt_free(route_name);
 }
 
 static void generic_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {
-  DEBUG4("Full - Load ASroute from \"%s(%s)\" to \"%s(%s)\"",src,e_route->src_gateway,dst,e_route->dst_gateway);
+  DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",src,e_route->src_gateway,dst,e_route->dst_gateway);
   model_type_t modeltype = rc->routing;
-  xbt_dict_t parseroutes;
-  if(modeltype==&routing_models[SURF_MODEL_FULL])
-    parseroutes = ((routing_component_full_t)current_routing)->parse_routes;
-  else if(modeltype==&routing_models[SURF_MODEL_FLOYD])
-    parseroutes = ((routing_component_floyd_t)current_routing)->parse_routes;
-  else xbt_die("\"generic_set_autonomous_system\" not support");
+  xbt_dict_t _parse_routes;
+  xbt_dict_t _to_index;
   char *route_name;
-  route_name = bprintf("%s#%s",src,dst);
-  xbt_assert2(xbt_dynar_length(link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);   
-  xbt_assert4(!xbt_dict_get_or_null(parseroutes,route_name),
+  int *src_id, *dst_id;
+  
+  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
+    _parse_routes = ((routing_component_full_t)rc)->parse_routes;
+    _to_index = ((routing_component_full_t)rc)->to_index;
+    
+  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
+    _parse_routes = ((routing_component_floyd_t)rc)->parse_routes;
+    _to_index = ((routing_component_floyd_t)rc)->to_index;
+    
+  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
+          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
+    _parse_routes = ((routing_component_dijkstra_t)rc)->parse_routes;
+    _to_index = ((routing_component_dijkstra_t)rc)->to_index;
+  
+  } else xbt_die("\"generic_set_route\" not supported");
+  
+  src_id = xbt_dict_get_or_null(_to_index, src);
+  dst_id = xbt_dict_get_or_null(_to_index, dst);
+  
+  xbt_assert2(src_id&&dst_id,"Network elements %s or %s not found", src, dst);
+  route_name = bprintf("%d#%d",*src_id,*dst_id);
+  
+  xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);   
+  xbt_assert4(!xbt_dict_get_or_null(_parse_routes,route_name),
     "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",src,e_route->src_gateway,dst,e_route->dst_gateway);
-  xbt_dict_set(parseroutes, route_name, e_route, NULL);
-  free(route_name);
+    
+  xbt_dict_set(_parse_routes, route_name, e_route, NULL);
+  xbt_free(route_name);
+}
+
+static void generic_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {
+  DEBUG2("Load bypassRoute from \"%s\" to \"%s\"",src,dst);
+  model_type_t modeltype = rc->routing;
+  xbt_dict_t dict_bypassRoutes;
+  char *route_name;
+  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
+    dict_bypassRoutes = ((routing_component_full_t)rc)->bypassRoutes;
+  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
+    dict_bypassRoutes = ((routing_component_floyd_t)rc)->bypassRoutes;
+  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
+          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
+    dict_bypassRoutes = ((routing_component_dijkstra_t)rc)->bypassRoutes;
+  } else xbt_die("\"generic_set_bypassroute\" not supported");
+  route_name = bprintf("%s#%s",src,dst);
+  xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst);
+  xbt_assert4(!xbt_dict_get_or_null(dict_bypassRoutes,route_name),
+    "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",src,e_route->src_gateway,dst,e_route->dst_gateway);
+    
+  route_extended_t new_e_route = generic_new_extended_route(SURF_ROUTING_RECURSIVE,e_route,0);
+  xbt_dynar_free( &(e_route->generic_route.link_list) );
+  xbt_free(e_route);
+  
+  xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, (void(*)(void*))generic_free_extended_route ); 
+  xbt_free(route_name);
+}
+
+/* ************************************************************************** */
+/* *********************** GENERIC BUSINESS METHODS ************************* */
+
+static xbt_dict_t generic_get_onelink_routes (void)
+{
+  xbt_die("\"generic_get_onelink_routes\" not implemented yet");
+}
+
+static int generic_is_router (const char *name)
+{
+  xbt_die("\"generic_is_router\" not implemented yet");
+}
+
+static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst) {
+  model_type_t modeltype = rc->routing;
+  xbt_dict_t dict_bypassRoutes;
+  
+  if(modeltype==&routing_models[SURF_MODEL_FULL]) {
+    dict_bypassRoutes = ((routing_component_full_t)rc)->bypassRoutes;
+  } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) {
+    dict_bypassRoutes = ((routing_component_floyd_t)rc)->bypassRoutes;
+  } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]||
+          modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) {
+    dict_bypassRoutes = ((routing_component_dijkstra_t)rc)->bypassRoutes;
+  } else xbt_die("\"generic_get_bypassroute\" not supported");
+
+  routing_component_t src_as, dst_as;
+  int index_src, index_dst;
+  xbt_dynar_t path_src = NULL;
+  xbt_dynar_t path_dst = NULL;
+  routing_component_t current = NULL;
+  routing_component_t* current_src = NULL;
+  routing_component_t* current_dst = NULL;
+
+  /* (1) find the as where the src and dst are located */
+  src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
+  dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst); 
+  xbt_assert2(src_as&&dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found",src,dst);
+  /* (2) find the path to the root routing component */
+  path_src = xbt_dynar_new(sizeof(routing_component_t), NULL);
+  current = src_as; 
+  while( current != NULL ) {
+    xbt_dynar_push(path_src,&current);
+    current = current->routing_father;
+  }
+  path_dst = xbt_dynar_new(sizeof(routing_component_t), NULL);
+  current = dst_as; 
+  while( current != NULL ) {
+    xbt_dynar_push(path_dst,&current);
+    current = current->routing_father;
+  }
+
+  /* (3) find the common father */
+  index_src  = (path_src->used)-1;
+  index_dst  = (path_dst->used)-1;
+  current_src = xbt_dynar_get_ptr(path_src,index_src);
+  current_dst = xbt_dynar_get_ptr(path_dst,index_dst);
+  while( index_src >= 0 && index_dst >= 0 && *current_src == *current_dst ) {
+    routing_component_t *tmp_src,*tmp_dst;
+    tmp_src = xbt_dynar_pop_ptr(path_src);
+    tmp_dst = xbt_dynar_pop_ptr(path_dst);
+    index_src--;
+    index_dst--;
+    current_src = xbt_dynar_get_ptr(path_src,index_src);
+    current_dst = xbt_dynar_get_ptr(path_dst,index_dst);
+  }
+  
+  int max_index_src = (path_src->used)-1;
+  int max_index_dst = (path_dst->used)-1;
+  
+  int max_index = max(max_index_src,max_index_dst);
+  int i, max;
+ route_extended_t e_route_bypass = NULL;
+  for( max=0;max<=max_index;max++)
+  {
+    for(i=0;i<max;i++)
+    {
+      if( i <= max_index_src  && max <= max_index_dst ) {
+        char* route_name = bprintf("%s#%s",
+          (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,i)))->name,
+          (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,max)))->name);
+        e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name);
+        xbt_free(route_name);
+      }
+      if( e_route_bypass ) break;
+      if( max <= max_index_src  && i <= max_index_dst ) {
+        char* route_name = bprintf("%s#%s",
+          (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,max)))->name,
+          (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,i)))->name);
+        e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name);
+        xbt_free(route_name);
+      }
+      if( e_route_bypass ) break;
+    }
+    
+    if( e_route_bypass ) break;
+     
+    if( max <= max_index_src  && max <= max_index_dst ) {
+      char* route_name = bprintf("%s#%s",
+        (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,max)))->name,
+        (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,max)))->name);
+      e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name);
+      xbt_free(route_name);
+    }
+    if( e_route_bypass ) break;
+  }
+
+  xbt_dynar_free(&path_src);
+  xbt_dynar_free(&path_dst);
+  
+  route_extended_t new_e_route = NULL;
+  
+  if(e_route_bypass) {
+    void* link;
+    unsigned int cpt=0;
+    new_e_route = xbt_new0(s_route_extended_t,1);
+    new_e_route->src_gateway = xbt_strdup(e_route_bypass->src_gateway);
+    new_e_route->dst_gateway = xbt_strdup(e_route_bypass->dst_gateway);
+    new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL);
+    xbt_dynar_foreach(e_route_bypass->generic_route.link_list, cpt, link) {
+      xbt_dynar_push(new_e_route->generic_route.link_list,&link);
+    }
+  }
+
+  return new_e_route;
 }
 
 /* ************************************************************************** */
 /* ************************* GENERIC AUX FUNCTIONS ************************** */
 
-static route_extended_t generic_new_extended_route(routing_component_t rc, void* data) {
+static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void* data, int order) {
   
   char *link_name;
   route_extended_t e_route, new_e_route;
@@ -1216,21 +2245,18 @@ static route_extended_t generic_new_extended_route(routing_component_t rc, void*
   new_e_route->src_gateway = NULL;
   new_e_route->dst_gateway = NULL;
 
-  xbt_assert0(rc->hierarchy == SURF_ROUTING_BASE || rc->hierarchy == SURF_ROUTING_RECURSIVE,
+  xbt_assert0(hierarchy == SURF_ROUTING_BASE || hierarchy == SURF_ROUTING_RECURSIVE,
       "the hierarchy type is not defined");
   
-  if(rc->hierarchy == SURF_ROUTING_BASE ) {
+  if(hierarchy == SURF_ROUTING_BASE ) {
     
     route = (route_t)data;
     links = route->link_list;
     
-  } else if(rc->hierarchy == SURF_ROUTING_RECURSIVE ) {
+  } else if(hierarchy == SURF_ROUTING_RECURSIVE ) {
 
     e_route = (route_extended_t)data;
-    
-    // FIXME: HERE CHECK THE GATEWAY!!!!!!!!!
     xbt_assert0(e_route->src_gateway&&e_route->dst_gateway,"bad gateway, is null");
-    
     links = e_route->generic_route.link_list;
     
     /* remeber not erase the gateway names */
@@ -1244,7 +2270,12 @@ static route_extended_t generic_new_extended_route(routing_component_t rc, void*
     
     void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
     if (link)
-      xbt_dynar_push(links_id,&link);
+    {
+      if( order )
+        xbt_dynar_push(links_id,&link);
+      else
+        xbt_dynar_unshift(links_id,&link);
+    }
     else
       THROW1(mismatch_error,0,"Link %s not found", link_name);
   }
@@ -1252,1113 +2283,323 @@ static route_extended_t generic_new_extended_route(routing_component_t rc, void*
   return new_e_route;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// HERE FINISH THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
+static void generic_free_route(route_t route) {
+  if(route) {
+    xbt_dynar_free(&(route->link_list));
+    xbt_free(route);
+  }
+}
+
+static void generic_free_extended_route(route_extended_t e_route) {
+  if(e_route) {
+    xbt_dynar_free(&(e_route->generic_route.link_list));
+    if(e_route->src_gateway) xbt_free(e_route->src_gateway);
+    if(e_route->dst_gateway) xbt_free(e_route->dst_gateway);
+    xbt_free(e_route);
+  }
+}
 
-//...... DEBUG ONLY .... //
-static void print_tree(routing_component_t rc) {
-  printf("(%s %s)\n",rc->name,rc->routing->name);
-  printf("  ");
+static routing_component_t generic_as_exist(routing_component_t find_from, routing_component_t to_find) {
+  //return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK
   xbt_dict_cursor_t cursor = NULL;
   char *key;
-  int *val;  
-  if( rc->routing == &(routing_models[SURF_MODEL_FULL]) )
-  { xbt_dict_foreach(((routing_component_full_t)rc)->to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } }
-  else if( rc->routing == &(routing_models[SURF_MODEL_FLOYD]) )
-  { xbt_dict_foreach(((routing_component_floyd_t)rc)->to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } 
-  }
-  else
-      xbt_assert0(0, "Invalid model for call \"print_tree\"");
-  printf("\n");  
+  int found=0;
   routing_component_t elem;
-  xbt_dict_foreach(rc->routing_sons, cursor, key, elem) {
-    printf("<--\n");  
-    print_tree(elem);
-    printf("-->\n");
+  xbt_dict_foreach(find_from->routing_sons, cursor, key, elem) {
+    if( to_find == elem || generic_as_exist(elem,to_find) ){
+      found=1;
+      break;
+    }
   }
+  if(found) return to_find;
+  return NULL;
 }
 
-//...... DEBUG ONLY .... //
-static void print_global() {
+static routing_component_t generic_autonomous_system_exist(routing_component_t rc, char* element) {
+  //return rc; // FIXME: BYPASSERROR OF FOREACH WITH BREAK
+  routing_component_t element_as, result, elem;
   xbt_dict_cursor_t cursor = NULL;
   char *key;
-  routing_component_t elem;  
-  xbt_dict_foreach(global_routing->where_network_elements, cursor, key, elem) { printf("<%s>\n",key); }
+  element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element);
+  result = ((routing_component_t)-1);
+  if(element_as!=rc)
+    result = generic_as_exist(rc,element_as);
+  
+  int found=0;
+  if(result)
+  {
+    xbt_dict_foreach(element_as->routing_sons, cursor, key, elem) {
+      found = !strcmp(elem->name,element);
+      if( found ) break;
+    }
+    if( found ) return element_as;
+  }
+  return NULL;
 }
 
-//...... DEBUG ONLY .... //
-static void print_AS_start(void) { printf("AS!!! %s y se rutea \"%s\"\n",A_surfxml_AS_id,A_surfxml_AS_routing); }
-static void print_AS_end(void)   { printf("AS!!! %s\n",A_surfxml_AS_id); }
-static void print_host(void)     { printf("host!!! %s\n",A_surfxml_host_id); }
-static void print_link(void)     { printf("link!!! %s\n",A_surfxml_link_id); }
-static void print_route(void)    { printf("route!!! %s a %s\n",A_surfxml_route_src,A_surfxml_route_dst); }
-static void print_ctn(void)      { printf("ctn!!! %s\n",A_surfxml_link_c_ctn_id); }
+static routing_component_t generic_processing_units_exist(routing_component_t rc, char* element) {
+  routing_component_t element_as;
+  element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element);
+  if(element_as==rc) return element_as;
+  return generic_as_exist(rc,element_as);
+}
 
-//...... DEBUG ONLY .... //
-static void DEBUG_exit(void) {
-  
-  printf("-------- print tree elements -----\n");
-  print_tree(global_routing->root);
-  printf("----------------------------------\n\n");
+static void generic_src_dst_check(routing_component_t rc, const char* src, const char* dst) {
   
-  printf("-------- network_elements --------\n");
-  print_global();
-  printf("----------------------------------\n\n");
-  
-//   char* names[] = { "11.A","11.B","11.C","121.A","121.B","122.A","13.A","13.B"};
-//   int i,j,total = 8;
-
-//   printf("-- print all the example routes --\n");
-//   char* names[] = { "11.A","11.B","11.C"};
-//   int i,j,total = 3;
-
-//   char* names[] = { "141.A","141.B","143.A","143.B"};
-//   int i,j,total = 4;
+  routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src);
+  routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst);
+   
+  xbt_assert3(src_as != NULL && dst_as  != NULL, 
+      "Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",src,dst,rc->name);
+  xbt_assert4(src_as == dst_as,
+      "The src(%s in %s) and dst(%s in %s) are in differents AS",src,src_as->name,dst,dst_as->name);
+  xbt_assert2(rc == dst_as,
+      "The routing component of src and dst is not the same as the network elements belong (%s==%s)",rc->name,dst_as->name);
+}
 
-//   char* names[] = { "142.A","142.B","142.C" };
-//   int i,j,total = 3;
+static void routing_full_parse_Scluster(void)
+{
+       static int AX_ptr = 0;
+
+       char *cluster_id = A_surfxml_cluster_id;
+       char *cluster_prefix = A_surfxml_cluster_prefix;
+       char *cluster_suffix = A_surfxml_cluster_suffix;
+       char *cluster_radical = A_surfxml_cluster_radical;
+       char *cluster_power = A_surfxml_cluster_power;
+       char *cluster_bw = A_surfxml_cluster_bw;
+       char *cluster_lat = A_surfxml_cluster_lat;
+       char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
+       char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
+       char *host_id, *groups, *link_id;
+       char *router_id, *link_router, *link_backbone, *route_src_dst;
+       unsigned int iter;
+       int start, end, i;
+       xbt_dynar_t radical_elements;
+       xbt_dynar_t radical_ends;
+
+       static unsigned int surfxml_buffer_stack_stack_ptr = 1;
+       static unsigned int surfxml_buffer_stack_stack[1024];
+
+       surfxml_buffer_stack_stack[0]= 0;
+
+       surfxml_bufferstack_push(1);
+
+       DEBUG1("<AS id=\"%s\"\trouting=\"RuleBased\">",cluster_id);
+       SURFXML_BUFFER_SET(AS_id, cluster_id);
+       SURFXML_BUFFER_SET(AS_routing, "RuleBased");
+       SURFXML_START_TAG(AS);
+
+       radical_elements = xbt_str_split(cluster_radical, ",");
+       xbt_dynar_foreach(radical_elements, iter, groups)
+       {
+               radical_ends = xbt_str_split(groups, "-");
+               switch (xbt_dynar_length(radical_ends))
+               {
+                       case 1:
+                         surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
+                         host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix);
+                         link_id = bprintf("%s_link_%d", cluster_id, start);
+
+                         DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>",host_id,cluster_power);
+                         SURFXML_BUFFER_SET(host_id, host_id);
+                         SURFXML_BUFFER_SET(host_power, cluster_power);
+                         SURFXML_BUFFER_SET(host_availability, "1.0");
+                         SURFXML_BUFFER_SET(host_availability_file, "");
+                         A_surfxml_host_state = A_surfxml_host_state_ON;
+                         SURFXML_BUFFER_SET(host_state_file, "");
+                         SURFXML_BUFFER_SET(host_interference_send, "1.0");
+                         SURFXML_BUFFER_SET(host_interference_recv, "1.0");
+                         SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
+                         SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
+                         SURFXML_START_TAG(host);
+                         SURFXML_END_TAG(host);
+
+                         DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_id,cluster_bw,cluster_lat);
+                         SURFXML_BUFFER_SET(link_id, link_id);
+                         SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
+                         SURFXML_BUFFER_SET(link_latency, cluster_lat);
+                         SURFXML_BUFFER_SET(link_bandwidth_file, "");
+                         SURFXML_BUFFER_SET(link_latency_file, "");
+                         A_surfxml_link_state = A_surfxml_link_state_ON;
+                         SURFXML_BUFFER_SET(link_state_file, "");
+                         A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+                         SURFXML_START_TAG(link);
+                         SURFXML_END_TAG(link);
+
+                         break;
+
+                       case 2:
+
+                         surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *));
+                         surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
+                         DEBUG2("Create hosts and links from %d to %d",start,end);
+                         for (i = start; i <= end; i++)
+                         {
+                                 host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
+                                 link_id = bprintf("%s_link_%d", cluster_id, i);
+
+                                 DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>",host_id,cluster_power);
+                                 SURFXML_BUFFER_SET(host_id, host_id);
+                                 SURFXML_BUFFER_SET(host_power, cluster_power);
+                                 SURFXML_BUFFER_SET(host_availability, "1.0");
+                                 SURFXML_BUFFER_SET(host_availability_file, "");
+                                 A_surfxml_host_state = A_surfxml_host_state_ON;
+                                 SURFXML_BUFFER_SET(host_state_file, "");
+                                 SURFXML_BUFFER_SET(host_interference_send, "1.0");
+                                 SURFXML_BUFFER_SET(host_interference_recv, "1.0");
+                                 SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
+                                 SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
+                                 SURFXML_START_TAG(host);
+                                 SURFXML_END_TAG(host);
+
+                                 DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_id,cluster_bw,cluster_lat);
+                                 SURFXML_BUFFER_SET(link_id, link_id);
+                                 SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
+                                 SURFXML_BUFFER_SET(link_latency, cluster_lat);
+                                 SURFXML_BUFFER_SET(link_bandwidth_file, "");
+                                 SURFXML_BUFFER_SET(link_latency_file, "");
+                                 A_surfxml_link_state = A_surfxml_link_state_ON;
+                                 SURFXML_BUFFER_SET(link_state_file, "");
+                                 A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+                                 SURFXML_START_TAG(link);
+                                 SURFXML_END_TAG(link);
+                         }
+                         break;
+
+                       default:
+                               DEBUG0("Malformed radical");
+               }
+
+               xbt_dynar_free(&radical_ends);
+       }
+
+       DEBUG0(" ");
+       router_id = bprintf("%srouter%s",cluster_prefix,cluster_suffix);
+       link_router = bprintf("%s_link_router",cluster_id);
+       link_backbone = bprintf("%s_backbone",cluster_id);
+
+       DEBUG1("<router id=\"%s\"\">",router_id);
+       SURFXML_BUFFER_SET(router_id, router_id);;
+       SURFXML_START_TAG(router);
+       SURFXML_END_TAG(router);
+
+       DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_router,cluster_bw,cluster_lat);
+       SURFXML_BUFFER_SET(link_id, link_router);
+       SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
+       SURFXML_BUFFER_SET(link_latency, cluster_lat);
+       SURFXML_BUFFER_SET(link_bandwidth_file, "");
+       SURFXML_BUFFER_SET(link_latency_file, "");
+       A_surfxml_link_state = A_surfxml_link_state_ON;
+       SURFXML_BUFFER_SET(link_state_file, "");
+       A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+       SURFXML_START_TAG(link);
+       SURFXML_END_TAG(link);
+
+       DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>",link_backbone,cluster_bb_bw,cluster_bb_lat);
+       SURFXML_BUFFER_SET(link_id, link_backbone);
+       SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw);
+       SURFXML_BUFFER_SET(link_latency, cluster_bb_lat);
+       SURFXML_BUFFER_SET(link_bandwidth_file, "");
+       SURFXML_BUFFER_SET(link_latency_file, "");
+       A_surfxml_link_state = A_surfxml_link_state_ON;
+       SURFXML_BUFFER_SET(link_state_file, "");
+       A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+       SURFXML_START_TAG(link);
+       SURFXML_END_TAG(link);
+
+       char *new_suffix = bprintf("%s","");
+
+       radical_elements = xbt_str_split(cluster_suffix, ".");
+       xbt_dynar_foreach(radical_elements, iter, groups)
+       {
+                   if(strcmp(groups,""))
+                   {
+                       new_suffix = bprintf("%s\\.%s",new_suffix,groups);
+                   }
+       }
+       route_src_dst = bprintf("%s(.*)%s",cluster_prefix,new_suffix);
+
+       DEBUG0(" ");
+
+       DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\">",route_src_dst,route_src_dst);
+       SURFXML_BUFFER_SET(route_src, route_src_dst);
+       SURFXML_BUFFER_SET(route_dst, route_src_dst);
+       SURFXML_START_TAG(route);
+
+       DEBUG1("<link:ctn\tid=\"%s_link_$1src\"/>",cluster_id);
+       SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1src",cluster_id));
+       SURFXML_START_TAG(link_ctn);
+       SURFXML_END_TAG(link_ctn);
+
+       DEBUG1("<link:ctn\tid=\"%s_backbone\"/>",cluster_id);
+       SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone",cluster_id));
+       SURFXML_START_TAG(link_ctn);
+       SURFXML_END_TAG(link_ctn);
+
+       DEBUG1("<link:ctn\tid=\"%s_link_$1dst\"/>",cluster_id);
+       SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1dst",cluster_id));
+       SURFXML_START_TAG(link_ctn);
+       SURFXML_END_TAG(link_ctn);
+
+       DEBUG0("</route>");
+       SURFXML_END_TAG(route);
+
+       DEBUG0("</AS>");
+       SURFXML_END_TAG(AS);
+       DEBUG0(" ");
+
+       surfxml_bufferstack_pop(1);
+}
 
-//   const char* names[] = { "142.A","142.B","142.C", "11.A","11.B","11.C","141.A","141.B","143.A","143.B","11.A","11.B","11.C","121.A","121.B","122.A","13.A","13.B"};
-//   int i,j,total = 3+4+8+3;
+/*
+ * New methods to init the routing model component from the lua script
+ */
 
-   const char* names[] = { "11.A","11.B","11.C",
-                           "121.A","121.B",
-                           "122.A",
-                           "13.A","13.B",
-                           "141.A","141.B",
-                           "142.A","142.B","142.C",
-                           "143.A","143.B",
-                           "15.A","15.B","15.C"};
-   unsigned int i,j,total = 3+2+1+2+2+3+2+3;
+/*
+ * calling parse_S_AS_lua with lua values
+ */
+void routing_AS_init(const char* AS_id,const char* AS_routing)
+{
+       parse_S_AS_lua((char*)AS_id,(char*)AS_routing);
+}
 
-  printf("-- print all the example routes --\n");
-  xbt_dynar_t links;
-  void* link;
-  for(i=0;i<total;i++) {
-    for(j=0;j<total;j++) {
-      printf("route from %s to %s >>> ",names[i],names[j]);
-      links = (*(global_routing->get_route))(names[i],names[j]);
-      unsigned int cpt=0;
-      xbt_dynar_foreach(links, cpt, link) {
-        s_surf_resource_t* generic_resource = link;
-        printf(" %s",generic_resource->name);
-      }
-      printf("\n");
-    }
-  }
-  
-  printf("----------------------------------\n\n");
-  
-  printf("---------- call finalize ---------\n");
-  (*(global_routing->finalize))();
-  printf("----------------------------------\n");
-  
-  exit(0); 
+/*
+ * calling parse_E_AS_lua to fisnish the creation of routing component
+ */
+void routing_AS_end(const char *AS_id)
+{
+       parse_E_AS_lua((char*)AS_id);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// HERE END THE NEW CODE
-////////////////////////////////////////////////////////////////////////////////
+/*
+ * add a host to the network element list
+ */
 
-// /* ************************************************************************** */
-// /* *************************** FULL ROUTING ********************************* */
-// typedef struct {
-//   s_routing_t generic_routing;
-//   xbt_dynar_t *routing_table;
-//   void *loopback;
-//   size_t size_of_link;
-// } s_routing_full_t,*routing_full_t;
-// 
-// #define ROUTE_FULL(i,j) ((routing_full_t)used_routing)->routing_table[(i)+(j)*(used_routing)->host_count]
-// #define HOST2ROUTER(id) ((id)+(2<<29))
-// #define ROUTER2HOST(id) ((id)-(2>>29))
-// #define ISROUTER(id) ((id)>=(2<<29))
-// 
-// /*
-//  * Free the onelink routes
-//  */
-// static void onelink_route_elem_free(void *e) {
-//   s_onelink_t tmp = (s_onelink_t)e;
-//   if(tmp) {
-//     free(tmp);
-//   }
-// }
-// 
-// /*
-//  * Parsing
-//  */
-// static void routing_full_parse_Shost(void) {
-//   int *val = xbt_malloc(sizeof(int));
-//   DEBUG2("Seen host %s (#%d)",A_surfxml_host_id,used_routing->host_count);
-//   *val = used_routing->host_count++;
-//   xbt_dict_set(used_routing->host_id,A_surfxml_host_id,val,xbt_free);
-// #ifdef HAVE_TRACING
-//   TRACE_surf_host_define_id (A_surfxml_host_id, *val);
-// #endif
-// }
-// 
-// static void routing_full_parse_Srouter(void) {
-//     int *val = xbt_malloc(sizeof(int));
-//   DEBUG3("Seen router %s (%d -> #%d)",A_surfxml_router_id,used_routing->router_count,
-//             HOST2ROUTER(used_routing->router_count));
-//   *val = HOST2ROUTER(used_routing->router_count++);
-//   xbt_dict_set(used_routing->host_id,A_surfxml_router_id,val,xbt_free);
-// #ifdef HAVE_TRACING
-//   TRACE_surf_host_define_id (A_surfxml_host_id, *val);
-//   TRACE_surf_host_declaration (A_surfxml_host_id, 0);
-// #endif
-// }
-// 
-// static int src_id = -1;
-// static int dst_id = -1;
-// static void routing_full_parse_Sroute_set_endpoints(void)
-// {
-//   src_id = *(int*)xbt_dict_get(used_routing->host_id,A_surfxml_route_src);
-//   dst_id = *(int*)xbt_dict_get(used_routing->host_id,A_surfxml_route_dst);
-//   DEBUG4("Route %s %d -> %s %d",A_surfxml_route_src,src_id,A_surfxml_route_dst,dst_id);
-//   route_action = A_surfxml_route_action;
-// }
-// 
-// static void routing_full_parse_Eroute(void)
-// {
-//   char *name;
-//   if (src_id != -1 && dst_id != -1) {
-//     name = bprintf("%x#%x", src_id, dst_id);
-//     manage_route(route_table, name, route_action, 0);
-//     free(name);
-//   }
-// }
-// 
-// /* Cluster tag functions */
-// 
-// static void routing_full_parse_change_cpu_data(const char *hostName,
-//                                   const char *surfxml_host_power,
-//                                   const char *surfxml_host_availability,
-//                                   const char *surfxml_host_availability_file,
-//                                   const char *surfxml_host_state_file)
-// {
-//   int AX_ptr = 0;
-// 
-//   SURFXML_BUFFER_SET(host_id, hostName);
-//   SURFXML_BUFFER_SET(host_power, surfxml_host_power /*hostPower */ );
-//   SURFXML_BUFFER_SET(host_availability, surfxml_host_availability);
-//   SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file);
-//   SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file);
-// }
-// 
-// static void routing_full_parse_change_link_data(const char *linkName,
-//                                    const char *surfxml_link_bandwidth,
-//                                    const char *surfxml_link_bandwidth_file,
-//                                    const char *surfxml_link_latency,
-//                                    const char *surfxml_link_latency_file,
-//                                    const char *surfxml_link_state_file)
-// {
-//   int AX_ptr = 0;
-// 
-//   SURFXML_BUFFER_SET(link_id, linkName);
-//   SURFXML_BUFFER_SET(link_bandwidth, surfxml_link_bandwidth);
-//   SURFXML_BUFFER_SET(link_bandwidth_file, surfxml_link_bandwidth_file);
-//   SURFXML_BUFFER_SET(link_latency, surfxml_link_latency);
-//   SURFXML_BUFFER_SET(link_latency_file, surfxml_link_latency_file);
-//   SURFXML_BUFFER_SET(link_state_file, surfxml_link_state_file);
-// }
-// 
-// static void routing_full_parse_Scluster(void)
-// {
-//   static int AX_ptr = 0;
-// 
-//   char *cluster_id = A_surfxml_cluster_id;
-//   char *cluster_prefix = A_surfxml_cluster_prefix;
-//   char *cluster_suffix = A_surfxml_cluster_suffix;
-//   char *cluster_radical = A_surfxml_cluster_radical;
-//   char *cluster_power = A_surfxml_cluster_power;
-//   char *cluster_bw = A_surfxml_cluster_bw;
-//   char *cluster_lat = A_surfxml_cluster_lat;
-//   char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
-//   char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
-//   char *backbone_name;
-//   unsigned int it1,it2;
-//   char *name1,*name2;
-//   xbt_dynar_t names = NULL;
-//   surfxml_bufferstack_push(1);
-// 
-//   /* Make set a set to parse the prefix/suffix/radical into a neat list of names */
-//   DEBUG4("Make <set id='%s' prefix='%s' suffix='%s' radical='%s'>",
-//       cluster_id,cluster_prefix,cluster_suffix,cluster_radical);
-//   SURFXML_BUFFER_SET(set_id, cluster_id);
-//   SURFXML_BUFFER_SET(set_prefix, cluster_prefix);
-//   SURFXML_BUFFER_SET(set_suffix, cluster_suffix);
-//   SURFXML_BUFFER_SET(set_radical, cluster_radical);
-// 
-//   SURFXML_START_TAG(set);
-//   SURFXML_END_TAG(set);
-// 
-//   names = xbt_dict_get(set_list,cluster_id);
-// 
-//   xbt_dynar_foreach(names,it1,name1) {
-//     /* create the host */
-//     routing_full_parse_change_cpu_data(name1, cluster_power, "1.0", "", "");
-//     A_surfxml_host_state = A_surfxml_host_state_ON;
-// 
-//     SURFXML_START_TAG(host);
-//     SURFXML_END_TAG(host);
-// 
-//     /* Here comes the link */
-//     routing_full_parse_change_link_data(name1, cluster_bw, "", cluster_lat, "", "");
-//     A_surfxml_link_state = A_surfxml_link_state_ON;
-//     A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-// 
-//     SURFXML_START_TAG(link);
-//     SURFXML_END_TAG(link);
-//   }
-// 
-//   /* Make backbone link */
-//   backbone_name = bprintf("%s_bb", cluster_id);
-//   routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "",
-//                          "");
-//   A_surfxml_link_state = A_surfxml_link_state_ON;
-//   A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
-// 
-//   SURFXML_START_TAG(link);
-//   SURFXML_END_TAG(link);
-// 
-//   /* And now the internal routes */
-//   xbt_dynar_foreach(names,it1,name1) {
-//     xbt_dynar_foreach(names,it2,name2) {
-//       if (strcmp(name1,name2)) {
-//         A_surfxml_route_action = A_surfxml_route_action_POSTPEND;
-//         SURFXML_BUFFER_SET(route_src,name1);
-//         SURFXML_BUFFER_SET(route_dst,name2);
-//         SURFXML_START_TAG(route); {
-//           /* FIXME: name1 link is added by error about 20 lines below, so don't add it here
-//           SURFXML_BUFFER_SET(link_c_ctn_id, name1);
-//           SURFXML_START_TAG(link_c_ctn);
-//           SURFXML_END_TAG(link_c_ctn);
-//            */
-//           SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name);
-//           SURFXML_START_TAG(link_c_ctn);
-//           SURFXML_END_TAG(link_c_ctn);
-// 
-//           SURFXML_BUFFER_SET(link_c_ctn_id, name2);
-//           SURFXML_START_TAG(link_c_ctn);
-//           SURFXML_END_TAG(link_c_ctn);
-// 
-//         } SURFXML_END_TAG(route);
-//       }
-//     }
-//   }
-// 
-//   /* Make route multi with the outside world, i.e. cluster->$* */
-// 
-//   /* FIXME
-//    * This also adds an elements to the routes within the cluster,
-//    * and I guess it's wrong, but since this element is commented out in the above
-//    * code creating the internal routes, we're good.
-//    * To fix it, I'd say that we need a way to understand "$*-${cluster_id}" as "whole world, but the guys in that cluster"
-//    * But for that, we need to install a real expression parser for src/dst attributes
-//    *
-//    * FIXME
-//    * This also adds a dumb element (the private link) in place of the loopback. Then, since
-//    * the loopback is added only if no link to self already exist, this fails.
-//    * That's really dumb.
-//    *
-//    * FIXME
-//    * It seems to me that it does not add the backbone to the path to outside world...
-//    */
-//   SURFXML_BUFFER_SET(route_c_multi_src, cluster_id);
-//   SURFXML_BUFFER_SET(route_c_multi_dst, "$*");
-//   A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO;
-//   A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_PREPEND;
-// 
-//   SURFXML_START_TAG(route_c_multi);
-// 
-//   SURFXML_BUFFER_SET(link_c_ctn_id, "$src");
-// 
-//   SURFXML_START_TAG(link_c_ctn);
-//   SURFXML_END_TAG(link_c_ctn);
-// 
-//   SURFXML_END_TAG(route_c_multi);
-// 
-//   free(backbone_name);
-// 
-//   /* Restore buff */
-//   surfxml_bufferstack_pop(1);
-// }
-// 
-// 
-// static void routing_full_parse_end(void) {
-//   routing_full_t routing = (routing_full_t) used_routing;
-//   int nb_link = 0;
-//   unsigned int cpt = 0;
-//   xbt_dict_cursor_t cursor = NULL;
-//   char *key, *data, *end;
-//   const char *sep = "#";
-//   xbt_dynar_t links, keys;
-//   char *link_name = NULL;
-//   int i,j;
-// 
-//   int host_count = routing->generic_routing.host_count;
-// 
-//   /* Create the routing table */
-//   routing->routing_table = xbt_new0(xbt_dynar_t, host_count * host_count);
-//   for (i=0;i<host_count;i++)
-//     for (j=0;j<host_count;j++)
-//       ROUTE_FULL(i,j) = xbt_dynar_new(routing->size_of_link,NULL);
-// 
-//   /* Put the routes in position */
-//   xbt_dict_foreach(route_table, cursor, key, data) {
-//     nb_link = 0;
-//     links = (xbt_dynar_t) data;
-//     keys = xbt_str_split_str(key, sep);
-// 
-//     src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16);
-//     dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
-//     xbt_dynar_free(&keys);
-// 
-//     if(xbt_dynar_length(links) == 1){
-//       s_onelink_t new_link = (s_onelink_t) xbt_malloc0(sizeof(s_onelink));
-//       new_link->src_id = src_id;
-//       new_link->dst_id = dst_id;
-//       link_name = xbt_dynar_getfirst_as(links, char*);
-//       new_link->link_ptr = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-//       DEBUG3("Adding onelink route from (#%d) to (#%d), link_name %s",src_id, dst_id, link_name);
-//       xbt_dict_set(onelink_routes, link_name, (void *)new_link, onelink_route_elem_free);
-// #ifdef HAVE_TRACING
-//       TRACE_surf_link_save_endpoints (link_name, src_id, dst_id);
-// #endif
-//     }
-// 
-//     if(ISROUTER(src_id) || ISROUTER(dst_id)) {
-//                             DEBUG2("There is route with a router here: (%d ,%d)",src_id,dst_id);
-//                             /* Check there is only one link in the route and store the information */
-//                             continue;
-//     }
-// 
-//     DEBUG4("Handle %d %d (from %d hosts): %ld links",
-//         src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
-//     xbt_dynar_foreach(links, cpt, link_name) {
-//       void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-//       if (link)
-//         xbt_dynar_push(ROUTE_FULL(src_id,dst_id),&link);
-//       else
-//         THROW1(mismatch_error,0,"Link %s not found", link_name);
-//     }
-//   }
-// 
-//   /* Add the loopback if needed */
-//   for (i = 0; i < host_count; i++)
-//     if (!xbt_dynar_length(ROUTE_FULL(i, i)))
-//       xbt_dynar_push(ROUTE_FULL(i,i),&routing->loopback);
-// 
-//   /* Shrink the dynar routes (save unused slots) */
-//   for (i=0;i<host_count;i++)
-//     for (j=0;j<host_count;j++)
-//       xbt_dynar_shrink(ROUTE_FULL(i,j),0);
-// }
-// 
-// /*
-//  * Business methods
-//  */
-// static xbt_dynar_t routing_full_get_route(int src,int dst) {
-//   xbt_assert0(!(ISROUTER(src) || ISROUTER(dst)), "Ask for route \"from\" or \"to\" a router node");
-//   return ROUTE_FULL(src,dst);
-// }
-// 
-// static xbt_dict_t routing_full_get_onelink_routes(void){
-//   return onelink_routes;
-// }
-// 
-// static int routing_full_is_router(int id){
-//     return ISROUTER(id);
-// }
-// 
-// static void routing_full_finalize(void) {
-//   routing_full_t routing = (routing_full_t)used_routing;
-//   int i,j;
-// 
-//   if (routing) {
-//     for (i = 0; i < used_routing->host_count; i++)
-//       for (j = 0; j < used_routing->host_count; j++)
-//         xbt_dynar_free(&ROUTE_FULL(i, j));
-//     free(routing->routing_table);
-//     xbt_dict_free(&used_routing->host_id);
-//     xbt_dict_free(&onelink_routes);
-//     free(routing);
-//     routing=NULL;
-//   }
-// }
-// 
-// static void routing_model_full_create(size_t size_of_link,void *loopback) {
-//   /* initialize our structure */
-//   routing_full_t routing = xbt_new0(s_routing_full_t,1);
-//   routing->generic_routing.name = "Full";
-//   routing->generic_routing.host_count = 0;
-//   routing->generic_routing.get_route = routing_full_get_route;
-//   routing->generic_routing.get_onelink_routes = routing_full_get_onelink_routes;
-//   routing->generic_routing.is_router = routing_full_is_router;
-//   routing->generic_routing.finalize = routing_full_finalize;
-// 
-//   routing->size_of_link = size_of_link;
-//   routing->loopback = loopback;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-// 
-//   /* Set the dict for onehop routes */
-//   onelink_routes =  xbt_dict_new();
-// 
-//   routing->generic_routing.host_id = xbt_dict_new();
-//   
-//   /* Setup the parsing callbacks we need */
-// //   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-// //   surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter);
-// //   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_full_parse_end);
-// //   surfxml_add_callback(STag_surfxml_route_cb_list, &routing_full_parse_Sroute_set_endpoints);
-// //   surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
-// //   surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_full_parse_Scluster);
-// 
-// //   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-// //   surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter);
-//   
-// }
+void routing_add_host(const char* host_id)
+{
+       parse_S_host_lua((char*)host_id);
+}
 
-/* ************************************************************************** */
+/*
+ * Set a new link on the actual list of link for a route or ASroute
+ */
+void routing_add_link(const char* link_id)
+{
+       parse_E_link_c_ctn_new_elem_lua((char*)link_id);
+}
 
-// static void routing_shortest_path_parse_Scluster(void)
-// {
-//   static int AX_ptr = 0;
-// 
-//   char *cluster_id = A_surfxml_cluster_id;
-//   char *cluster_prefix = A_surfxml_cluster_prefix;
-//   char *cluster_suffix = A_surfxml_cluster_suffix;
-//   char *cluster_radical = A_surfxml_cluster_radical;
-//   char *cluster_power = A_surfxml_cluster_power;
-//   char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
-//   char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
-//   char *backbone_name;
-// 
-//   surfxml_bufferstack_push(1);
-// 
-//   /* Make set */
-//   SURFXML_BUFFER_SET(set_id, cluster_id);
-//   SURFXML_BUFFER_SET(set_prefix, cluster_prefix);
-//   SURFXML_BUFFER_SET(set_suffix, cluster_suffix);
-//   SURFXML_BUFFER_SET(set_radical, cluster_radical);
-// 
-//   SURFXML_START_TAG(set);
-//   SURFXML_END_TAG(set);
-// 
-//   /* Make foreach */
-//   SURFXML_BUFFER_SET(foreach_set_id, cluster_id);
-// 
-//   SURFXML_START_TAG(foreach);
-// 
-//   /* Make host for the foreach */
-//   routing_full_parse_change_cpu_data("$1", cluster_power, "1.0", "", "");
-//   A_surfxml_host_state = A_surfxml_host_state_ON;
-// 
-//   SURFXML_START_TAG(host);
-//   SURFXML_END_TAG(host);
-// 
-//   SURFXML_END_TAG(foreach);
-// 
-//   /* Make backbone link */
-//   backbone_name = bprintf("%s_bb", cluster_id);
-//   routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "",
-//                          "");
-//   A_surfxml_link_state = A_surfxml_link_state_ON;
-//   A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;
-// 
-//   SURFXML_START_TAG(link);
-//   SURFXML_END_TAG(link);
-// 
-//   free(backbone_name);
-// 
-//   /* Restore buff */
-//   surfxml_bufferstack_pop(1);
-// }
-// 
-// /* ************************************************************************** */
-// /* *************************** FLOYD ROUTING ********************************* */
-// typedef struct {
-//   s_routing_t generic_routing;
-//   int *predecessor_table;
-//   void** link_table;
-//   xbt_dynar_t last_route;
-//   void *loopback;
-//   size_t size_of_link;
-// } s_routing_floyd_t,*routing_floyd_t;
-// 
-// #define FLOYD_COST(i,j) cost_table[(i)+(j)*(used_routing)->host_count]
-// #define FLOYD_PRED(i,j) ((routing_floyd_t)used_routing)->predecessor_table[(i)+(j)*(used_routing)->host_count]
-// #define FLOYD_LINK(i,j) ((routing_floyd_t)used_routing)->link_table[(i)+(j)*(used_routing)->host_count]
-// 
-// static void routing_floyd_parse_end(void) {
-// 
-//   routing_floyd_t routing = (routing_floyd_t) used_routing;
-//   int nb_link = 0;
-//   void* link_list = NULL;
-//   double * cost_table;
-//   xbt_dict_cursor_t cursor = NULL;
-//   char *key,*data, *end;
-//   const char *sep = "#";
-//   xbt_dynar_t links, keys;
-// 
-//   unsigned int i,j;
-//   unsigned int a,b,c;
-//   int host_count = routing->generic_routing.host_count;
-//   char * link_name = NULL;
-//   void * link = NULL;
-// 
-//   /* Create Cost, Predecessor and Link tables */
-//   cost_table = xbt_new0(double, host_count * host_count); //link cost from host to host
-//   routing->predecessor_table = xbt_new0(int, host_count*host_count); //predecessor host numbers
-//   routing->link_table = xbt_new0(void*,host_count*host_count); //actual link between src and dst
-//   routing->last_route = xbt_dynar_new(routing->size_of_link, NULL);
-// 
-//   /* Initialize costs and predecessors*/
-//   for(i = 0; i<host_count;i++)
-//     for(j = 0; j<host_count;j++) {
-//         FLOYD_COST(i,j) = DBL_MAX;
-//         FLOYD_PRED(i,j) = -1;
-//     }
-// 
-//    /* Put the routes in position */
-//   xbt_dict_foreach(route_table, cursor, key, data) {
-//     nb_link = 0;
-//     links = (xbt_dynar_t)data;
-//     keys = xbt_str_split_str(key, sep);
-// 
-//     
-//     src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16);
-//     dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16);
-//     xbt_dynar_free(&keys);
-//  
-//     DEBUG4("Handle %d %d (from %d hosts): %ld links",
-//         src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
-//     xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id);
-//     
-//     link_name = xbt_dynar_getfirst_as(links, char*);
-//     link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-// 
-//     if (link)
-//       link_list = link;
-//     else
-//       THROW1(mismatch_error,0,"Link %s not found", link_name);
-//     
-// 
-//     FLOYD_LINK(src_id,dst_id) = link_list;
-//     FLOYD_PRED(src_id, dst_id) = src_id;
-// 
-//     //link cost
-//     FLOYD_COST(src_id, dst_id) = 1; // assume 1 for now
-// 
-//   }
-// 
-//     /* Add the loopback if needed */
-//   for (i = 0; i < host_count; i++)
-//     if (!FLOYD_PRED(i, i)) {
-//       FLOYD_PRED(i, i) = i;
-//       FLOYD_COST(i, i) = 1;
-//       FLOYD_LINK(i, i) = routing->loopback;
-//     }
-// 
-// 
-//   //Calculate path costs 
-// 
-//   for(c=0;c<host_count;c++) {
-//     for(a=0;a<host_count;a++) {
-//       for(b=0;b<host_count;b++) {
-//         if(FLOYD_COST(a,c) < DBL_MAX && FLOYD_COST(c,b) < DBL_MAX) {
-//           if(FLOYD_COST(a,b) == DBL_MAX || (FLOYD_COST(a,c)+FLOYD_COST(c,b) < FLOYD_COST(a,b))) {
-//             FLOYD_COST(a,b) = FLOYD_COST(a,c)+FLOYD_COST(c,b);
-//             FLOYD_PRED(a,b) = FLOYD_PRED(c,b);
-//           }
-//         }
-//       }
-//     }
-//   }
-// 
-//   //cleanup
-//   free(cost_table);
-// }
-// 
-// /*
-//  * Business methods
-//  */
-// static xbt_dynar_t routing_floyd_get_route(int src_id,int dst_id) {
-// 
-//   routing_floyd_t routing = (routing_floyd_t) used_routing;
-// 
-//   int pred = dst_id;
-//   int prev_pred = 0;
-// 
-//   xbt_dynar_reset(routing->last_route);
-// 
-//   do {
-//     prev_pred = pred;
-//     pred = FLOYD_PRED(src_id, pred);
-// 
-//     if(pred == -1) // if no pred in route -> no route to host
-//         break;
-// 
-//     xbt_dynar_unshift(routing->last_route, &FLOYD_LINK(pred,prev_pred));
-// 
-//   } while(pred != src_id);
-// 
-//   xbt_assert2(pred != -1, "no route from host %d to %d", src_id, dst_id);
-// 
-//   return routing->last_route;
-// }
-// 
-// static void routing_floyd_finalize(void) {
-//   routing_floyd_t routing = (routing_floyd_t)used_routing;
-// 
-//   if (routing) {
-//     free(routing->link_table);
-//     free(routing->predecessor_table);
-//     xbt_dynar_free(&routing->last_route);
-//     xbt_dict_free(&used_routing->host_id);
-//     free(routing);
-//     routing=NULL;
-//   }
-// }
-// 
-// static xbt_dict_t routing_floyd_get_onelink_routes(void){
-//   xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model Floyd");
-// }
-// 
-// static int routing_floyd_is_router(int id){
-//   xbt_assert0(0,"The get_is_router feature is not supported in routing model Floyd");
-// }
-// 
-// static void routing_model_floyd_create(size_t size_of_link,void *loopback) {
-//   /* initialize our structure */
-//   routing_floyd_t routing = xbt_new0(s_routing_floyd_t,1);
-//   routing->generic_routing.name = "Floyd";
-//   routing->generic_routing.host_count = 0;
-//   routing->generic_routing.host_id = xbt_dict_new();
-//   routing->generic_routing.get_route = routing_floyd_get_route;
-//   routing->generic_routing.get_onelink_routes = routing_floyd_get_onelink_routes;
-//   routing->generic_routing.is_router = routing_floyd_is_router;
-//   routing->generic_routing.finalize = routing_floyd_finalize;
-//   routing->size_of_link = size_of_link;
-//   routing->loopback = loopback;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-//   
-//   /* Setup the parsing callbacks we need */
-//   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-//   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_floyd_parse_end);
-//   surfxml_add_callback(STag_surfxml_route_cb_list, 
-//       &routing_full_parse_Sroute_set_endpoints);
-//   surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
-//   surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster);
-//   
-// }
-// 
-// /* ************************************************************************** */
-// /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */
-// typedef struct {
-//   s_routing_t generic_routing;
-//   xbt_graph_t route_graph;
-//   xbt_dict_t graph_node_map;
-//   xbt_dict_t route_cache;
-//   xbt_dynar_t last_route;
-//   int cached;
-//   void *loopback;
-//   size_t size_of_link;
-// } s_routing_dijkstra_t,*routing_dijkstra_t;
-// 
-// 
-// typedef struct graph_node_data {
-//   int id; 
-//   int graph_id; //used for caching internal graph id's
-// } s_graph_node_data_t, * graph_node_data_t;
-// 
-// typedef struct graph_node_map_element {
-//   xbt_node_t node;
-// } s_graph_node_map_element_t, * graph_node_map_element_t;
-// 
-// typedef struct route_cache_element {
-//   int * pred_arr;
-//   int size;
-// } s_route_cache_element_t, * route_cache_element_t; 
-// 
-// /*
-//  * Free functions
-//  */
-// static void route_cache_elem_free(void *e) {
-//   route_cache_element_t elm=(route_cache_element_t)e;
-// 
-//   if (elm) {
-//     free(elm->pred_arr);
-//     free(elm);
-//   }
-// }
-// 
-// static void graph_node_map_elem_free(void *e) {
-//   graph_node_map_element_t elm = (graph_node_map_element_t)e;
-// 
-//   if(elm) {
-//     free(elm);
-//   }
-// }
-// 
-// /*
-//  * Utility functions
-// */
-// static xbt_node_t route_graph_new_node(int id, int graph_id) {
-//   xbt_node_t node = NULL;
-//   graph_node_data_t data = NULL;
-//   graph_node_map_element_t elm = NULL;
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//   data = xbt_new0(struct graph_node_data, sizeof(struct graph_node_data));
-//   data->id = id;
-//   data->graph_id = graph_id;
-//   node = xbt_graph_new_node(routing->route_graph, data);
-// 
-//   elm = xbt_new0(struct graph_node_map_element, sizeof(struct graph_node_map_element));
-//   elm->node = node;
-//   xbt_dict_set_ext(routing->graph_node_map, (char*)(&id), sizeof(int), (xbt_set_elm_t)elm, &graph_node_map_elem_free);
-// 
-//   return node;
-// }
-// 
-// static graph_node_map_element_t graph_node_map_search(int id) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//   graph_node_map_element_t elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&id), sizeof(int));
-// 
-//   return elm;
-// }
-// 
-// /*
-//  * Parsing
-//  */
-// static void route_new_dijkstra(int src_id, int dst_id, void* link) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//   xbt_node_t src = NULL;
-//   xbt_node_t dst = NULL;
-//   graph_node_map_element_t src_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&src_id), sizeof(int));
-//   graph_node_map_element_t dst_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&dst_id), sizeof(int));
-// 
-//   if(src_elm)
-//     src = src_elm->node;
-// 
-//   if(dst_elm)
-//     dst = dst_elm->node;
-// 
-//   //add nodes if they don't exist in the graph
-//   if(src_id == dst_id && src == NULL && dst == NULL) {
-//     src = route_graph_new_node(src_id, -1);
-//     dst = src;
-//   } else {
-//     if(src == NULL) {
-//       src = route_graph_new_node(src_id, -1);
-//     }
-//     
-//     if(dst == NULL) {
-//       dst = route_graph_new_node(dst_id, -1);
-//     }
-//   }
-// 
-//   //add link as edge to graph
-//   xbt_graph_new_edge(routing->route_graph, src, dst, link);
-//   
-// }
-// 
-// static void add_loopback_dijkstra(void) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-// 
-//     xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
-//     
-//     xbt_node_t node = NULL;
-//     unsigned int cursor2;
-//     xbt_dynar_foreach(nodes, cursor2, node) {
-//             xbt_dynar_t out_edges = xbt_graph_node_get_outedges(node); 
-//             xbt_edge_t edge = NULL;
-//             unsigned int cursor;
-//     
-//             int found = 0;
-//             xbt_dynar_foreach(out_edges, cursor, edge) {
-//                     xbt_node_t other_node = xbt_graph_edge_get_target(edge);
-//                     if(other_node == node) {
-//                             found = 1;
-//                             break;
-//                     }
-//             }
-// 
-//             if(!found)
-//                     xbt_graph_new_edge(routing->route_graph, node, node, &routing->loopback);
-//     }
-// }
-// 
-// static void routing_dijkstra_parse_end(void) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-//   int nb_link = 0;
-//   xbt_dict_cursor_t cursor = NULL;
-//   char *key, *data, *end;
-//   const char *sep = "#";
-//   xbt_dynar_t links, keys;
-//   char* link_name = NULL;
-//   void* link = NULL;
-//   xbt_node_t node = NULL;
-//   unsigned int cursor2;
-//   xbt_dynar_t nodes = NULL;
-//   /* Create the topology graph */
-//   routing->route_graph = xbt_graph_new_graph(1, NULL);
-//   routing->graph_node_map = xbt_dict_new();
-//   routing->last_route = xbt_dynar_new(routing->size_of_link, NULL);
-//   if(routing->cached)
-//     routing->route_cache = xbt_dict_new();
-// 
-// 
-//   /* Put the routes in position */
-//   xbt_dict_foreach(route_table, cursor, key, data) {
-//     nb_link = 0;
-//     links = (xbt_dynar_t) data;
-//     keys = xbt_str_split_str(key, sep);
-// 
-//     src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16);
-//     dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16);
-//     xbt_dynar_free(&keys);
-// 
-//     DEBUG4("Handle %d %d (from %d hosts): %ld links",
-//         src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links));
-// 
-//     xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id);
-// 
-//     link_name = xbt_dynar_getfirst_as(links, char*);
-//     link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
-//     if (link)
-//       route_new_dijkstra(src_id,dst_id,link);
-//     else
-//       THROW1(mismatch_error,0,"Link %s not found", link_name);
-//     
-//   }
-// 
-//   /* Add the loopback if needed */
-//   add_loopback_dijkstra();
-// 
-//   /* initialize graph indexes in nodes after graph has been built */
-//   nodes = xbt_graph_get_nodes(routing->route_graph);
-// 
-//   xbt_dynar_foreach(nodes, cursor2, node) {
-//     graph_node_data_t data = xbt_graph_node_get_data(node);
-//     data->graph_id = cursor2;
-//   }
-// 
-// }
-// 
-// /*
-//  * Business methods
-//  */
-// static xbt_dynar_t routing_dijkstra_get_route(int src_id,int dst_id) {
-// 
-//   routing_dijkstra_t routing = (routing_dijkstra_t) used_routing;
-//   int * pred_arr = NULL;
-//   int src_node_id = 0;
-//   int dst_node_id = 0;
-//   int * nodeid = NULL;
-//   int v;
-//   int size = 0;
-//   void * link = NULL;
-//   route_cache_element_t elm = NULL;
-//   xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph);
-// 
-//   /*Use the graph_node id mapping set to quickly find the nodes */
-//   graph_node_map_element_t src_elm = graph_node_map_search(src_id);
-//   graph_node_map_element_t dst_elm = graph_node_map_search(dst_id);
-//   xbt_assert2(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", src_id, dst_id);
-//   src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id;
-//   dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id;
-// 
-//   if(routing->cached) {
-//     /*check if there is a cached predecessor list avail */
-//     elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routing->route_cache, (char*)(&src_id), sizeof(int));
-//   }
-// 
-//   if(elm) { //cached mode and cache hit
-//     pred_arr = elm->pred_arr;
-//   } else { //not cached mode or cache miss
-//     double * cost_arr = NULL;
-//     xbt_heap_t pqueue = NULL;
-//     int i = 0;
-// 
-//     int nr_nodes = xbt_dynar_length(nodes);
-//     cost_arr = xbt_new0(double, nr_nodes); //link cost from src to other hosts
-//     pred_arr = xbt_new0(int, nr_nodes); //predecessors in path from src
-//     pqueue = xbt_heap_new(nr_nodes, free);
-// 
-//     //initialize
-//     cost_arr[src_node_id] = 0.0;
-// 
-//     for(i = 0; i < nr_nodes; i++) {
-//       if(i != src_node_id) {
-//         cost_arr[i] = DBL_MAX;
-//       }
-// 
-//       pred_arr[i] = 0;
-// 
-//       //initialize priority queue
-//       nodeid = xbt_new0(int, 1);
-//       *nodeid = i;
-//       xbt_heap_push(pqueue, nodeid, cost_arr[i]);
-// 
-//     }
-// 
-//     // apply dijkstra using the indexes from the graph's node array
-//     while(xbt_heap_size(pqueue) > 0) {
-//       int * v_id = xbt_heap_pop(pqueue);
-//       xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
-//       xbt_dynar_t out_edges = xbt_graph_node_get_outedges(v_node); 
-//       xbt_edge_t edge = NULL;
-//       unsigned int cursor;
-// 
-//       xbt_dynar_foreach(out_edges, cursor, edge) {
-//         xbt_node_t u_node = xbt_graph_edge_get_target(edge);
-//         graph_node_data_t data = xbt_graph_node_get_data(u_node);
-//         int u_id = data->graph_id;
-//         int cost_v_u = 1; //fixed link cost for now
-// 
-//         if(cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) {
-//           pred_arr[u_id] = *v_id;
-//           cost_arr[u_id] = cost_v_u + cost_arr[*v_id];
-//           nodeid = xbt_new0(int, 1);
-//           *nodeid = u_id;
-//           xbt_heap_push(pqueue, nodeid, cost_arr[u_id]);
-//         }
-//       }
-// 
-//       //free item popped from pqueue
-//       free(v_id);
-//     }
-// 
-//     free(cost_arr);
-//     xbt_heap_free(pqueue);
-// 
-//   }
-// 
-//   //compose route path with links
-//   xbt_dynar_reset(routing->last_route);
-// 
-//   for(v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
-//     xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
-//     xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t);
-//     xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v);
-// 
-//     xbt_assert2(edge != NULL, "no route between host %d and %d", src_id, dst_id);
-// 
-//     link = xbt_graph_edge_get_data(edge);
-//     xbt_dynar_unshift(routing->last_route, &link);
-//     size++;
-//   }
-// 
-// 
-//   if(routing->cached && elm == NULL) {
-//     //add to predecessor list of the current src-host to cache
-//     elm = xbt_new0(struct route_cache_element, sizeof(struct route_cache_element));
-//     elm->pred_arr = pred_arr;
-//     elm->size = size;
-//     xbt_dict_set_ext(routing->route_cache, (char*)(&src_id), sizeof(int), (xbt_set_elm_t)elm, &route_cache_elem_free);
-//   }
-// 
-//   if(!routing->cached)
-//     free(pred_arr);
-// 
-//   return routing->last_route;
-// }
-// 
-// 
-// static void routing_dijkstra_finalize(void) {
-//   routing_dijkstra_t routing = (routing_dijkstra_t)used_routing;
-// 
-//   if (routing) {
-//     xbt_graph_free_graph(routing->route_graph, &free, NULL, &free);
-//     xbt_dict_free(&routing->graph_node_map);
-//     if(routing->cached)
-//       xbt_dict_free(&routing->route_cache);
-//     xbt_dynar_free(&routing->last_route);
-//     xbt_dict_free(&used_routing->host_id);
-//     free(routing);
-//     routing=NULL;
-//   }
-// }
-// 
-// static xbt_dict_t routing_dijkstraboth_get_onelink_routes(void){
-//   xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model dijkstraboth");
-// }
-// 
-// static int routing_dijkstraboth_is_router(int id){
-//   xbt_assert0(0,"The get_is_router feature is not supported in routing model dijkstraboth");
-// }
-// 
-// /*
-//  *
-//  */
-// static void routing_model_dijkstraboth_create(size_t size_of_link,void *loopback, int cached) {
-//   /* initialize our structure */
-//   routing_dijkstra_t routing = xbt_new0(s_routing_dijkstra_t,1);
-//   routing->generic_routing.name = "Dijkstra";
-//   routing->generic_routing.host_count = 0;
-//   routing->generic_routing.get_route = routing_dijkstra_get_route;
-//   routing->generic_routing.get_onelink_routes = routing_dijkstraboth_get_onelink_routes;
-//   routing->generic_routing.is_router = routing_dijkstraboth_is_router;
-//   routing->generic_routing.finalize = routing_dijkstra_finalize;
-//   routing->size_of_link = size_of_link;
-//   routing->loopback = loopback;
-//   routing->cached = cached;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-// 
-//   /* Setup the parsing callbacks we need */
-//   routing->generic_routing.host_id = xbt_dict_new();
-//   surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost);
-//   surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_dijkstra_parse_end);
-//   surfxml_add_callback(STag_surfxml_route_cb_list,
-//       &routing_full_parse_Sroute_set_endpoints);
-//   surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute);
-//   surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster);
-// }
-// 
-// static void routing_model_dijkstra_create(size_t size_of_link,void *loopback) {
-//   routing_model_dijkstraboth_create(size_of_link, loopback, 0);
-// }
-// 
-// static void routing_model_dijkstracache_create(size_t size_of_link,void *loopback) {
-//   routing_model_dijkstraboth_create(size_of_link, loopback, 1);
-// }
+/*
+ *Set the endpoints for a route
+ */
+void routing_set_route(const char* src_id,const char *dst_id)
+{
+       parse_S_route_new_and_endpoints_lua((char*)src_id,(char*)dst_id);
+}
 
-/* ************************************************** */
-/* ********** NO ROUTING **************************** */
-
-
-// static void routing_none_finalize(void) {
-//   if (used_routing) {
-//     xbt_dict_free(&used_routing->host_id);
-//     free(used_routing);
-//     used_routing=NULL;
-//   }
-// }
-// 
-// static void routing_model_none_create(size_t size_of_link,void *loopback) {
-//   routing_t routing = xbt_new0(s_routing_t,1);
-//   INFO0("Null routing");
-//   routing->name = "none";
-//   routing->host_count = 0;
-//   routing->host_id = xbt_dict_new();
-//   routing->get_onelink_routes = NULL;
-//   routing->is_router = NULL;
-//   routing->get_route = NULL;
-// 
-//   routing->finalize = routing_none_finalize;
-// 
-//   /* Set it in position */
-//   used_routing = (routing_t) routing;
-// }
+/*
+ * Store the route by calling parse_E_route_store_route
+ */
+void routing_store_route(void)
+{
+       parse_E_route_store_route();
+}