From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 28 Sep 2010 08:54:16 +0000 (+0000)
Subject: Update xml platform for msg-get_sender and msg-trace tests.
X-Git-Tag: v3_5~550
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8999903f751a21a2e3b9efd41aeccb94bae15e4d?hp=babcaca9b7d0b6528fdd15b97625c440378a34c9

Update xml platform for msg-get_sender and msg-trace tests.

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

diff --git a/examples/msg/trace/test1.xml b/examples/msg/trace/test1.xml
index 5cf9a153a0..4d886d3d4d 100644
--- a/examples/msg/trace/test1.xml
+++ b/examples/msg/trace/test1.xml
@@ -1,7 +1,9 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
+  <AS  id="AS0"  routing="Full">
   <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+  </AS>
   <process host="CPU1" function="test_trace" start_time="10">
   	<argument value="400"/>
   	<argument value="1.0"/>
diff --git a/examples/msg/trace/test10.xml b/examples/msg/trace/test10.xml
index 3308cff1cc..1d86eeb65b 100644
--- a/examples/msg/trace/test10.xml
+++ b/examples/msg/trace/test10.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+	  <AS  id="AS0"  routing="Full">
+   <host id="CPU1" power="20" availability_file="trace/file.trace"/> 	
+  </AS>
+
   <process host="CPU1" function="test_trace">
   	<argument value="420"/>
   	<argument value="2.0"/>
diff --git a/examples/msg/trace/test11.xml b/examples/msg/trace/test11.xml
index 6cbf0e1d6b..a524e3264c 100644
--- a/examples/msg/trace/test11.xml
+++ b/examples/msg/trace/test11.xml
@@ -12,8 +12,10 @@
 50  0.5
 60  0.5
 </trace>
+  <AS  id="AS0"  routing="Full">
+ <host id="CPU1" power="20"/> 	
+  </AS>
 
-<host id="CPU1" power="20"/>
 <trace:connect kind="POWER" trace="1" element="CPU1"/>
 <process host="CPU1" function="test_trace">
 <argument value="420"/>
diff --git a/examples/msg/trace/test2.xml b/examples/msg/trace/test2.xml
index c9b02a7fc5..2a2894ad21 100644
--- a/examples/msg/trace/test2.xml
+++ b/examples/msg/trace/test2.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+  <AS  id="AS0"  routing="Full">
+   <host id="CPU1" power="20" availability_file="trace/file.trace"/> 	
+  </AS>
+
   <process host="CPU1" function="test_trace" start_time="10">
   	<argument value="850"/>
   	<argument value="1.0"/>
diff --git a/examples/msg/trace/test3.xml b/examples/msg/trace/test3.xml
index 94164ea1a0..d37c1cf3c5 100644
--- a/examples/msg/trace/test3.xml
+++ b/examples/msg/trace/test3.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+	  <AS  id="AS0"  routing="Full">
+  	  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+  </AS>
+
   <process host="CPU1" function="test_trace" start_time="10">
   	<argument value="1980"/>
   	<argument value="1.0"/>
diff --git a/examples/msg/trace/test4.xml b/examples/msg/trace/test4.xml
index 793710b025..3a54ba2da4 100644
--- a/examples/msg/trace/test4.xml
+++ b/examples/msg/trace/test4.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+	  <AS  id="AS0"  routing="Full">
+  <host id="CPU1" power="20" availability_file="trace/file.trace"/>  	
+  </AS>
+
   <process host="CPU1" function="test_trace" start_time="80">
   	<argument value="400"/>
   	<argument value="1.0"/>
diff --git a/examples/msg/trace/test5.xml b/examples/msg/trace/test5.xml
index 99c8bf6d25..cd37001ad7 100644
--- a/examples/msg/trace/test5.xml
+++ b/examples/msg/trace/test5.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+	  <AS  id="AS0"  routing="Full">
+   <host id="CPU1" power="20" availability_file="trace/file.trace"/> 	
+  </AS>
+
   <process host="CPU1" function="test_trace" start_time="90">
   	<argument value="850"/>
   	<argument value="1.0"/>
diff --git a/examples/msg/trace/test6.xml b/examples/msg/trace/test6.xml
index a595dba377..c84c3cc32e 100644
--- a/examples/msg/trace/test6.xml
+++ b/examples/msg/trace/test6.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+	  <AS  id="AS0"  routing="Full">
+  	  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+  </AS>
+
   <process host="CPU1" function="test_trace" start_time="80">
   	<argument value="1980"/>
   	<argument value="1.0"/>
diff --git a/examples/msg/trace/test7.xml b/examples/msg/trace/test7.xml
index 450fbfc243..21dbf00787 100644
--- a/examples/msg/trace/test7.xml
+++ b/examples/msg/trace/test7.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+	  <AS  id="AS0"  routing="Full">
+  <host id="CPU1" power="20" availability_file="trace/file.trace"/>  	
+  </AS>
+
   <process host="CPU1" function="test_trace" start_time="10">
   	<argument value="400"/>
   	<argument value="1.5"/>
diff --git a/examples/msg/trace/test8.xml b/examples/msg/trace/test8.xml
index 0d925a40ba..4fe4e5412a 100644
--- a/examples/msg/trace/test8.xml
+++ b/examples/msg/trace/test8.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+<AS  id="AS0"  routing="Full">
+  <host id="CPU1" power="20" availability_file="trace/file.trace"/>  	
+  </AS>
+
   <process host="CPU1" function="test_trace" start_time="10">
   	<argument value="400"/>
   	<argument value="2.5"/>
diff --git a/examples/msg/trace/test9.xml b/examples/msg/trace/test9.xml
index a3aba24dab..49b922d950 100644
--- a/examples/msg/trace/test9.xml
+++ b/examples/msg/trace/test9.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0'?>
 <!DOCTYPE platform SYSTEM "simgrid.dtd">
 <platform version="2">
-  <host id="CPU1" power="20" availability_file="trace/file.trace"/>
+  <AS  id="AS0"  routing="Full">
+  	<host id="CPU1" power="20" availability_file="trace/file.trace"/>
+  </AS>
+  
   <process host="CPU1" function="test_trace">
   	<argument value="400"/>
   	<argument value="1.0"/>
diff --git a/teshsuite/msg/get_sender.xml b/teshsuite/msg/get_sender.xml
index 4be86a81bd..b2c52e41d8 100644
--- a/teshsuite/msg/get_sender.xml
+++ b/teshsuite/msg/get_sender.xml
@@ -1,15 +1,14 @@
 <?xml version='1.0'?>
  <!DOCTYPE platform SYSTEM "simgrid.dtd">
  <platform version="2">
- <AS  id="AS0"  routing="Full">
    <!-- Platform -->
-   
+ <AS  id="AS0"  routing="Full">
    <host id="toto" power="1000000"/>
    <link id="lb" bandwidth="100000000" latency="0.000000"/>
-   <route src="toto" dst="toto"><link:ctn id="lb"/></route>
+   <route src="toto" dst="toto"><link:ctn id="lb"/></route>  	
+  </AS>  
    
    <!-- Deployment -->
    <process host="toto" function="send"/>
    <process host="toto" function="receive"/>
- </AS>
  </platform>