From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 11 Oct 2010 12:31:24 +0000 (+0000)
Subject: Remove the "_" from hostname and routername to Tag cluster.
X-Git-Tag: v3_5~426
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0891bb811cbad72a36e0aa215ab5ea6cb1a73640?ds=sidebyside

Remove the "_" from hostname and routername to Tag cluster.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8398 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index bf91cae7c9..51cc7f2a3b 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -2969,7 +2969,7 @@ static void routing_full_parse_Scluster(void)
     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);
+      host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix);
 #ifndef HAVE_PCRE_LIB
       xbt_dynar_push_as(tab_elements_num, int, start);
 #endif
@@ -3007,7 +3007,7 @@ static void routing_full_parse_Scluster(void)
       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);
+        host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
 #ifndef HAVE_PCRE_LIB
         xbt_dynar_push_as(tab_elements_num, int, i);
 #endif
@@ -3048,7 +3048,7 @@ static void routing_full_parse_Scluster(void)
 
   DEBUG0(" ");
   router_id =
-      bprintf("%s_%s_router%s", cluster_prefix, cluster_id,
+      bprintf("%s%s_router%s", cluster_prefix, cluster_id,
               cluster_suffix);
   link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
   link_backbone = bprintf("%s_backbone", cluster_id);
@@ -3092,7 +3092,7 @@ static void routing_full_parse_Scluster(void)
       new_suffix = bprintf("%s\\.%s", new_suffix, groups);
     }
   }
-  route_src_dst = bprintf("%s_(.*)%s", cluster_prefix, new_suffix);
+  route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix);
 
   DEBUG0(" ");
 
@@ -3127,7 +3127,7 @@ static void routing_full_parse_Scluster(void)
         route_src = router_id;
       } else {
         route_src =
-            bprintf("%s_%d%s", cluster_prefix,
+            bprintf("%s%d%s", cluster_prefix,
                     xbt_dynar_get_as(tab_elements_num, i, int),
                     cluster_suffix);
       }
@@ -3136,7 +3136,7 @@ static void routing_full_parse_Scluster(void)
         route_dst = router_id;
       } else {
         route_dst =
-            bprintf("%s_%d%s", cluster_prefix,
+            bprintf("%s%d%s", cluster_prefix,
                     xbt_dynar_get_as(tab_elements_num, j, int),
                     cluster_suffix);
       }
diff --git a/teshsuite/simdag/platforms/two_clusters.xml b/teshsuite/simdag/platforms/two_clusters.xml
index 91c760cc94..c47ee3bc69 100644
--- a/teshsuite/simdag/platforms/two_clusters.xml
+++ b/teshsuite/simdag/platforms/two_clusters.xml
@@ -19,10 +19,14 @@
        
      <link id="backbone" bandwidth="1250000000" latency="5E-4"/>  
  	
-     <ASroute src="bob_cluster" dst="alice_cluster" gw_src="bob_bob_cluster_router.hamburger.edu" gw_dst="alice_alice_cluster_router.crepe.fr">
+     <ASroute src="bob_cluster" dst="alice_cluster" 
+	 gw_src="bobbob_cluster_router.hamburger.edu" 
+	 gw_dst="alicealice_cluster_router.crepe.fr">
  		<link_ctn id="backbone"/>
      </ASroute>   
-     <ASroute src="alice_cluster" dst="bob_cluster" gw_src="alice_alice_cluster_router.crepe.fr" gw_dst="bob_bob_cluster_router.hamburger.edu">
+     <ASroute src="alice_cluster" dst="bob_cluster" 
+	 gw_src="alicealice_cluster_router.crepe.fr" 
+	 gw_dst="bobbob_cluster_router.hamburger.edu">
  		<link_ctn id="backbone"/>
      </ASroute>   
      
diff --git a/teshsuite/simdag/platforms/two_clusters_one_name.xml b/teshsuite/simdag/platforms/two_clusters_one_name.xml
index b4156ba869..db526b2ef8 100644
--- a/teshsuite/simdag/platforms/two_clusters_one_name.xml
+++ b/teshsuite/simdag/platforms/two_clusters_one_name.xml
@@ -16,16 +16,16 @@
 	 <ASroute 
 	 src="bob_cluster" 
 	 dst="bob_cluster_1" 
-	 gw_src="bob_bob_cluster_router.hamburger.edu" 
-	 gw_dst="bob_bob_cluster_1_router.hamburger.edu">
+	 gw_src="bobbob_cluster_router.hamburger.edu" 
+	 gw_dst="bobbob_cluster_1_router.hamburger.edu">
  		<link_ctn id="backbone"/>
      </ASroute>  
 	  
 	 <ASroute 
 	 src="bob_cluster_1" 
 	 dst="bob_cluster" 
-	 gw_src="bob_bob_cluster_1_router.hamburger.edu" 
-	 gw_dst="bob_bob_cluster_router.hamburger.edu">
+	 gw_src="bobbob_cluster_1_router.hamburger.edu" 
+	 gw_dst="bobbob_cluster_router.hamburger.edu">
  		<link_ctn id="backbone"/>
      </ASroute>