update version ref and fixes for pylint

Author: ramonfontes

.pylint

@@ -16,7 +16,7 @@
 #init-hook=
 
 # Profiled execution.
-profile=no
+#profile=no
 
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
@@ -54,7 +54,7 @@ output-format=colorized
 msg-template='{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}'
 
 # Include message's id in output
-include-ids=yes
+#include-ids=yes
 
 # Put messages in a separate file for each module / package specified on the
 # command line instead of printing them on stdout. Reports (if any) will be
@@ -73,7 +73,7 @@ evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / stateme
 
 # Add a comment according to your evaluation note. This is used by the global
 # evaluation report (R0004).
-comment=no
+#comment=no
 
 # Enable the report(s) with the given id(s).
 #enable-report=
@@ -95,7 +95,7 @@ comment=no
 [BASIC]
 
 # Required attributes for module, separated by a comma
-required-attributes=
+#required-attributes=
 
 # Regular expression which should only match functions or classes name which do
 # not require a docstring
@@ -153,7 +153,7 @@ ignored-classes=SQLObjec
 
 # When zope mode is activated, add a predefined set of Zope acquired attributes
 # to generated-members.
-zope=no
+#zope=no
 
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E0201 when accessed.
@@ -191,7 +191,7 @@ additional-builtins=
 
 # List of interface methods to ignore, separated by a comma. This is used for
 # instance to not check methods defines in Zope's Interface base class.
-ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+#ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
 
 # List of method names used to declare (i.e. assign) instance attributes.
 defining-attr-methods=__init__,__new__,setUp,build

INSTALL

@@ -2,7 +2,7 @@
 Mininet-WiFi Installation/Configuration Notes
 ----------------------------------------
 
-Mininet-WiFi 2.2.0d1
+Mininet-WiFi 2.2.1d1
 ---
 
 The supported installation methods for Mininet are 1) using a

LICENSE

@@ -1,4 +1,4 @@
-Mininet-WiFi 2.2.0d1 License
+Mininet-WiFi 2.2.1d1 License
 
 Copyright (c) 2013-2016 Open Networking Laboratory
 Copyright (c) 2009-2012 Bob Lantz and The Board of Trustees of

Makefile

@@ -1,10 +1,11 @@
 MININET = mininet/*.py
+MININET_WIFI = mininet/wifi/*.py
 TEST = mininet/test/*.py
 EXAMPLES = mininet/examples/*.py
 MN = bin/mn
 PYMN = python -B bin/mn
 BIN = $(MN)
-PYSRC = $(MININET) $(TEST) $(EXAMPLES) $(BIN)
+PYSRC = $(MININET) $(MININET_WIFI) $(TEST) $(EXAMPLES) $(BIN)
 MNEXEC = mnexec
 MANPAGES = mn.1 mnexec.1
 P8IGN = E251,E201,E302,E202,E126,E127,E203,E226

bin/mn

@@ -2,7 +2,8 @@
 
 """
 Mininet runner
-author: Brandon Heller ([email protected]) - (Modified by Ramon Fontes ([email protected])
+author: Brandon Heller ([email protected]) -
+Modified by: Ramon Fontes ([email protected])
 
 To see options:
   sudo mn -h
@@ -35,13 +36,15 @@ from mininet.node import (Host, CPULimitedHost, Controller, OVSController,
 from mininet.nodelib import LinuxBridge
 from mininet.link import Link, TCLink, TCULink, OVSLink
 
-from mininet.topo import (SingleSwitchTopo, LinearTopo, SingleSwitchReversedTopo,
+from mininet.topo import (SingleSwitchTopo, LinearTopo,
+                          SingleSwitchReversedTopo,
                           MinimalTopo)
 from mininet.topolib import TreeTopo, TorusTopo
 from mininet.util import customClass, specialClass, splitArgs
 from mininet.util import buildTopo
 
-from mininet.wifi.topo import (SingleAPTopo, LinearWirelessTopo, MinimalWirelessTopo)
+from mininet.wifi.topo import (SingleAPTopo, LinearWirelessTopo,
+                               MinimalWirelessTopo)
 from mininet.wifi.link import TCWirelessLink, wmediumd
 from mininet.wifi.node import UserAP, OVSAP
 
@@ -207,7 +210,8 @@ class MininetRunner(object):
         for fileName in files:
             customs = {}
             if os.path.isfile(fileName):
-                exec (compile(open(fileName, "rb").read(), fileName, 'exec'), customs, customs)
+                exec (compile(open(fileName, "rb").read(), fileName, 'exec'),
+                      customs, customs)
                 if py_version_info < (3, 0):
                     custom_items = customs.iteritems()
                 else:
@@ -459,7 +463,8 @@ class MininetRunner(object):
         if opts.cluster:
             warn('*** WARNING: Experimental cluster mode!\n'
                  '*** Using RemoteHost, RemoteOVSSwitch, RemoteLink\n')
-            host, switch, ap, link = RemoteHost, RemoteOVSSwitch, RemoteOVSAP, RemoteLink
+            host, switch, ap, link = RemoteHost, RemoteOVSSwitch, \
+                                     RemoteOVSAP, RemoteLink
             Net = partial(MininetCluster, servers=servers,
                           placement=PLACEMENT[opts.placement])
             mininet.wifi.cli.CLI_wifi = ClusterCLI

examples/active_scan.py

@@ -14,17 +14,20 @@ def topology():
     net = Mininet_wifi(controller=Controller, accessPoint=UserAP)
 
     info("*** Creating nodes\n")
-    net.addStation('sta1', passwd='123456789a,123456789a', encrypt='wpa2,wpa2', wlans=2,
-                   active_scan=1, scan_freq='2412,2437', freq_list='2412,2437',
-                   position='5,10,0')
+    net.addStation('sta1', passwd='123456789a,123456789a', encrypt='wpa2,wpa2',
+                   wlans=2, active_scan=1, scan_freq='2412,2437',
+                   freq_list='2412,2437', position='5,10,0')
     net.addStation('sta2', passwd='123456789a', encrypt='wpa2',
                    active_scan=1, scan_freq='2437',  freq_list='2437',
                    position='45,10,0')
     ap1 = net.addAccessPoint('ap1', ssid="ssid-1", mode="g", channel="1",
-                             passwd='123456789a', encrypt='wpa2', position='10,10,0')
+                             passwd='123456789a', encrypt='wpa2',
+                             position='10,10,0')
     ap2 = net.addAccessPoint('ap2', ssid="ssid-1", mode="g", channel="6",
-                             passwd='123456789a', encrypt='wpa2', position='40,10,0')
-    c0 = net.addController('c0', controller=Controller, ip='127.0.0.1', port=6633)
+                             passwd='123456789a', encrypt='wpa2',
+                             position='40,10,0')
+    c0 = net.addController('c0', controller=Controller, ip='127.0.0.1',
+                           port=6633)
 
     info("*** Configuring wifi nodes\n")
     net.configureWifiNodes()

examples/authentication.py

@@ -18,7 +18,8 @@ def topology():
     sta2 = net.addStation('sta2', passwd='123456789a', encrypt='wpa2')
     ap1 = net.addAccessPoint('ap1', ssid="simplewifi", mode="g", channel="1",
                              passwd='123456789a', encrypt='wpa2')
-    c0 = net.addController('c0', controller=Controller, ip='127.0.0.1', port=6633)
+    c0 = net.addController('c0', controller=Controller, ip='127.0.0.1',
+                           port=6633)
 
     info("*** Configuring wifi nodes\n")
     net.configureWifiNodes()

examples/capwap-wtp.py

@@ -2,8 +2,7 @@
 
 """Enabling CAPWAP_WTP
 Please consider to follow up this repository:
-https://github.com/ramonfontes/opencapwap-mininet-wifi 
-"""
+https://github.com/ramonfontes/opencapwap-mininet-wifi """
 
 from mininet.node import Controller
 from mininet.log import setLogLevel, info

examples/simplewifitopology.py

@@ -22,14 +22,15 @@ def topology(isVirtual):
         sta1 = net.addStation('sta1')
     sta2 = net.addStation('sta2')
     if isVirtual:
-        ap1 = net.addAccessPoint('ap1', ssid="simplewifi", mode="g", channel="5")
+        ap1 = net.addAccessPoint('ap1', ssid="simplewifi",
+                                 mode="g", channel="5")
     else:
         # isolate_clientes: Client isolation can be used to prevent low-level
         # bridging of frames between associated stations in the BSS.
         # By default, this bridging is allowed.
         # OpenFlow rules are required to allow communication among nodes
-        ap1 = net.addAccessPoint('ap1', ssid="simplewifi", isolate_clientes=True,
-                                 mode="g", channel="5")
+        ap1 = net.addAccessPoint('ap1', ssid="simplewifi",
+                                 isolate_clientes=True, mode="g", channel="5")
     c0 = net.addController('c0', controller=Controller, ip='127.0.0.1',
                            port=6633)
 

examples/sumo-experimental.py

@@ -116,7 +116,8 @@ def topology():
         j = 1
         for carsta2 in net.carsSTA:
             if carsta1 != carsta2:
-                carsta1.cmd('route add -host 192.168.1.%s gw 10.0.0.%s' % (j, i))
+                carsta1.cmd('route add -host 192.168.1.%s '
+                            'gw 10.0.0.%s' % (j, i))
             i += 1
             j += 2
 

mininet/clean.py

@@ -134,4 +134,4 @@ def addCleanupCallback( cls, callback ):
 
 
 cleanup = Cleanup.cleanup
-addCleanupCallback = Cleanup.addCleanupCallback
+addCleanupCallback = Cleanup.addCleanupCallback

mininet/net.py

@@ -113,11 +113,10 @@ class Mininet(object):
     "Network emulation with hosts spawned in network namespaces."
 
     def __init__(self, topo=None, switch=OVSKernelSwitch, host=Host,
-                  controller=DefaultController, link=Link, intf=Intf,
-                  build=True, xterms=False, cleanup=False, ipBase='10.0.0.0/8',
-                  inNamespace=False,
-                  autoSetMacs=False, autoStaticArp=False, autoPinCpus=False,
-                  listenPort=None, waitConnected=False):
+                 controller=DefaultController, link=Link, intf=Intf,
+                 build=True, xterms=False, cleanup=False, ipBase='10.0.0.0/8',
+                 inNamespace=False, autoSetMacs=False, autoStaticArp=False,
+                 autoPinCpus=False, listenPort=None, waitConnected=False):
         """Create Mininet object.
            topo: Topo (topology) object or None
            switch: default Switch class
@@ -863,13 +862,13 @@ def runCpuLimitTest(self, cpu, duration=5):
         for host in hosts:
             outputs[host] = []
             with open('/sys/fs/cgroup/cpuacct/%s/cpuacct.usage' %
-                              host, 'r') as f:
+                      host, 'r') as f:
                 time[host] = float(f.read())
         for _ in range(duration):
             sleep(1)
             for host in hosts:
                 with open('/sys/fs/cgroup/cpuacct/%s/cpuacct.usage' %
-                                  host, 'r') as f:
+                          host, 'r') as f:
                     readTime = float(f.read())
                 outputs[host].append(((readTime - time[host])
                                       / 1000000000) / cores * 100)

mininet/node.py

@@ -60,6 +60,8 @@
 from sys import version_info as py_version_info
 from subprocess import Popen, PIPE
 from time import sleep
+from distutils.version import StrictVersion
+from re import findall
 from six import string_types
 
 from mininet.log import info, error, warn, debug
@@ -68,8 +70,6 @@
 from mininet.utils.private_folder_manager import PrivateFolderManager
 from mininet.moduledeps import moduleDeps, pathCheck, TUN
 from mininet.link import Link, Intf, TCIntf, OVSIntf
-from re import findall
-from distutils.version import StrictVersion
 
 
 class Node( object ):
@@ -108,7 +108,8 @@ def __init__( self, name, inNamespace=True, **params ):
 
         # Start command interpreter shell
         self.startShell()
-        self.private_folder_manager = PrivateFolderManager(self, params.get('privateDirs', []))
+        self.private_folder_manager = \
+            PrivateFolderManager(self, params.get('privateDirs', []))
 
     # File descriptor to node mapping support
     # Class variables and methods

mininet/test/test_hifi.py

@@ -8,7 +8,8 @@
 from functools import partial
 
 from mininet.net import Mininet
-from mininet.node import OVSSwitch, UserSwitch, IVSSwitch
+from mininet.node import IVSSwitch
+from mininet.wifi.node import OVSAP, UserAP
 from mininet.node import CPULimitedHost
 from mininet.link import TCLink
 from mininet.topo import Topo
@@ -19,7 +20,7 @@
 # Number of stations for each test
 N = 2
 
-class SingleSwitchOptionsTopo(Topo):
+class SingleAPOptionsTopo(Topo):
     "Single switch connected to n hosts."
     def __init__(self, n=2, hopts=None, lopts=None):
         if not hopts:
@@ -39,7 +40,7 @@ class testOptionsTopoCommon( object ):
     """Verify ability to create networks with host and link options
        (common code)."""
 
-    switchClass = None  # overridden in subclasses
+    apClass = None  # overridden in subclasses
 
     @staticmethod
     def tearDown():
@@ -49,10 +50,10 @@ def tearDown():
 
     def runOptionsTopoTest( self, n, msg, hopts=None, lopts=None ):
         "Generic topology-with-options test runner."
-        mn = Mininet( topo=SingleSwitchOptionsTopo( n=n, hopts=hopts,
-                                                    lopts=lopts ),
+        mn = Mininet( topo=SingleAPOptionsTopo( n=n, hopts=hopts,
+                                                lopts=lopts ),
                       host=CPULimitedHost, link=TCLink,
-                      switch=self.switchClass, waitConnected=True)
+                      switch=self.apClass, waitConnected=True)
         dropped = mn.run( mn.ping )
         hoptsStr = ', '.join( '%s: %s' % ( opt, value )
                               for opt, value in hopts.items() )
@@ -95,14 +96,14 @@ class testOptionsTopoOVSKernel( testOptionsTopoCommon, unittest.TestCase ):
     """Verify ability to create networks with host and link options
        (OVS kernel switch)."""
     longMessage = True
-    switchClass = OVSSwitch
+    switchClass = OVSAP
 
 @unittest.skip( 'Skipping OVS user switch test for now' )
 class testOptionsTopoOVSUser( testOptionsTopoCommon, unittest.TestCase ):
     """Verify ability to create networks with host and link options
        (OVS user switch)."""
     longMessage = True
-    switchClass = partial( OVSSwitch, datapath='user' )
+    switchClass = partial( OVSAP, datapath='user' )
 
 @unittest.skipUnless( quietRun( 'which ivs-ctl' ), 'IVS is not installed' )
 class testOptionsTopoIVS( testOptionsTopoCommon, unittest.TestCase ):
@@ -116,7 +117,7 @@ class testOptionsTopoUserspace( testOptionsTopoCommon, unittest.TestCase ):
     """Verify ability to create networks with host and link options
      (UserSwitch)."""
     longMessage = True
-    switchClass = UserSwitch
+    apClass = UserAP
 
 if __name__ == '__main__':
     setLogLevel( 'warning' )

mininet/test/test_switchdpidassignment.py

@@ -31,9 +31,9 @@ def testDefaultDpid(self):
         """Verify that the default dpid is assigned using a valid provided
         canonical apname if no dpid is passed in ap creation."""
         ap = Mininet_wifi(topo=Topo(),
-                     accessPoint=self.accessPointClass,
-                     station=Station, controller=Controller,
-                     ).addAccessPoint('ap1')
+                          accessPoint=self.accessPointClass,
+                          station=Station, controller=Controller,
+                         ).addAccessPoint('ap1')
         self.assertEqual(ap.defaultDpid(), ap.dpid)
 
     def dpidFrom(self, num):
@@ -46,8 +46,8 @@ def testActualDpidAssignment(self):
         passed in ap creation."""
         dpid = self.dpidFrom(0xABCD)
         ap = Mininet_wifi(topo=Topo(), accessPoint=self.accessPointClass,
-                     station=Station, controller=Controller,
-                     ).addAccessPoint('ap1', dpid=dpid)
+                          station=Station, controller=Controller,
+                         ).addAccessPoint('ap1', dpid=dpid)
         self.assertEqual(ap.dpid, dpid)
 
     def testDefaultDpidLen(self):
@@ -56,8 +56,8 @@ def testDefaultDpidLen(self):
         name) 0's followed by hex of first string of contiguous digits passed
         in ap name."""
         ap = Mininet_wifi(topo=Topo(), accessPoint=self.accessPointClass,
-                     station=Station, controller=Controller,
-                     ).addAccessPoint('ap123')
+                          station=Station, controller=Controller,
+                         ).addAccessPoint('ap123')
 
         self.assertEqual(ap.dpid, self.dpidFrom(123))
 

mininet/test/test_walkthrough.py

@@ -9,10 +9,10 @@
 import os
 import re
 from time import sleep
+from mininet.util import quietRun
 import pexpect
 from sys import version_info as py_version_info
 
-from mininet.util import quietRun
 
 def tsharkVersion():
     "Return tshark version"

mininet/topo.py

@@ -11,8 +11,8 @@
 setup for testing, and can even be emulated with the Mininet package.
 """
 
-from mininet.util import irange, natural, naturalSeq
 from sys import version_info as py_version_info
+from mininet.util import irange, natural, naturalSeq
 
 
 class MultiGraph( object ):