Skip to content

Commit 2585f05

Browse files
ramonfontesramonfontes
committed
topo: replace Topo_WiFi by Topo
cli: replace CLI_wifi by CLI
1 parent 6e95117 commit 2585f05

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+105
-112
lines changed

‎bin/mn

+2-2
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ class MininetRunner(object):
485485
Net = partial(MininetCluster, servers=servers,
486486
placement=PLACEMENT[opts.placement])
487487
if opts.wifi:
488-
mn_wifi.cli.CLI_wifi = ClusterCLI
488+
mn_wifi.cli.CLI = ClusterCLI
489489
else:
490490
Mininet.cli.CLI = ClusterCLI
491491

@@ -522,7 +522,7 @@ class MininetRunner(object):
522522

523523
# --custom files can set CLI or change mininet.cli.CLI
524524
if opts.wifi:
525-
CLI = mn_wifi.cli.CLI_wifi if CLI is None else CLI
525+
CLI = mn_wifi.cli.CLI if CLI is None else CLI
526526
else:
527527
from mininet.cli import CLI as mininet_cli
528528
CLI = mininet_cli if CLI is None else CLI

‎custom/topo-2ap-2sta.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88
topology enables one to pass in '--topo=mytopo' from the command line.
99
"""
1010

11-
from mn_wifi.topo import Topo_WiFi
11+
from mn_wifi.topo import Topo
1212

13-
class MyTopo( Topo_WiFi ):
13+
14+
class MyTopo(Topo):
1415
"Simple topology example."
1516

1617
def __init__( self ):
1718
"Create custom topo."
1819

1920
# Initialize topology
20-
Topo_WiFi.__init__( self )
21+
Topo.__init__( self )
2122

2223
# Add hosts and switches
2324
leftStation = self.addStation( 'sta1' )

‎examples/4address.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from mininet.node import Controller
99
from mininet.log import setLogLevel, info
1010
from mn_wifi.link import wmediumd, _4address
11-
from mn_wifi.cli import CLI_wifi
11+
from mn_wifi.cli import CLI
1212
from mn_wifi.net import Mininet_wifi
1313
from mn_wifi.wmediumdConnector import interference
1414

@@ -60,7 +60,7 @@ def topology(args):
6060
ap3.start([c0])
6161

6262
info("*** Running CLI\n")
63-
CLI_wifi(net)
63+
CLI(net)
6464

6565
info("*** Stopping network\n")
6666
net.stop()

‎examples/6LoWPan.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'This example creates a simple network topology with 3 nodes'
44

55
from mininet.log import setLogLevel, info
6-
from mn_wifi.cli import CLI_wifi
6+
from mn_wifi.cli import CLI
77
from mn_wifi.net import Mininet_wifi
88

99

@@ -25,7 +25,7 @@ def topology():
2525
net.build()
2626

2727
info("*** Running CLI\n")
28-
CLI_wifi(net)
28+
CLI(net)
2929

3030
info("*** Stopping network\n")
3131
net.stop()

‎examples/active_scan.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
from mininet.node import Controller
66
from mininet.log import setLogLevel, info
77
from mn_wifi.node import UserAP
8-
from mn_wifi.cli import CLI_wifi
8+
from mn_wifi.cli import CLI
99
from mn_wifi.net import Mininet_wifi
1010

1111

1212
def topology():
1313
"Create a network."
14-
net = Mininet_wifi(controller=Controller, accessPoint=UserAP)
14+
net = Mininet_wifi(accessPoint=UserAP)
1515

1616
info("*** Creating nodes\n")
1717
net.addStation('sta1', passwd='123456789a,123456789a', encrypt='wpa2,wpa2',
@@ -40,7 +40,7 @@ def topology():
4040
ap2.start([c0])
4141

4242
info("*** Running CLI\n")
43-
CLI_wifi(net)
43+
CLI(net)
4444

4545
info("*** Stopping network\n")
4646
net.stop()

‎examples/adhoc.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from mininet.log import setLogLevel, info
1010
from mn_wifi.link import wmediumd, adhoc
11-
from mn_wifi.cli import CLI_wifi
11+
from mn_wifi.cli import CLI
1212
from mn_wifi.net import Mininet_wifi
1313
from mn_wifi.wmediumdConnector import interference
1414

@@ -67,7 +67,7 @@ def topology(args):
6767
#sta3.setIPv6('2001::3/64', intf="sta3-wlan0")
6868

6969
info("*** Running CLI\n")
70-
CLI_wifi(net)
70+
CLI(net)
7171

7272
info("*** Stopping network\n")
7373
net.stop()

‎examples/associationControl.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22

33
'Setting mechanism to optimize the use of APs'
44

5-
from mininet.node import Controller
65
from mininet.log import setLogLevel, info
7-
from mn_wifi.cli import CLI_wifi
6+
from mn_wifi.cli import CLI
87
from mn_wifi.net import Mininet_wifi
98

109

1110
def topology():
1211
"Create a network."
13-
net = Mininet_wifi(controller=Controller)
12+
net = Mininet_wifi()
1413

1514
info("*** Creating nodes\n")
1615
net.addStation('sta1', mac='00:00:00:00:00:02', ip='10.0.0.2/8')
@@ -53,7 +52,7 @@ def topology():
5352
ap3.start([c1])
5453

5554
info("*** Running CLI\n")
56-
CLI_wifi(net)
55+
CLI(net)
5756

5857
info("*** Stopping network\n")
5958
net.stop()

‎examples/authentication.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'This example shows how to work with authentication'
44

55
from mininet.log import setLogLevel, info
6-
from mn_wifi.cli import CLI_wifi
6+
from mn_wifi.cli import CLI
77
from mn_wifi.net import Mininet_wifi
88

99

@@ -30,7 +30,7 @@ def topology():
3030
ap1.start([])
3131

3232
info("*** Running CLI\n")
33-
CLI_wifi(net)
33+
CLI(net)
3434

3535
info("*** Stopping network\n")
3636
net.stop()

‎examples/battery.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
stations are equipped with batteries"""
55

66
from mininet.log import setLogLevel, info
7-
from mn_wifi.cli import CLI_wifi
7+
from mn_wifi.cli import CLI
88
from mn_wifi.net import Mininet_wifi
99

1010

@@ -30,7 +30,7 @@ def topology():
3030
ap1.start([])
3131

3232
info("*** Running CLI\n")
33-
CLI_wifi(net)
33+
CLI(net)
3434

3535
info("*** Stopping network\n")
3636
net.stop()

‎examples/eap-tls/eap-tls-auth.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'This example shows how to work with authentication'
44

55
from mininet.log import setLogLevel, info
6-
from mn_wifi.cli import CLI_wifi
6+
from mn_wifi.cli import CLI
77
from mn_wifi.net import Mininet_wifi
88
import os.path
99
import os
@@ -84,7 +84,7 @@ def topology():
8484
info("sta1 ping sta2 \n")
8585
info("/tmp/debug*.txt and /tmp/hostapd.txt contain logs \n")
8686
info("cat /var/log/syslog | grep hostapd shows you if the authentication succeeded\n")
87-
CLI_wifi(net)
87+
CLI(net)
8888

8989
info("*** Stopping network\n")
9090
net.stop()

‎examples/forwardingBySSID.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,15 @@
2323
import sys
2424
from time import sleep
2525

26-
from mininet.node import Controller
2726
from mininet.log import setLogLevel, info
2827
from mn_wifi.node import UserAP
29-
from mn_wifi.cli import CLI_wifi
28+
from mn_wifi.cli import CLI
3029
from mn_wifi.net import Mininet_wifi
3130

3231

3332
def topology(args):
3433
"Create a network."
35-
net = Mininet_wifi(controller=Controller, accessPoint=UserAP,
36-
autoAssociation=False)
34+
net = Mininet_wifi(accessPoint=UserAP, autoAssociation=False)
3735

3836
info("*** Creating nodes\n")
3937
sta1 = net.addStation('sta1', position='10,60,0')
@@ -98,7 +96,7 @@ def topology(args):
9896
'meter:4 apply:output=flood')
9997

10098
info("*** Running CLI\n")
101-
CLI_wifi(net)
99+
CLI(net)
102100

103101
info("*** Stopping network\n")
104102
net.stop()

‎examples/handover.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44

55
import sys
66

7-
from mininet.node import Controller
87
from mininet.log import setLogLevel, info
9-
from mn_wifi.cli import CLI_wifi
8+
from mn_wifi.cli import CLI
109
from mn_wifi.net import Mininet_wifi
1110

1211

1312
def topology(args):
1413
"Create a network."
15-
net = Mininet_wifi(controller=Controller)
14+
net = Mininet_wifi()
1615

1716
info("*** Creating nodes\n")
1817
if '-s' in args:
@@ -57,7 +56,7 @@ def topology(args):
5756
ap2.start([c1])
5857

5958
info("*** Running CLI\n")
60-
CLI_wifi(net)
59+
CLI(net)
6160

6261
info("*** Stopping network\n")
6362
net.stop()

‎examples/handover_bgscan.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from mininet.node import Controller
1919
from mininet.log import setLogLevel, info
2020
from mn_wifi.node import UserAP
21-
from mn_wifi.cli import CLI_wifi
21+
from mn_wifi.cli import CLI
2222
from mn_wifi.net import Mininet_wifi
2323
from mn_wifi.link import wmediumd
2424
from mn_wifi.wmediumdConnector import interference
@@ -64,7 +64,7 @@ def topology(args):
6464
ap3.start([c1])
6565

6666
info("*** Running CLI\n")
67-
CLI_wifi(net)
67+
CLI(net)
6868

6969
info("*** Stopping network\n")
7070
net.stop()

‎examples/ieee80211p.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from mininet.log import setLogLevel, info
99
from mn_wifi.link import wmediumd, ITSLink
10-
from mn_wifi.cli import CLI_wifi
10+
from mn_wifi.cli import CLI
1111
from mn_wifi.net import Mininet_wifi
1212
from mn_wifi.wmediumdConnector import interference
1313

@@ -42,7 +42,7 @@ def topology():
4242
net.build()
4343

4444
info("*** Running CLI\n")
45-
CLI_wifi(net)
45+
CLI(net)
4646

4747
info("*** Stopping network\n")
4848
net.stop()

‎examples/mesh.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from mininet.log import setLogLevel, info
1515
from mn_wifi.link import wmediumd, mesh
16-
from mn_wifi.cli import CLI_wifi
16+
from mn_wifi.cli import CLI
1717
from mn_wifi.net import Mininet_wifi
1818
from mn_wifi.wmediumdConnector import interference
1919

@@ -56,7 +56,7 @@ def topology(mobility):
5656
net.build()
5757

5858
info("*** Running CLI\n")
59-
CLI_wifi(net)
59+
CLI(net)
6060

6161
info("*** Stopping network\n")
6262
net.stop()

‎examples/meshAP.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
'This example shows how to create wireless link between two APs'
44

5-
from mininet.node import Controller
65
from mininet.log import setLogLevel, info
76
from mn_wifi.link import wmediumd, mesh
8-
from mn_wifi.cli import CLI_wifi
7+
from mn_wifi.cli import CLI
98
from mn_wifi.net import Mininet_wifi
109
from mn_wifi.wmediumdConnector import interference
1110

1211

1312
def topology():
1413
"Create a network."
15-
net = Mininet_wifi(controller=Controller, link=wmediumd,
16-
wmediumd_mode=interference)
14+
net = Mininet_wifi(link=wmediumd, wmediumd_mode=interference)
1715

1816
info("*** Creating nodes\n")
1917
sta1 = net.addStation('sta1', mac='00:00:00:00:00:11', position='1,1,0')
@@ -38,7 +36,7 @@ def topology():
3836
ap2.start([c0])
3937

4038
info("*** Running CLI\n")
41-
CLI_wifi(net)
39+
CLI(net)
4240

4341
info("*** Stopping network\n")
4442
net.stop()

‎examples/miniedit.py

+4-7
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
from mininet.topo import SingleSwitchTopo, LinearTopo, SingleSwitchReversedTopo
6060
from mininet.topolib import TreeTopo
6161

62-
from mn_wifi.cli import CLI_wifi
62+
from mn_wifi.cli import CLI
6363
from mn_wifi.net import Mininet_wifi
6464
from mn_wifi.node import CPULimitedStation, Station
6565
from mn_wifi.node import OVSAP, UserAP
@@ -2837,7 +2837,7 @@ def exportScript( self ):
28372837
args += apType_
28382838
if args:
28392839
f.write("from mn_wifi.node import"+args+"\n")
2840-
f.write("from mn_wifi.cli import CLI_wifi\n")
2840+
f.write("from mn_wifi.cli import CLI\n")
28412841
if not links_:
28422842
links_=''
28432843
f.write("from mn_wifi.link import wmediumd"+links_+"\n")
@@ -3330,10 +3330,7 @@ def exportScript( self ):
33303330
f.write(" call('"+sflowCmd+sflowSwitches+"', shell=True)\n")
33313331

33323332
f.write("\n")
3333-
if isWiFi:
3334-
f.write(" CLI_wifi(net)\n")
3335-
else:
3336-
f.write(" CLI(net)\n")
3333+
f.write(" CLI(net)\n")
33373334
for widget in self.widgetToItem:
33383335
name = widget[ 'text' ]
33393336
tags = self.canvas.gettags( self.widgetToItem[ widget ] )
@@ -4708,7 +4705,7 @@ def postStartSetup( self ):
47084705
# Start the CLI if enabled
47094706
if self.appPrefs['startCLI'] == '1':
47104707
info( "\n\n NOTE: PLEASE REMEMBER TO EXIT THE CLI BEFORE YOU PRESS THE STOP BUTTON. Not exiting will prevent MiniEdit from quitting and will prevent you from starting the network again during this sessoin.\n\n")
4711-
CLI_wifi(self.net)
4708+
CLI(self.net)
47124709

47134710
def start( self ):
47144711
"Start network."

‎examples/mobility.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sys
66

77
from mininet.log import setLogLevel, info
8-
from mn_wifi.cli import CLI_wifi
8+
from mn_wifi.cli import CLI
99
from mn_wifi.net import Mininet_wifi
1010

1111

@@ -56,7 +56,7 @@ def topology(args):
5656
ap1.start([c1])
5757

5858
info("*** Running CLI\n")
59-
CLI_wifi(net)
59+
CLI(net)
6060

6161
info("*** Stopping network\n")
6262
net.stop()

0 commit comments

Comments
 (0)