Use new AP class in examples

Author: pichuang

mininet-patch/examples/opennet/ap-sta-switch-host.py

@@ -27,10 +27,7 @@ def main():
     wifi = WifiSegment()
 
     # About AP
-    ap0 = net.addAP('ap0')
-    mininet.ns3.setMobilityModel(ap0, None)
-    mininet.ns3.setPosition(ap0, 0, 0, 0)
-    wifi.addAp(ap0, channelNumber=6, ssid="opennet_ap")
+    ap0 = net.addAP("ap0", wifi, channelNumber=6, ssid="opennet_ap", positions=(0, 0, 0))
 
     # Check mininet.node.AP
     if isinstance(ap0, mininet.node.AP):
@@ -61,7 +58,7 @@ def main():
 
     mininet.ns3.start()
     net.start()
-
+    CLI(net)
     mininet.ns3.stop()
     net.stop()
 

mininet-patch/examples/opennet/two-ap-one-sw.py

@@ -36,16 +36,12 @@ def main():
 
     net = Mininet()
     net.addController('c0', controller=RemoteController, ip="127.0.0.1", port=6633)
+    wifi = WifiSegment(standard=ns.wifi.WIFI_PHY_STANDARD_80211g)
 
     sw0 = net.addSwitch('sw0', ip=None)
 
-    ap0 = net.addAP('ap0', ip=None)
-    mininet.ns3.setMobilityModel(ap0, None)
-    mininet.ns3.setPosition(ap0, 0, 0, 0)
-
-    ap1 = net.addAP('ap1', ip=None)
-    mininet.ns3.setMobilityModel(ap1, None)
-    mininet.ns3.setPosition(ap1, 10, 10, 0)
+    ap0 = net.addAP('ap0', wifi, channelNumber=11, ssid="opennet_0", positions=(0, 0, 0))
+    ap1 = net.addAP('ap1', wifi, channelNumber=11, ssid="opennet_1", positions=(10, 10, 0))
 
     sta0 = net.addStation('sta0', ip="10.0.0.1")
     mininet.ns3.setMobilityModel(sta0, None)
@@ -55,10 +51,6 @@ def main():
     mininet.ns3.setMobilityModel(sta1, None)
     mininet.ns3.setVelocity(sta1, 5, 0, 0)
 
-    wifi = WifiSegment(standard=ns.wifi.WIFI_PHY_STANDARD_80211g)
-    wifi.addAp(ap0, channelNumber=11, ssid="opennet_0")
-    wifi.addAp(ap1, channelNumber=11, ssid="opennet_1")
-
     wifi.addSta(sta0, channelNumber=11, ssid="opennet_0")
     wifi.addSta(sta1, channelNumber=11, ssid="opennet_1")