Update tesh file for name of host and router.

Remove unused "_"

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

diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
index 8b5aedc..edeeecf 100644 (file)
--- a/teshsuite/simdag/platforms/flatifier.tesh
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -4,11 +4,11 @@ $ ./flatifier one_cluster.xml
 > <!DOCTYPE platform SYSTEM "simgrid.dtd">
 > <platform version="2">
 > <AS id="AS0" routing="Full">
->   <host id="bob_0.hamburger.edu" power="1000000000"/>
->   <host id="bob_2.hamburger.edu" power="1000000000"/>
->   <host id="bob_3.hamburger.edu" power="1000000000"/>
->   <host id="bob_4.hamburger.edu" power="1000000000"/>
->   <host id="bob_6.hamburger.edu" power="1000000000"/>
+>   <host id="bob0.hamburger.edu" power="1000000000"/>
+>   <host id="bob2.hamburger.edu" power="1000000000"/>
+>   <host id="bob3.hamburger.edu" power="1000000000"/>
+>   <host id="bob4.hamburger.edu" power="1000000000"/>
+>   <host id="bob6.hamburger.edu" power="1000000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="bob_cluster_backbone" bandwidth="2250000000" latency="0.000500000"/>
 >   <link id="bob_cluster_link_0" bandwidth="125000000" latency="0.000050000"/>
@@ -17,79 +17,79 @@ $ ./flatifier one_cluster.xml
 >   <link id="bob_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_6" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_bob_cluster_router" bandwidth="125000000" latency="0.000050000"/>
->   <route src="bob_0.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_6.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob6.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_6"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_6.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob6.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_6"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_6.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob6.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_6"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_6.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob6.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_6"/>
 >   </route>
->   <route src="bob_6.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob6.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_6"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_6.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob6.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_6"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_6.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob6.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_6"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_6.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob6.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_6"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_6.hamburger.edu" dst="bob_6.hamburger.edu">
+>   <route src="bob6.hamburger.edu" dst="bob6.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_6"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_6"/>
 >   </route>
 > </AS>
@@ -320,16 +320,16 @@ $ ./flatifier two_clusters.xml
 > <!DOCTYPE platform SYSTEM "simgrid.dtd">
 > <platform version="2">
 > <AS id="AS0" routing="Full">
->   <host id="alice_0.crepe.fr" power="1000000000"/>
->   <host id="alice_1.crepe.fr" power="1000000000"/>
->   <host id="alice_2.crepe.fr" power="1000000000"/>
->   <host id="alice_3.crepe.fr" power="1000000000"/>
->   <host id="alice_4.crepe.fr" power="1000000000"/>
->   <host id="bob_0.hamburger.edu" power="1000000000"/>
->   <host id="bob_1.hamburger.edu" power="1000000000"/>
->   <host id="bob_2.hamburger.edu" power="1000000000"/>
->   <host id="bob_3.hamburger.edu" power="1000000000"/>
->   <host id="bob_4.hamburger.edu" power="1000000000"/>
+>   <host id="alice0.crepe.fr" power="1000000000"/>
+>   <host id="alice1.crepe.fr" power="1000000000"/>
+>   <host id="alice2.crepe.fr" power="1000000000"/>
+>   <host id="alice3.crepe.fr" power="1000000000"/>
+>   <host id="alice4.crepe.fr" power="1000000000"/>
+>   <host id="bob0.hamburger.edu" power="1000000000"/>
+>   <host id="bob1.hamburger.edu" power="1000000000"/>
+>   <host id="bob2.hamburger.edu" power="1000000000"/>
+>   <host id="bob3.hamburger.edu" power="1000000000"/>
+>   <host id="bob4.hamburger.edu" power="1000000000"/>
 >   <link id="__loopback__" bandwidth="498000000" latency="0.000015000" sharing_policy="FATPIPE"/>
 >   <link id="alice_cluster_backbone" bandwidth="2250000000" latency="0.000500000"/>
 >   <link id="alice_cluster_link_0" bandwidth="125000000" latency="0.000050000"/>
@@ -346,304 +346,304 @@ $ ./flatifier two_clusters.xml
 >   <link id="bob_cluster_link_3" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_4" bandwidth="125000000" latency="0.000050000"/>
 >   <link id="bob_cluster_link_bob_cluster_router" bandwidth="125000000" latency="0.000050000"/>
->   <route src="alice_0.crepe.fr" dst="alice_0.crepe.fr">
+>   <route src="alice0.crepe.fr" dst="alice0.crepe.fr">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="alice_1.crepe.fr">
+>   <route src="alice0.crepe.fr" dst="alice1.crepe.fr">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="alice_2.crepe.fr">
+>   <route src="alice0.crepe.fr" dst="alice2.crepe.fr">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="alice_3.crepe.fr">
+>   <route src="alice0.crepe.fr" dst="alice3.crepe.fr">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="alice_4.crepe.fr">
+>   <route src="alice0.crepe.fr" dst="alice4.crepe.fr">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="bob_0.hamburger.edu">
+>   <route src="alice0.crepe.fr" dst="bob0.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="bob_1.hamburger.edu">
+>   <route src="alice0.crepe.fr" dst="bob1.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="bob_2.hamburger.edu">
+>   <route src="alice0.crepe.fr" dst="bob2.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="bob_3.hamburger.edu">
+>   <route src="alice0.crepe.fr" dst="bob3.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="alice_0.crepe.fr" dst="bob_4.hamburger.edu">
+>   <route src="alice0.crepe.fr" dst="bob4.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_0"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="alice_0.crepe.fr">
+>   <route src="alice1.crepe.fr" dst="alice0.crepe.fr">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="alice_1.crepe.fr">
+>   <route src="alice1.crepe.fr" dst="alice1.crepe.fr">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="alice_2.crepe.fr">
+>   <route src="alice1.crepe.fr" dst="alice2.crepe.fr">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="alice_3.crepe.fr">
+>   <route src="alice1.crepe.fr" dst="alice3.crepe.fr">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="alice_4.crepe.fr">
+>   <route src="alice1.crepe.fr" dst="alice4.crepe.fr">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="bob_0.hamburger.edu">
+>   <route src="alice1.crepe.fr" dst="bob0.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="bob_1.hamburger.edu">
+>   <route src="alice1.crepe.fr" dst="bob1.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="bob_2.hamburger.edu">
+>   <route src="alice1.crepe.fr" dst="bob2.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="bob_3.hamburger.edu">
+>   <route src="alice1.crepe.fr" dst="bob3.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="alice_1.crepe.fr" dst="bob_4.hamburger.edu">
+>   <route src="alice1.crepe.fr" dst="bob4.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_1"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="alice_0.crepe.fr">
+>   <route src="alice2.crepe.fr" dst="alice0.crepe.fr">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="alice_1.crepe.fr">
+>   <route src="alice2.crepe.fr" dst="alice1.crepe.fr">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="alice_2.crepe.fr">
+>   <route src="alice2.crepe.fr" dst="alice2.crepe.fr">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="alice_3.crepe.fr">
+>   <route src="alice2.crepe.fr" dst="alice3.crepe.fr">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="alice_4.crepe.fr">
+>   <route src="alice2.crepe.fr" dst="alice4.crepe.fr">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="bob_0.hamburger.edu">
+>   <route src="alice2.crepe.fr" dst="bob0.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="bob_1.hamburger.edu">
+>   <route src="alice2.crepe.fr" dst="bob1.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="bob_2.hamburger.edu">
+>   <route src="alice2.crepe.fr" dst="bob2.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="bob_3.hamburger.edu">
+>   <route src="alice2.crepe.fr" dst="bob3.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="alice_2.crepe.fr" dst="bob_4.hamburger.edu">
+>   <route src="alice2.crepe.fr" dst="bob4.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_2"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="alice_0.crepe.fr">
+>   <route src="alice3.crepe.fr" dst="alice0.crepe.fr">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="alice_1.crepe.fr">
+>   <route src="alice3.crepe.fr" dst="alice1.crepe.fr">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="alice_2.crepe.fr">
+>   <route src="alice3.crepe.fr" dst="alice2.crepe.fr">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="alice_3.crepe.fr">
+>   <route src="alice3.crepe.fr" dst="alice3.crepe.fr">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="alice_4.crepe.fr">
+>   <route src="alice3.crepe.fr" dst="alice4.crepe.fr">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="bob_0.hamburger.edu">
+>   <route src="alice3.crepe.fr" dst="bob0.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="bob_1.hamburger.edu">
+>   <route src="alice3.crepe.fr" dst="bob1.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="bob_2.hamburger.edu">
+>   <route src="alice3.crepe.fr" dst="bob2.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="bob_3.hamburger.edu">
+>   <route src="alice3.crepe.fr" dst="bob3.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="alice_3.crepe.fr" dst="bob_4.hamburger.edu">
+>   <route src="alice3.crepe.fr" dst="bob4.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_3"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="alice_0.crepe.fr">
+>   <route src="alice4.crepe.fr" dst="alice0.crepe.fr">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="alice_1.crepe.fr">
+>   <route src="alice4.crepe.fr" dst="alice1.crepe.fr">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="alice_2.crepe.fr">
+>   <route src="alice4.crepe.fr" dst="alice2.crepe.fr">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="alice_3.crepe.fr">
+>   <route src="alice4.crepe.fr" dst="alice3.crepe.fr">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="alice_4.crepe.fr">
+>   <route src="alice4.crepe.fr" dst="alice4.crepe.fr">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="bob_0.hamburger.edu">
+>   <route src="alice4.crepe.fr" dst="bob0.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="bob_1.hamburger.edu">
+>   <route src="alice4.crepe.fr" dst="bob1.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="bob_2.hamburger.edu">
+>   <route src="alice4.crepe.fr" dst="bob2.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="bob_3.hamburger.edu">
+>   <route src="alice4.crepe.fr" dst="bob3.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="alice_4.crepe.fr" dst="bob_4.hamburger.edu">
+>   <route src="alice4.crepe.fr" dst="bob4.hamburger.edu">
 >     <link:ctn id="alice_cluster_link_4"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="alice_0.crepe.fr">
+>   <route src="bob0.hamburger.edu" dst="alice0.crepe.fr">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="alice_1.crepe.fr">
+>   <route src="bob0.hamburger.edu" dst="alice1.crepe.fr">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="alice_2.crepe.fr">
+>   <route src="bob0.hamburger.edu" dst="alice2.crepe.fr">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="alice_3.crepe.fr">
+>   <route src="bob0.hamburger.edu" dst="alice3.crepe.fr">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="alice_4.crepe.fr">
+>   <route src="bob0.hamburger.edu" dst="alice4.crepe.fr">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_1.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob1.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_0.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob0.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_0"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="alice_0.crepe.fr">
+>   <route src="bob1.hamburger.edu" dst="alice0.crepe.fr">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="alice_1.crepe.fr">
+>   <route src="bob1.hamburger.edu" dst="alice1.crepe.fr">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="alice_2.crepe.fr">
+>   <route src="bob1.hamburger.edu" dst="alice2.crepe.fr">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="alice_3.crepe.fr">
+>   <route src="bob1.hamburger.edu" dst="alice3.crepe.fr">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="alice_4.crepe.fr">
+>   <route src="bob1.hamburger.edu" dst="alice4.crepe.fr">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob1.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="bob_1.hamburger.edu">
+>   <route src="bob1.hamburger.edu" dst="bob1.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob1.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob1.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_1.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob1.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_1"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="alice_0.crepe.fr">
+>   <route src="bob2.hamburger.edu" dst="alice0.crepe.fr">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="alice_1.crepe.fr">
+>   <route src="bob2.hamburger.edu" dst="alice1.crepe.fr">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="alice_2.crepe.fr">
+>   <route src="bob2.hamburger.edu" dst="alice2.crepe.fr">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="alice_3.crepe.fr">
+>   <route src="bob2.hamburger.edu" dst="alice3.crepe.fr">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="alice_4.crepe.fr">
+>   <route src="bob2.hamburger.edu" dst="alice4.crepe.fr">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_1.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob1.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_2.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob2.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_2"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="alice_0.crepe.fr">
+>   <route src="bob3.hamburger.edu" dst="alice0.crepe.fr">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="alice_1.crepe.fr">
+>   <route src="bob3.hamburger.edu" dst="alice1.crepe.fr">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="alice_2.crepe.fr">
+>   <route src="bob3.hamburger.edu" dst="alice2.crepe.fr">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="alice_3.crepe.fr">
+>   <route src="bob3.hamburger.edu" dst="alice3.crepe.fr">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="alice_4.crepe.fr">
+>   <route src="bob3.hamburger.edu" dst="alice4.crepe.fr">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_1.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob1.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_3.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob3.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_3"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="alice_0.crepe.fr">
+>   <route src="bob4.hamburger.edu" dst="alice0.crepe.fr">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_0"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="alice_1.crepe.fr">
+>   <route src="bob4.hamburger.edu" dst="alice1.crepe.fr">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_1"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="alice_2.crepe.fr">
+>   <route src="bob4.hamburger.edu" dst="alice2.crepe.fr">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_2"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="alice_3.crepe.fr">
+>   <route src="bob4.hamburger.edu" dst="alice3.crepe.fr">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_3"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="alice_4.crepe.fr">
+>   <route src="bob4.hamburger.edu" dst="alice4.crepe.fr">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_bob_cluster_router"/><link:ctn id="backbone"/><link:ctn id="alice_cluster_link_alice_cluster_router"/><link:ctn id="alice_cluster_backbone"/><link:ctn id="alice_cluster_link_4"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_0.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob0.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_0"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_1.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob1.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_1"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_2.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob2.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_2"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_3.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob3.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_3"/>
 >   </route>
->   <route src="bob_4.hamburger.edu" dst="bob_4.hamburger.edu">
+>   <route src="bob4.hamburger.edu" dst="bob4.hamburger.edu">
 >     <link:ctn id="bob_cluster_link_4"/><link:ctn id="bob_cluster_backbone"/><link:ctn id="bob_cluster_link_4"/>
 >   </route>
 > </AS>