From: Frederic Suter Date: Fri, 19 Feb 2016 10:31:19 +0000 (+0100) Subject: don't declare sel-self ASRoutes X-Git-Tag: v3_13~788^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/7b03f0c8fed03945bbe5e38c1a81a4560353ba08 don't declare sel-self ASRoutes + use symmetry when possible + cosmetics --- diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml index 972231a063..34d9d92517 100644 --- a/examples/platforms/cloud.xml +++ b/examples/platforms/cloud.xml @@ -40,18 +40,10 @@ - - - - - - @@ -60,33 +52,29 @@ gw_dst="cb3-AS1_cb3_router.dc1.acloud.com" symmetrical="YES"> - - - + gw_dst="gw_dc1_horizdist" symmetrical="YES"> + gw_dst="gw_dc1_horizdist" symmetrical="YES"> + gw_dst="gw_dc1_horizdist" symmetrical="YES"> + gw_src="gw_dc1_horizdist" symmetrical="YES"> + gw_src="gw_dc1_horizdist" symmetrical="YES"> + gw_src="gw_dc1_horizdist" symmetrical="YES"> @@ -135,18 +123,10 @@ - - - - - - @@ -155,10 +135,6 @@ gw_dst="cb4-AS2_cb4_router.dc2.acloud.com" symmetrical="YES"> - - - @@ -171,10 +147,6 @@ gw_dst="cb5-AS2_cb5_router.dc2.acloud.com" symmetrical="YES"> - - - @@ -191,10 +163,6 @@ gw_dst="cb2-AS2_cb2_router.dc2.acloud.com" symmetrical="YES"> - - - @@ -215,58 +183,54 @@ gw_dst="cb3-AS2_cb3_router.dc2.acloud.com" symmetrical="YES"> - - - + gw_dst="gw_dc2_horizdist" symmetrical="YES"> + gw_dst="gw_dc2_horizdist" symmetrical="YES"> + gw_dst="gw_dc2_horizdist" symmetrical="YES"> + gw_dst="gw_dc2_horizdist" symmetrical="YES"> + gw_dst="gw_dc2_horizdist" symmetrical="YES"> + gw_dst="gw_dc2_horizdist" symmetrical="YES"> + gw_src="gw_dc2_horizdist" symmetrical="YES"> + gw_src="gw_dc2_horizdist" symmetrical="YES"> + gw_src="gw_dc2_horizdist" symmetrical="YES"> + gw_src="gw_dc2_horizdist" symmetrical="YES"> + gw_src="gw_dc2_horizdist" symmetrical="YES"> + gw_src="gw_dc2_horizdist" symmetrical="YES"> @@ -309,18 +273,10 @@ - - - - - - @@ -329,10 +285,6 @@ gw_dst="cb2-AS3_cb2_router.dc3.acloud.com" symmetrical="YES"> - - - @@ -345,42 +297,38 @@ gw_dst="cb1-AS3_cb1_router.dc3.acloud.com" symmetrical="YES"> - - - + gw_dst="gw_dc3_horizdist" symmetrical="YES"> + gw_dst="gw_dc3_horizdist" symmetrical="YES"> + gw_dst="gw_dc3_horizdist" symmetrical="YES"> + gw_dst="gw_dc3_horizdist" symmetrical="YES"> + gw_src="gw_dc3_horizdist" symmetrical="YES"> + gw_src="gw_dc3_horizdist" symmetrical="YES"> + gw_src="gw_dc3_horizdist" symmetrical="YES"> + gw_src="gw_dc3_horizdist" symmetrical="YES"> diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml index 2be1246c3e..1144f53dd1 100644 --- a/examples/platforms/data_center.xml +++ b/examples/platforms/data_center.xml @@ -41,18 +41,10 @@ - - - - - - @@ -61,10 +53,6 @@ gw_dst="cb2-cabinet2_router.dc1.acloud.com" symmetrical="YES"> - - - diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml index 45dfdd3883..7322b5ce67 100644 --- a/examples/platforms/g5k.xml +++ b/examples/platforms/g5k.xml @@ -49,43 +49,27 @@ - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + + - + - + + - + + + - @@ -101,43 +85,27 @@ - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + + - + - + + - + + - + @@ -156,59 +124,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + + + + + + + + + + + + + + - + - + + - + + - + + - + @@ -221,30 +169,18 @@ - - - - - - - - - + + - + - - - - - - + - + @@ -257,34 +193,35 @@ - - - - - - - - - + - + + - + + - + + - + + - + + + - + + - + + - + + @@ -300,19 +237,16 @@ - - - - - - - + - + + - + + + @@ -328,30 +262,18 @@ - - - - - - - - - + + - + - - - - - - + - + @@ -371,163 +293,206 @@ - - - - - - - + - - - - - - - - - - - - - - - - - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + @@ -538,30 +503,17 @@ - - - - - - - - - - - - - - - + + - + - + - + @@ -580,59 +532,38 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - + - - - - - - - - - + + - + - + + - + + - + + - + @@ -648,43 +579,27 @@ - - - - - - - - - - - - - - - - - - + + - - - - - - - + + + + + - + - + + - + + - + @@ -697,30 +612,18 @@ - - - - - - - - + - - - - - - + - + + -