Revert AP/Station Class

This reverts commit c262614.
This reverts commit 65f26e9.

Author: pichuang

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

@@ -27,14 +27,20 @@ def main():
     wifi = WifiSegment()
 
     # About AP
-    ap0 = net.addAP("ap0", wifi, channelNumber=6, ssid="opennet_ap", positions=(0, 0, 0))
+    ap0 = net.addAP('ap0')
+    mininet.ns3.setMobilityModel(ap0, None)
+    mininet.ns3.setPosition(ap0, 0, 0, 0)
+    wifi.addAp(ap0, channelNumber=6, ssid="opennet_ap")
 
     # Check mininet.node.AP
     if isinstance(ap0, mininet.node.AP):
         print("I'm a AP")
 
     # About Station
-    sta0 = net.addStation("sta0", wifi, channelNumber=6, ssid="opennet_ap", positions=(0, 0, 0))
+    sta0 = net.addStation('sta0')
+    mininet.ns3.setMobilityModel(sta0, None)
+    mininet.ns3.setPosition(sta0, 0, 0, 0)
+    wifi.addSta(sta0, channelNumber=6, ssid="opennet_ap")
 
     #Check mininet.node.Station
     if isinstance(sta0, mininet.node.Station):
@@ -55,7 +61,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,15 +36,31 @@ 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', wifi, channelNumber=11, ssid="opennet_0", positions=(0, 0, 0))
-    ap1 = net.addAP('ap1', wifi, channelNumber=11, ssid="opennet_1", positions=(10, 10, 0))
+    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)
+
+    sta0 = net.addStation('sta0', ip="10.0.0.1")
+    mininet.ns3.setMobilityModel(sta0, None)
+    mininet.ns3.setVelocity(sta0, 0, 5, 0)
+
+    sta1 = net.addStation('sta1', ip="10.0.0.2")
+    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")
 
-    sta0 = net.addStation('sta0', wifi, ip="10.0.0.1", channelNumber=11, ssid="opennet_0", velocitys=(0, 5, 0))
-    sta1 = net.addStation('sta1', wifi, ip="10.0.0.2", channelNumber=11, ssid="opennet_1", velocitys=(5, 0, 0))
+    wifi.addSta(sta0, channelNumber=11, ssid="opennet_0")
+    wifi.addSta(sta1, channelNumber=11, ssid="opennet_1")
 
     net.addLink(sw0, ap0)
     net.addLink(sw0, ap1)