Improved test of GTNets model.

[simgrid.git] / examples / msg / gtnets / dogbone-p.xml

diff --git a/examples/msg/gtnets/dogbone-p.xml b/examples/msg/gtnets/dogbone-p.xml
index 3b0f7ca..5621630 100644 (file)
--- a/examples/msg/gtnets/dogbone-p.xml
+++ b/examples/msg/gtnets/dogbone-p.xml
@@ -1,67 +1,65 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform_description SYSTEM "surfxml.dtd">
-<!--- 
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="2"><!--- 
   dogbone
 -->
 
-<platform_description version="1">
-  <cpu name="S1" power="1000000000"/>
-  <cpu name="C1" power="1000000000"/>
-  <cpu name="S2" power="1000000000"/>
-  <cpu name="C2" power="1000000000"/>
-  <router name="R1"/>
-  <router name="R2"/>
 
-  <network_link name="1" bandwidth="100000000" latency="0.01"/>
-  <network_link name="2" bandwidth="100000" latency="0.02"/>
-  <network_link name="3" bandwidth="100000000" latency="0.01"/>
-  <network_link name="4" bandwidth="100000000" latency="0.01"/>
-  <network_link name="5" bandwidth="100000000" latency="0.05"/>
+  <host id="S1" power="1000000000"/>
+  <host id="C1" power="1000000000"/>
+  <host id="S2" power="1000000000"/>
+  <host id="C2" power="1000000000"/>
+  <router id="R1"/>
+  <router id="R2"/>
+
+  <link id="1" bandwidth="100000000" latency="0.01"/>
+  <link id="2" bandwidth="100000" latency="0.02"/>
+  <link id="3" bandwidth="100000000" latency="0.01"/>
+  <link id="4" bandwidth="100000000" latency="0.01"/>
+  <link id="5" bandwidth="100000000" latency="0.05"/>
 
 
   <route src="S1" dst="C1">
-     <route_element name="1"/>
-     <route_element name="2"/>
-     <route_element name="3"/>
+     <link:ctn id="1"/>
+     <link:ctn id="2"/>
+     <link:ctn id="3"/>
   </route>
 
   <route src="S2" dst="C2">
-     <route_element name="4"/>
-     <route_element name="2"/>
-     <route_element name="5"/>
+     <link:ctn id="4"/>
+     <link:ctn id="2"/>
+     <link:ctn id="5"/>
   </route>
 
   <route src="S1" dst="C2">
-     <route_element name="1"/>
-     <route_element name="2"/>
-     <route_element name="5"/>
+     <link:ctn id="1"/>
+     <link:ctn id="2"/>
+     <link:ctn id="5"/>
   </route>
 
   <route src="S2" dst="C1">
-     <route_element name="4"/>
-     <route_element name="2"/>
-     <route_element name="3"/>
+     <link:ctn id="4"/>
+     <link:ctn id="2"/>
+     <link:ctn id="3"/>
   </route>
 
-
   <route src="S1" dst="R1">
-     <route_element name="1"/>
+     <link:ctn id="1"/>
   </route>
 
   <route src="R1" dst="R2">
-     <route_element name="2"/>
+     <link:ctn id="2"/>
   </route>
 
   <route src="R2" dst="C1">
-     <route_element name="3"/>
+     <link:ctn id="3"/>
   </route>
 
   <route src="S2" dst="R1">
-     <route_element name="4"/>
+     <link:ctn id="4"/>
   </route>
 
   <route src="R2" dst="C2">
-     <route_element name="5"/>
+     <link:ctn id="5"/>
   </route>
-
-</platform_description>
+</platform>