some code improvements

Author: ramonfontes

Makefile

@@ -1,4 +1,4 @@
-MININET = mininet-base/mininet/*.py
+MININET = mininet/mininet/*.py
 MININET_WIFI = mn_wifi/*.py
 TEST = mn_wifi/test/*.py
 EXAMPLES = mn_wifi/examples/*.py

bin/mn

@@ -24,7 +24,7 @@ if 'PYTHONPATH' in os.environ:
 
 from mininet.clean import cleanup
 from mininet.log import lg, LEVELS, info, debug, warn, error, output
-from mininet.net import VERSION
+from mn_wifi.net import VERSION
 from mininet.net import Mininet
 from mininet.node import (Host, CPULimitedHost, Controller, OVSController,
                           Ryu, NOX, RemoteController, findController,

examples/4address.py

@@ -13,17 +13,17 @@
 
 def topology():
     "Create a network."
-    net = Mininet_wifi( controller=Controller, link=wmediumd,
-                        wmediumd_mode=interference, configure4addr=True,
-                        autoAssociation=False )
+    net = Mininet_wifi(controller=Controller, link=wmediumd,
+                       wmediumd_mode=interference, configure4addr=True,
+                       autoAssociation=False)
 
     info("*** Creating nodes\n")
     ap1 = net.addAccessPoint('ap1', ssid="ap1-ssid", mode="g",
-                              channel="1", position='30,30,0')
+                             channel="1", position='30,30,0')
     ap2 = net.addAccessPoint('ap2', ssid="ap2-ssid", mode="g",
-                              channel="1", position='40,60,0')
+                             channel="1", position='40,60,0')
     ap3 = net.addAccessPoint('ap3', ssid="ap3-ssid", mode="g",
-                              channel="1", position='50,30,0')
+                             channel="1", position='50,30,0')
     sta1 = net.addStation('sta1', ip="192.168.0.1/24", position='31,32,0')
     sta2 = net.addStation('sta2', ip="192.168.0.2/24", position='32,34,0')
     sta3 = net.addStation('sta3', ip="192.168.0.3/24", position='41,62,0')

examples/meshAP.py

@@ -4,7 +4,6 @@
 
 from mininet.node import Controller
 from mininet.log import setLogLevel, info
-from mn_wifi.node import OVSKernelAP
 from mn_wifi.link import wmediumd, mesh
 from mn_wifi.cli import CLI_wifi
 from mn_wifi.net import Mininet_wifi

examples/miniedit.py

@@ -273,8 +273,8 @@ def body(self, master):
         Label(self.leftfieldFrame, text="Default AP:").grid(row=3, sticky=E)
         self.apType = StringVar(self.leftfieldFrame)
         self.apTypeMenu = OptionMenu(self.leftfieldFrame, self.apType, "Open vSwitch Kernel Mode",
-                                         "Indigo Virtual AP", "Userspace AP",
-                                         "Userspace AP inNamespace")
+                                     "Indigo Virtual AP", "Userspace AP",
+                                     "Userspace AP inNamespace")
         self.switchTypeMenu.grid(row=3, column=1, sticky=W)
         apTypePref = self.prefValues['apType']
         if apTypePref == 'ivs':
@@ -290,7 +290,7 @@ def body(self, master):
         Label(self.leftfieldFrame, text="Mode:").grid(row=3, sticky=E)
         self.mode = StringVar(self.leftfieldFrame)
         self.modeMenu = OptionMenu(self.leftfieldFrame, self.mode, "g", "a",
-                                     "b", "n")
+                                   "b", "n")
         self.modeMenu.grid(row=3, column=1, sticky=W)
         modePref = self.prefValues['mode']
         if modePref == 'g':
@@ -508,11 +508,11 @@ def __init__(self, master, _title):
         buttonFrame.grid(row=1 , column=0, sticky='nswe')
 
         okButton = Button(buttonFrame, width=8, text='OK', relief='groove',
-                   bd=4, command=self.okAction)
+                          bd=4, command=self.okAction)
         okButton.grid(row=0, column=0, sticky=E)
 
         canlceButton = Button(buttonFrame, width=8, text='Cancel', relief='groove',
-                    bd=4, command=self.cancelAction)
+                              bd=4, command=self.cancelAction)
         canlceButton.grid(row=0, column=1, sticky=W)
 
     def body(self, master):
@@ -680,14 +680,12 @@ def addInterface( self ):
     def apply(self):
         externalInterfaces = []
         for row in range(self.tableFrame.rows):
-            if (len(self.tableFrame.get(row, 0)) > 0 and
-                row > 0):
+            if (len(self.tableFrame.get(row, 0)) > 0 and row > 0):
                 externalInterfaces.append(self.tableFrame.get(row, 0))
         vlanInterfaces = []
         for row in range(self.vlanTableFrame.rows):
-            if (len(self.vlanTableFrame.get(row, 0)) > 0 and
-                len(self.vlanTableFrame.get(row, 1)) > 0 and
-                row > 0):
+            if (len(self.vlanTableFrame.get(row, 0)) > 0
+                    and len(self.vlanTableFrame.get(row, 1)) > 0 and row > 0):
                 vlanInterfaces.append([self.vlanTableFrame.get(row, 0), self.vlanTableFrame.get(row, 1)])
         privateDirectories = []
         for row in range(self.mountTableFrame.rows):
@@ -863,14 +861,12 @@ def addInterface( self ):
     def apply(self):
         externalInterfaces = []
         for row in range(self.tableFrame.rows):
-            if (len(self.tableFrame.get(row, 0)) > 0 and
-                row > 0):
+            if (len(self.tableFrame.get(row, 0)) > 0 and row > 0):
                 externalInterfaces.append(self.tableFrame.get(row, 0))
         vlanInterfaces = []
         for row in range(self.vlanTableFrame.rows):
             if (len(self.vlanTableFrame.get(row, 0)) > 0 and
-                len(self.vlanTableFrame.get(row, 1)) > 0 and
-                row > 0):
+                    len(self.vlanTableFrame.get(row, 1)) > 0 and row > 0):
                 vlanInterfaces.append([self.vlanTableFrame.get(row, 0), self.vlanTableFrame.get(row, 1)])
         privateDirectories = []
         for row in range(self.mountTableFrame.rows):
@@ -1048,12 +1044,11 @@ def apply(self):
 
         dpid = self.dpidEntry.get()
         if (self.defaultDpid(self.hostnameEntry.get()) is None
-           and len(dpid) == 0):
+                and len(dpid) == 0):
             showerror(title="Error",
-                          message= 'Unable to derive default datapath ID - '
-                             'please either specify a DPID or use a '
-                             'canonical switch name such as s23.' )
-
+                      message= 'Unable to derive default datapath ID - '
+                      'please either specify a DPID or use a '
+                      'canonical switch name such as s23.' )
 
         results = {'externalInterfaces':externalInterfaces,
                    'hostname':self.hostnameEntry.get(),
@@ -1148,8 +1143,9 @@ def body(self, master):
         # Selection of authentication
         Label(self.leftfieldFrame, text="Authentication:").grid(row=rowCount, sticky=E)
         self.authentication = StringVar(self.leftfieldFrame)
-        self.authenticationMenu = OptionMenu(self.leftfieldFrame, self.authentication, "none", "WEP",
-                                     "WPA", "WPA2")
+        self.authenticationMenu = OptionMenu(self.leftfieldFrame,
+                                             self.authentication, "none", "WEP",
+                                             "WPA", "WPA2")
         self.authenticationMenu.grid(row=rowCount, column=1, sticky=W)
         if 'authentication' in self.prefValues:
             authPref = self.prefValues['authentication']
@@ -1295,10 +1291,9 @@ def apply(self):
         if (self.defaultDpid(self.hostnameEntry.get()) is None
            and len(dpid) == 0):
             showerror(title="Error",
-                          message= 'Unable to derive default datapath ID - '
-                             'please either specify a DPID or use a '
-                             'canonical switch name such as s23.' )
-
+                      message= 'Unable to derive default datapath ID - '
+                      'please either specify a DPID or use a '
+                      'canonical switch name such as s23.' )
 
         results = {'externalInterfaces':externalInterfaces,
                    'hostname':self.hostnameEntry.get(),
@@ -1871,7 +1866,7 @@ def updateScrollRegion( self ):
         bbox = self.canvas.bbox( 'all' )
         if bbox is not None:
             self.canvas.configure( scrollregion=( 0, 0, bbox[ 2 ],
-                                   bbox[ 3 ] ) )
+                                                  bbox[ 3 ] ) )
 
     def canvasx( self, x_root ):
         "Convert root x coordinate to canvas coordinate."
@@ -2239,7 +2234,7 @@ def loadTopology( self ):
             dx, dy = self.canvas.coords( self.widgetToItem[ dest]  )
 
             self.link = self.canvas.create_line( sx, sy, dx, dy, width=4,
-                                             fill='blue', tag='link' )
+                                                 fill='blue', tag='link' )
             c.itemconfig(self.link, tags=c.gettags(self.link)+('data',))
             self.addLink( src, dest, linkopts=link['opts'] )
             self.createDataLinkBindings()
@@ -3144,20 +3139,20 @@ def finishLink( self, event ):
         target = self.findItem( x, y )
         dest = self.itemToWidget.get( target, None )
         if ( source is None or dest is None or source == dest
-                or dest in source.links or source in dest.links ):
+             or dest in source.links or source in dest.links ):
             self.releaseNetLink( event )
             return
         # For now, don't allow hosts to be directly linked
         stags = self.canvas.gettags( self.widgetToItem[ source ] )
         dtags = self.canvas.gettags( target )
         if (('Host' in stags and 'Host' in dtags) or
-           ('Controller' in dtags and 'LegacyRouter' in stags) or
-           ('Controller' in stags and 'LegacyRouter' in dtags) or
-           ('Controller' in dtags and 'LegacySwitch' in stags) or
-           ('Controller' in stags and 'LegacySwitch' in dtags) or
-           ('Controller' in dtags and 'Host' in stags) or
-           ('Controller' in stags and 'Host' in dtags) or
-           ('Controller' in stags and 'Controller' in dtags)):
+                ('Controller' in dtags and 'LegacyRouter' in stags) or
+                ('Controller' in stags and 'LegacyRouter' in dtags) or
+                ('Controller' in dtags and 'LegacySwitch' in stags) or
+                ('Controller' in stags and 'LegacySwitch' in dtags) or
+                ('Controller' in dtags and 'Host' in stags) or
+                ('Controller' in stags and 'Host' in dtags) or
+                ('Controller' in stags and 'Controller' in dtags)):
             self.releaseNetLink( event )
             return
 
@@ -3753,11 +3748,8 @@ def buildNodes( self, net):
                     else:
                         hostCls=Host
                 debug( hostCls, '\n' )
-                newHost = net.addHost( name,
-                                       cls=hostCls,
-                                       ip=ip,
-                                       defaultRoute=defaultRoute
-                                      )
+                newHost = net.addHost( name, cls=hostCls, ip=ip,
+                                       defaultRoute=defaultRoute )
 
                 # Set the CPULimitedHost specific options
                 if 'cores' in opts:
@@ -3803,11 +3795,8 @@ def buildNodes( self, net):
                     else:
                         hostCls=Host
                 debug( hostCls, '\n' )
-                newStation = net.addStation( name,
-                                       cls=hostCls,
-                                       ip=ip,
-                                       defaultRoute=defaultRoute
-                                      )
+                newStation = net.addStation( name, cls=hostCls,
+                                             ip=ip, defaultRoute=defaultRoute )
 
                 # Set the CPULimitedHost specific options
                 if 'cores' in opts:
@@ -3873,9 +3862,9 @@ def pathCheck( *args, **kwargs ):
         for arg in args:
             if not quietRun( 'which ' + arg ):
                 showerror(title="Error",
-                      message= 'Cannot find required executable %s.\n' % arg +
-                       'Please make sure that %s is installed ' % moduleName +
-                       'and available in your $PATH.' )
+                          message= 'Cannot find required executable %s.\n' % arg +
+                          'Please make sure that %s is installed ' % moduleName +
+                          'and available in your $PATH.' )
 
     def buildLinks( self, net):
         # Make links

examples/mobility.py

@@ -6,7 +6,6 @@
 
 from mininet.node import Controller
 from mininet.log import setLogLevel, info
-from mn_wifi.node import OVSKernelAP
 from mn_wifi.cli import CLI_wifi
 from mn_wifi.net import Mininet_wifi
 

mn_wifi/link.py

@@ -1188,8 +1188,6 @@ def updateParams(cls, sta, ap, wlan):
     def associate(cls, sta, ap, enable_wmediumd, enable_interference,
                   **params):
         "Associate to Access Point"
-        if params['wlan'] == 0:
-            wlan = sta.ifaceToAssociate
         if 'position' in sta.params:
             cls.configureWirelessLink(sta, ap, enable_wmediumd,
                                       enable_interference, **params)

mn_wifi/module.py

@@ -217,8 +217,6 @@ def load_ifb(cls, wlans):
     def docker_config(cls, n_radios=0, nodes=None, dir='~/',
                       ip='172.17.0.1', num=0, **params):
 
-        from mn_wifi.node import AccessPoint
-
         file = cls.prefix + 'docker_mn-wifi.sh'
         os.system('rm %s' % file)
         os.system("echo '#!/bin/bash' >> %s" % file)

mn_wifi/net.py

@@ -33,7 +33,7 @@
 from mn_wifi.link import wirelessLink, wmediumd, Association, \
     _4address, TCWirelessLink, TCLinkWirelessStation, ITSLink, \
     wifiDirectLink, adhoc, mesh, physicalMesh, physicalWifiDirectLink
-from mn_wifi.devices import GetRate, GetRange, GetTxPower
+from mn_wifi.devices import GetRate, GetRange
 from mn_wifi.mobility import mobility
 from mn_wifi.plot import plot2d, plot3d, plotGraph
 from mn_wifi.module import module
@@ -47,6 +47,7 @@
 
 VERSION = "2.2.2d1"
 
+
 class Mininet_wifi(Mininet):
 
     def __init__(self, topo=None, switch=OVSKernelSwitch,

mn_wifi/node.py

@@ -1340,7 +1340,7 @@ def setCPUs( self, cores, mems=0 ):
         # We have to do this here after we've specified
         # cpus and mems
         errFail( 'cgclassify -g cpuset:/%s %s' % (
-                 self.name, self.pid ) )
+            self.name, self.pid ) )
 
     def config( self, cpu=-1, cores=None, **params ):
         """cpu: desired overall system CPU fraction

mn_wifi/wmediumdConnector.py

@@ -1113,8 +1113,8 @@ def send_pos_update(cls, pos):
         posZ = pos.sta_pos[2]
         time.sleep(0.1)
         debug("%s Updating Pos of %s to x=%s, y=%s, z=%s\n" % (
-              w_cst.LOG_PREFIX, pos.staintf.get_mac(),
-              posX, posY, posZ))
+            w_cst.LOG_PREFIX, pos.staintf.get_mac(),
+            posX, posY, posZ))
         cls.sock.send(cls.__create_pos_update_request(pos))
         return cls.__parse_response(
             w_cst.WSERVER_POS_UPDATE_RESPONSE_TYPE,