X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8bc85164acb335cf909052b966b2ee4932e06cd7..de054f9c7a56304ef1227a0664eba51161e9a8a4:/examples/platforms/wifi.xml

diff --git a/examples/platforms/wifi.xml b/examples/platforms/wifi.xml
index 1cd232e80a..16306c92b4 100755
--- a/examples/platforms/wifi.xml
+++ b/examples/platforms/wifi.xml
@@ -4,33 +4,30 @@
 <platform version="4.1">
   <zone id="world" routing="Full">
 
-    <zone id="WIFI zone" routing="Cluster">
-        <!-- First declare the Access Point (ie, the wifi media) -->
-        <link id="AP1" sharing_policy="WIFI" bandwidth="54Mbps,36Mbps,24Mbps" latency="0ms" />
+    <zone id="WIFI zone" routing="Wifi">
+        <prop id="access_point" value="WIFI router" />
 
-        <!-- Two stations in the wifi zone -->
+        <!-- Declare the stations of this wifi zone -->
         <host id="Station 1" speed="100.0Mf,50.0Mf,20.0Mf" />
         <host id="Station 2" speed="100.0Mf,50.0Mf,20.0Mf" />
 
-        <!-- Specify that stations use the WIFI link for every communication (incoming or outgoing) -->
-        <host_link id="Station 1" up="AP1" down="AP1"/>
-        <host_link id="Station 2" up="AP1" down="AP1"/>
+        <!-- Declare the wifi media (after hosts because our parser is sometimes annoying) -->
+        <link id="AP1" sharing_policy="WIFI" bandwidth="54Mbps,36Mbps,24Mbps" latency="0ms" />
 
         <router id="WIFI router"/>
     </zone>
 
-
     <!-- NODE1 AS -->
     <zone id="Wired zone" routing="Full">
-      <host id="NODE1" speed="100.0Mf,50.0Mf,20.0Mf" />
+      <host id="node1" speed="100.0Mf,50.0Mf,20.0Mf" />
     </zone>
-    
+
 
     <!-- AS Routing -->
     <link id="Collector" sharing_policy="SHARED" bandwidth="100Mbps" latency="0ms" />
-    <zoneRoute src="WIFI zone" dst="Wired zone" gw_src="WIFI router" gw_dst="NODE1">
+    <zoneRoute src="WIFI zone" dst="Wired zone" gw_src="WIFI router" gw_dst="node1">
       <link_ctn id="Collector" />
     </zoneRoute>
-    
+
   </zone>
 </platform>