Add a test for model RuleBased.

Cause now in cluster it is model "cluster".

diff --git a/teshsuite/simdag/platforms/Two_clusters_rulebased.xml b/teshsuite/simdag/platforms/Two_clusters_rulebased.xml
new file mode 100644 (file)
index 0000000..7096f75
--- /dev/null
+++ b/teshsuite/simdag/platforms/Two_clusters_rulebased.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+
+<platform version="3">
+<AS  id="AS0"  routing="RuleBased">
+  <cluster id="my_cluster_1" prefix="c-" suffix=".me"
+        radical="0-1" power="1000000000"    bw="125000000"     lat="5E-5"
+        bb_bw="2250000000" bb_lat="5E-4"/>
+        
+  <cluster id="my_cluster_2" prefix="c-" suffix=".me"
+        radical="2-3" power="1000000000"    bw="125000000"  lat="5E-5"
+        bb_bw="2250000000" bb_lat="5E-4"/>  
+       
+     <link id="backbone" bandwidth="1250000000" latency="5E-4"/>  
+    
+     <ASroute src="my_cluster_(.*)" dst="my_cluster_(.*)" 
+     gw_src="c-my_cluster_$1src_router.me" 
+     gw_dst="c-my_cluster_$1dst_router.me">
+        <link_ctn id="backbone"/>
+     </ASroute>   
+</AS>
+</platform>

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index aacd553..207782b 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -118,4 +118,16 @@ $ ${bindir:=.}/is_router_test ./test_of_is_router.xml
 >    - Seen: "AS2" is type : 3
 >    - Seen: "AS3" is type : 3
 >    - Seen: "AS4" is type : 3
->    - Seen: "AS" is type : 3
\ No newline at end of file
+>    - Seen: "AS" is type : 3
+
+$ ${bindir:=.}/basic_parsing_test ./Two_clusters_rulebased.xml ONE_LINK
+> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
+> Workstation number: 4, link number: 8
+> Route between c-0.me and c-3.me
+> Route size 5
+>   Link my_cluster_1_link_0: latency = 0.000050, bandwidth = 125000000.000000
+>   Link my_cluster_1_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link backbone: latency = 0.000500, bandwidth = 1250000000.000000
+>   Link my_cluster_2_backbone: latency = 0.000500, bandwidth = 2250000000.000000
+>   Link my_cluster_2_link_3: latency = 0.000050, bandwidth = 125000000.000000
+> Route latency = 0.001600, route bandwidth = 125000000.000000
\ No newline at end of file