modernize these platform files

[simgrid.git] / examples / platforms / wifi / 1STA-1LINK-1NODE.xml

diff --git a/examples/platforms/wifi/1STA-1LINK-1NODE.xml b/examples/platforms/wifi/1STA-1LINK-1NODE.xml
index 5bde693..19991cb 100755 (executable)
--- a/examples/platforms/wifi/1STA-1LINK-1NODE.xml
+++ b/examples/platforms/wifi/1STA-1LINK-1NODE.xml
@@ -1,36 +1,32 @@
 <?xml version='1.0'?>
 
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
-  <AS id="AS0" routing="Full">
+  <zone id="world" routing="Full">
 
     <!-- WIFI cell -->
-       <AS id="AS_AP1" routing="Cluster">
-      <host id="STA1" speed="100.0Mf,50.0Mf,20.0Mf">
-      </host>
-      <router id="AP1_ROUTER"/>     
+    <zone id="AP1 zone" routing="Cluster">
+      <host id="STA1" speed="100.0Mf,50.0Mf,20.0Mf" />
+      <router id="AP1 router"/>
 
       <!-- Access Point -->
-         <link id="AP1" sharing_policy="WIFI" bandwidth="54Mbps" latency="0ms">
-         </link>
+      <link id="AP1" sharing_policy="WIFI" bandwidth="54Mbps" latency="0ms" />
          
       <host_link id="STA1" up="AP1" down="AP1"/>
-       </AS>
+    </zone>
 
 
     <!-- NODE1 AS -->
-       <AS id="AS1" routing="Full">
-      <host id="NODE1" speed="100.0Mf,50.0Mf,20.0Mf">
-      </host>
-       </AS>
+    <zone id="AS1" routing="Full">
+      <host id="NODE1" speed="100.0Mf,50.0Mf,20.0Mf" />
+    </zone>
     
 
     <!-- AS Routing -->
-    <link id="LINK1" sharing_policy="SHARED" bandwidth="100Mbps" latency="0ms">
-       </link>
-    <ASroute src="AS_AP1" dst="AS1" gw_src="AP1_ROUTER" gw_dst="NODE1">
+    <link id="LINK1" sharing_policy="SHARED" bandwidth="100Mbps" latency="0ms" />
+    <zoneRoute src="AP1 zone" dst="AS1" gw_src="AP1 router" gw_dst="NODE1">
       <link_ctn id="LINK1" />
-    </ASroute>
+    </zoneRoute>
     
-  </AS>
+  </zone>
 </platform>