From 60cde42d4472906d5a5693981107231417476906 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Wed, 17 Feb 2016 13:34:22 +0100 Subject: [PATCH] cleanup all the XML files in examples/platforms what a mess ... --- examples/platforms/bypassASroute.xml | 65 +- examples/platforms/bypassRoute.xml | 107 +- examples/platforms/cloud.xml | 638 ++++--- examples/platforms/cluster.xml | 9 +- examples/platforms/cluster_and_one_host.xml | 10 +- examples/platforms/cluster_no_backbone.xml | 11 +- examples/platforms/clusters_routing_full.xml | 28 +- examples/platforms/config.xml | 25 +- examples/platforms/config_tracing.xml | 46 +- examples/platforms/crosstraffic.xml | 19 +- examples/platforms/data_center.xml | 71 +- examples/platforms/energy_platform.xml | 23 +- examples/platforms/fat_tree_cluster.xml | 16 +- examples/platforms/g5k.xml | 1496 ++++++++--------- examples/platforms/griffon.xml | 59 +- examples/platforms/meta_cluster.xml | 37 +- examples/platforms/multicore_machine.xml | 10 +- examples/platforms/prop.xml | 81 +- examples/platforms/routing_cluster.xml | 9 +- examples/platforms/routing_none.xml | 5 +- examples/platforms/simulacrum_7_hosts.xml | 96 +- examples/platforms/small_platform.xml | 93 +- examples/platforms/small_platform_fatpipe.xml | 34 +- .../small_platform_one_link_routes.xml | 112 +- .../small_platform_with_failures.xml | 95 +- .../platforms/small_platform_with_routers.xml | 129 +- examples/platforms/torus_cluster.xml | 5 +- examples/platforms/two_hosts_platform.xml | 2 +- .../platforms/two_hosts_platform_shared.xml | 25 +- .../two_hosts_platform_with_availability.xml | 16 +- ...ts_platform_with_availability_included.xml | 17 +- examples/platforms/two_peers.xml | 18 +- examples/platforms/vivaldi.xml | 89 +- 33 files changed, 1659 insertions(+), 1837 deletions(-) diff --git a/examples/platforms/bypassASroute.xml b/examples/platforms/bypassASroute.xml index 4f33d9c2bb..dacf416023 100644 --- a/examples/platforms/bypassASroute.xml +++ b/examples/platforms/bypassASroute.xml @@ -1,46 +1,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/bypassRoute.xml b/examples/platforms/bypassRoute.xml index ce6eca8f60..ae2a0e88b5 100644 --- a/examples/platforms/bypassRoute.xml +++ b/examples/platforms/bypassRoute.xml @@ -1,58 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/cloud.xml b/examples/platforms/cloud.xml index b869da7444..972231a063 100644 --- a/examples/platforms/cloud.xml +++ b/examples/platforms/cloud.xml @@ -2,299 +2,387 @@ - + - - - - - - - + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + - - + + + + + + - - + + + + + + + + - - + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + - - + + + + - - + + + + + + + + - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/cluster.xml b/examples/platforms/cluster.xml index 4a8ad9f8e8..a67462865a 100644 --- a/examples/platforms/cluster.xml +++ b/examples/platforms/cluster.xml @@ -5,15 +5,12 @@ | | | router | ____________|__________|_____________ backbone - | | | | | | - l0| l1| l2| l97| l96 | | l99 + | | | | | | + l0| l1| l2| l97| l96 | | l99 | | | ........ | | | | | node-0.acme.org node-99.acme.org --> - diff --git a/examples/platforms/cluster_and_one_host.xml b/examples/platforms/cluster_and_one_host.xml index 3e1cd55e7c..73004fc3c5 100644 --- a/examples/platforms/cluster_and_one_host.xml +++ b/examples/platforms/cluster_and_one_host.xml @@ -2,8 +2,7 @@ - @@ -11,10 +10,7 @@ - - - - + + diff --git a/examples/platforms/cluster_no_backbone.xml b/examples/platforms/cluster_no_backbone.xml index d600a790c2..5ae99e445d 100644 --- a/examples/platforms/cluster_no_backbone.xml +++ b/examples/platforms/cluster_no_backbone.xml @@ -1,21 +1,18 @@ - - - - + + diff --git a/examples/platforms/clusters_routing_full.xml b/examples/platforms/clusters_routing_full.xml index 14e63bf86e..6e897bd44e 100644 --- a/examples/platforms/clusters_routing_full.xml +++ b/examples/platforms/clusters_routing_full.xml @@ -1,14 +1,13 @@ - + c-10.me c-19.me --> - + - + - + - - - + + + diff --git a/examples/platforms/config.xml b/examples/platforms/config.xml index 66622fa403..4dae60f6c8 100644 --- a/examples/platforms/config.xml +++ b/examples/platforms/config.xml @@ -1,28 +1,23 @@ - - - - - - - + + + + + + - + - + - - - - - - + + diff --git a/examples/platforms/config_tracing.xml b/examples/platforms/config_tracing.xml index 55d9a8b547..360bc57a26 100644 --- a/examples/platforms/config_tracing.xml +++ b/examples/platforms/config_tracing.xml @@ -1,7 +1,6 @@ - @@ -12,8 +11,7 @@ - - + @@ -33,41 +31,21 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - diff --git a/examples/platforms/crosstraffic.xml b/examples/platforms/crosstraffic.xml index 385b1ce3bd..ef00680108 100644 --- a/examples/platforms/crosstraffic.xml +++ b/examples/platforms/crosstraffic.xml @@ -1,25 +1,16 @@ - - + - - - - - - - - + + diff --git a/examples/platforms/data_center.xml b/examples/platforms/data_center.xml index 8c5dfe166d..2be1246c3e 100644 --- a/examples/platforms/data_center.xml +++ b/examples/platforms/data_center.xml @@ -2,19 +2,21 @@ - + - - - - + + - + + + + - - @@ -23,43 +25,46 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - + + - - - + + + + + + + + + + + + + + + + diff --git a/examples/platforms/energy_platform.xml b/examples/platforms/energy_platform.xml index 7f7ddb024b..adc1353681 100644 --- a/examples/platforms/energy_platform.xml +++ b/examples/platforms/energy_platform.xml @@ -1,28 +1,29 @@ - + - + - - - - + + + + - - + + - - + + - diff --git a/examples/platforms/fat_tree_cluster.xml b/examples/platforms/fat_tree_cluster.xml index e15071f354..7ab17e7a1a 100644 --- a/examples/platforms/fat_tree_cluster.xml +++ b/examples/platforms/fat_tree_cluster.xml @@ -1,18 +1,14 @@ - +This is taken from figure 1/ b/ of the paper "D-Mod-K Routing Providing on-Blocking Traffic for Shift Permutations on +Real Life Fat Trees" available at webee.technion.ac.il/publication-link/index/id/574 +This defines a two levels fat-tree, with 4 leaf switches connected to 4 nodes each and 2 core switches connected to +each leaf switch by two cables --> - + diff --git a/examples/platforms/g5k.xml b/examples/platforms/g5k.xml index 3e0d3480cc..45dfdd3883 100644 --- a/examples/platforms/g5k.xml +++ b/examples/platforms/g5k.xml @@ -1,752 +1,752 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/griffon.xml b/examples/platforms/griffon.xml index 9ea724a776..2e947001ba 100644 --- a/examples/platforms/griffon.xml +++ b/examples/platforms/griffon.xml @@ -1,39 +1,34 @@ - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + diff --git a/examples/platforms/meta_cluster.xml b/examples/platforms/meta_cluster.xml index 67ddb05347..4e4e36ab70 100644 --- a/examples/platforms/meta_cluster.xml +++ b/examples/platforms/meta_cluster.xml @@ -1,40 +1,29 @@ - - - - - - + + + + - + - - - - + + + + - + - - + + - - + diff --git a/examples/platforms/multicore_machine.xml b/examples/platforms/multicore_machine.xml index e865d1d59e..93134dc42b 100644 --- a/examples/platforms/multicore_machine.xml +++ b/examples/platforms/multicore_machine.xml @@ -1,9 +1,7 @@ - - - - - - + + + + diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml index 3eaa3d539a..645f7f38ae 100644 --- a/examples/platforms/prop.xml +++ b/examples/platforms/prop.xml @@ -1,57 +1,46 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + + diff --git a/examples/platforms/routing_cluster.xml b/examples/platforms/routing_cluster.xml index 3c502a5a29..adc51cf214 100644 --- a/examples/platforms/routing_cluster.xml +++ b/examples/platforms/routing_cluster.xml @@ -1,7 +1,6 @@ - - - @@ -55,10 +52,8 @@ l1_up / / l1_down | l3 l2_up\ \ l2_down l4_up / / l4_down | l6 l5_up\ \ - + - + diff --git a/examples/platforms/routing_none.xml b/examples/platforms/routing_none.xml index 28193525fb..01da662b46 100644 --- a/examples/platforms/routing_none.xml +++ b/examples/platforms/routing_none.xml @@ -1,10 +1,7 @@ - - - + diff --git a/examples/platforms/simulacrum_7_hosts.xml b/examples/platforms/simulacrum_7_hosts.xml index 6276deaa85..6563df4ab4 100644 --- a/examples/platforms/simulacrum_7_hosts.xml +++ b/examples/platforms/simulacrum_7_hosts.xml @@ -1,9 +1,8 @@ - - @@ -14,15 +13,14 @@ - + - + @@ -37,70 +35,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/small_platform.xml b/examples/platforms/small_platform.xml index 038076f981..55f991c8e1 100644 --- a/examples/platforms/small_platform.xml +++ b/examples/platforms/small_platform.xml @@ -1,60 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/small_platform_fatpipe.xml b/examples/platforms/small_platform_fatpipe.xml index 6b08c56446..c810aa9d8f 100644 --- a/examples/platforms/small_platform_fatpipe.xml +++ b/examples/platforms/small_platform_fatpipe.xml @@ -1,24 +1,20 @@ - - - - - - - - + + + + + - - - - + + + + - - - - - - - + + + + + + diff --git a/examples/platforms/small_platform_one_link_routes.xml b/examples/platforms/small_platform_one_link_routes.xml index 40d0bb820b..e1d93cb353 100644 --- a/examples/platforms/small_platform_one_link_routes.xml +++ b/examples/platforms/small_platform_one_link_routes.xml @@ -1,78 +1,44 @@ - - - + + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/small_platform_with_failures.xml b/examples/platforms/small_platform_with_failures.xml index f3fd3ca983..47b0cceda6 100644 --- a/examples/platforms/small_platform_with_failures.xml +++ b/examples/platforms/small_platform_with_failures.xml @@ -1,61 +1,40 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/platforms/small_platform_with_routers.xml b/examples/platforms/small_platform_with_routers.xml index d62e954573..1310835706 100644 --- a/examples/platforms/small_platform_with_routers.xml +++ b/examples/platforms/small_platform_with_routers.xml @@ -1,79 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/examples/platforms/torus_cluster.xml b/examples/platforms/torus_cluster.xml index f8bcd8675e..a0bec806d4 100644 --- a/examples/platforms/torus_cluster.xml +++ b/examples/platforms/torus_cluster.xml @@ -2,8 +2,7 @@ - + diff --git a/examples/platforms/two_hosts_platform.xml b/examples/platforms/two_hosts_platform.xml index c5825e2d37..b78490919b 100644 --- a/examples/platforms/two_hosts_platform.xml +++ b/examples/platforms/two_hosts_platform.xml @@ -5,6 +5,6 @@ - + diff --git a/examples/platforms/two_hosts_platform_shared.xml b/examples/platforms/two_hosts_platform_shared.xml index f3bbd656a4..3d93800ed8 100644 --- a/examples/platforms/two_hosts_platform_shared.xml +++ b/examples/platforms/two_hosts_platform_shared.xml @@ -1,19 +1,14 @@ - - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/examples/platforms/two_hosts_platform_with_availability.xml b/examples/platforms/two_hosts_platform_with_availability.xml index 3023615c4f..5012186bf8 100644 --- a/examples/platforms/two_hosts_platform_with_availability.xml +++ b/examples/platforms/two_hosts_platform_with_availability.xml @@ -1,12 +1,10 @@ - - - - - - - - - + + + + + + + diff --git a/examples/platforms/two_hosts_platform_with_availability_included.xml b/examples/platforms/two_hosts_platform_with_availability_included.xml index efa7973dfe..6a9dd8a9aa 100644 --- a/examples/platforms/two_hosts_platform_with_availability_included.xml +++ b/examples/platforms/two_hosts_platform_with_availability_included.xml @@ -1,7 +1,6 @@ - 0.0 1.0 11.0 0.5 @@ -16,13 +15,15 @@ 10.0 0.8 20.0 0.4 - - - - - - + + + + + + + + - + diff --git a/examples/platforms/two_peers.xml b/examples/platforms/two_peers.xml index 3da4b1862a..7bd805cf99 100644 --- a/examples/platforms/two_peers.xml +++ b/examples/platforms/two_peers.xml @@ -1,20 +1,8 @@ - - - - - + + + diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml index 09b4c140a1..2f3a4fb14f 100644 --- a/examples/platforms/vivaldi.xml +++ b/examples/platforms/vivaldi.xml @@ -1,50 +1,49 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.20.1