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 5cf9a15..4d886d3 100644 (file)
--- 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 3308cff..1d86eeb 100644 (file)
--- 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 6cbf0e1..a524e32 100644 (file)
--- 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 c9b02a7..2a2894a 100644 (file)
--- 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 94164ea..d37c1cf 100644 (file)
--- 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 793710b..3a54ba2 100644 (file)
--- 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 99c8bf6..cd37001 100644 (file)
--- 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 a595dba..c84c3cc 100644 (file)
--- 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 450fbfc..21dbf00 100644 (file)
--- 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 0d925a4..4fe4e54 100644 (file)
--- 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 a3aba24..49b922d 100644 (file)
--- 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 4be86a8..b2c52e4 100644 (file)
--- 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>