[ONOS-7039] [ONOS-7044] Fix PEP8 Warnings in TestON
Change-Id: Ied79ff9caff5487a6df50466307f757468d7ca3a
diff --git a/TestON/tests/FUNC/FUNCoptical/dependencies/ectopo.py b/TestON/tests/FUNC/FUNCoptical/dependencies/ectopo.py
index 576eb51..9413c98 100644
--- a/TestON/tests/FUNC/FUNCoptical/dependencies/ectopo.py
+++ b/TestON/tests/FUNC/FUNCoptical/dependencies/ectopo.py
@@ -1,5 +1,6 @@
+# !/usr/bin/env python
"""
-Copyright 2015 Open Networking Foundation (ONF)
+Copyright 2015 Open Networking Foundation ( ONF )
Please refer questions to either the onos test mailing list at <onos-test@onosproject.org>,
the System Testing Plans and Results wiki page at <https://wiki.onosproject.org/x/voMg>,
@@ -8,7 +9,7 @@
TestON is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
- (at your option) any later version.
+ ( at your option ) any later version.
TestON is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +20,6 @@
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-#!/usr/bin/env python
-
from mininet.net import Mininet
from mininet.topo import Topo
from mininet.node import Host, RemoteController
@@ -29,9 +28,11 @@
from opticalUtils import LINCSwitch, LINCLink
+
class OpticalTopo( Topo ):
+
"""
- A simple optical topology of three LINC nodes(OE*), two OVS switches(ps*), and two hosts:
+ A simple optical topology of three LINC nodes( OE* ), two OVS switches( ps* ), and two hosts:
OE3
/\
@@ -51,19 +52,19 @@
# set up ROADMs, add them to oel[]
oel = []
an = { "durable": "true" }
- for i in range (1,4):
+ for i in range( 1, 4 ):
oean = { "optical.regens": 0 }
- oel.append( self.addSwitch('OE%s' % i, dpid='0000ffffffffff0%s' % i, annotations=oean, cls=LINCSwitch) )
+ oel.append( self.addSwitch( 'OE%s' % i, dpid='0000ffffffffff0%s' % i, annotations=oean, cls=LINCSwitch ) )
# ROADM port numbers are built as: OE1 <-> OE2 = 1200
# leaving port number up to 100 open for use by Och port
- self.addLink( oel[0], oel[1], port1=1200, port2=2100, annotations=an, cls=LINCLink )
- self.addLink( oel[1], oel[2], port1=2300, port2=3200, annotations=an, cls=LINCLink )
- self.addLink( oel[2], oel[0], port1=3100, port2=1300, annotations=an, cls=LINCLink )
+ self.addLink( oel[ 0 ], oel[ 1 ], port1=1200, port2=2100, annotations=an, cls=LINCLink )
+ self.addLink( oel[ 1 ], oel[ 2 ], port1=2300, port2=3200, annotations=an, cls=LINCLink )
+ self.addLink( oel[ 2 ], oel[ 0 ], port1=3100, port2=1300, annotations=an, cls=LINCLink )
# cross-connects between OVSes and LINCs
- self.addLink( s1, oel[0], port1=2, port2=1, annotations=an, cls=LINCLink )
- self.addLink( s2, oel[1], port1=2, port2=1, annotations=an, cls=LINCLink )
+ self.addLink( s1, oel[ 0 ], port1=2, port2=1, annotations=an, cls=LINCLink )
+ self.addLink( s2, oel[ 1 ], port1=2, port2=1, annotations=an, cls=LINCLink )
def setup( ctls ):
@@ -71,7 +72,7 @@
i = 1
for ctl in ctls:
net.addController( RemoteController( 'c%d' % i, ip=ctl ) )
- i+=1
+ i += 1
net.start()
LINCSwitch.bootOE( net )
@@ -80,11 +81,11 @@
LINCSwitch.shutdownOE()
-if __name__ == "__main__" :
+if __name__ == "__main__":
import sys
- if len( sys.argv ) >= 2 :
+ if len( sys.argv ) >= 2:
setLogLevel( 'info' )
ctls = sys.argv[ 1: ]
setup( ctls )
else:
- print('./ectopo.py [IP1] [IP2]...\n')
+ print( './ectopo.py [IP1] [IP2]...\n' )