Don't test features that are impossible to get right

[simgrid.git] / examples / platforms / griffon.xml

diff --git a/examples/platforms/griffon.xml b/examples/platforms/griffon.xml
index 2e94700..8aeb176 100644 (file)
--- a/examples/platforms/griffon.xml
+++ b/examples/platforms/griffon.xml
@@ -1,34 +1,33 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-<AS id="AS_griffon"  routing="Full">
-  <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="1-29,58,59,60" speed="286.087kf" bw="125MBps" lat="24us"
-           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
-  <cluster id="griffon_cluster_cabinet2" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="30-57" speed="286.087kf" bw="125MBps" lat="24us" 
-           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
-  <cluster id="griffon_cluster_cabinet3" prefix="griffon-" suffix=".nancy.grid5000.fr"
-           radical="61-92" speed="286.087kf" bw="125MBps" lat="24us" 
-           bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+<platform version="4.1">
+  <zone id="AS_griffon"  routing="Full">
+    <cluster id="griffon_cluster_cabinet1" prefix="griffon-" suffix=".nancy.grid5000.fr"
+             radical="1-29,58,59,60" speed="286.087kf" bw="125MBps" lat="24us"
+             bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+    <cluster id="griffon_cluster_cabinet2" prefix="griffon-" suffix=".nancy.grid5000.fr"
+             radical="30-57" speed="286.087kf" bw="125MBps" lat="24us" 
+             bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
+    <cluster id="griffon_cluster_cabinet3" prefix="griffon-" suffix=".nancy.grid5000.fr"
+             radical="61-92" speed="286.087kf" bw="125MBps" lat="24us" 
+             bb_bw="1.25GBps" bb_lat="0" sharing_policy="FULLDUPLEX" bb_sharing_policy="SHARED"/>
 
-  <link id="backbone" bandwidth="1.25GBps" latency="24us" sharing_policy="SHARED"/>
+    <link id="backbone" bandwidth="1.25GBps" latency="24us" sharing_policy="SHARED"/>
 
-  <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet2" 
-           gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
-           gw_dst="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr" symmetrical="YES">
-    <link_ctn id="backbone"/>
-  </ASroute>
-  <ASroute src="griffon_cluster_cabinet2" dst="griffon_cluster_cabinet3" 
-           gw_src="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr"
-           gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr" symmetrical="YES">
-    <link_ctn id="backbone"/>
-  </ASroute>
-  <ASroute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet3" 
-           gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
-           gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr" symmetrical="YES">
-    <link_ctn id="backbone"/>
-  </ASroute>
-</AS>
+    <zoneRoute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet2" 
+             gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
+             gw_dst="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+    <zoneRoute src="griffon_cluster_cabinet2" dst="griffon_cluster_cabinet3" 
+             gw_src="griffon-griffon_cluster_cabinet2_router.nancy.grid5000.fr"
+           gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+    <zoneRoute src="griffon_cluster_cabinet1" dst="griffon_cluster_cabinet3" 
+             gw_src="griffon-griffon_cluster_cabinet1_router.nancy.grid5000.fr"
+             gw_dst="griffon-griffon_cluster_cabinet3_router.nancy.grid5000.fr">
+      <link_ctn id="backbone"/>
+    </zoneRoute>
+  </zone>
 </platform>
-