[ONOS-7039] [ONOS-7044] Fix PEP8 Warnings in TestON
Change-Id: Ied79ff9caff5487a6df50466307f757468d7ca3a
diff --git a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
index 7c9905e..4f8d159 100644
--- a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
+++ b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
@@ -1,5 +1,5 @@
"""
-Copyright 2016 Open Networking Foundation (ONF)
+Copyright 2016 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 +8,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
@@ -18,7 +18,6 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
"""
-
# CASE1: Startup
# CASE2: Load vpls topology and configurations from demo script
# CASE3: Test CLI commands
@@ -94,7 +93,6 @@
onpass="Mininet Started",
onfail="Error starting Mininet" )
-
main.step( "Activate apps defined in the params file" )
# get data from the params
apps = main.params.get( 'apps' )
@@ -140,7 +138,7 @@
main.step( "App Ids check" )
appCheck = main.Cluster.command( "appToIDCheck", returnBool=True )
- if appCheck != True:
+ if not appCheck:
main.log.warn( main.Cluster.active( 0 ).CLI.apps() )
main.log.warn( main.Cluster.active( 0 ).CLI.appIDs() )
utilities.assert_equals( expect=True, actual=appCheck,
@@ -199,7 +197,7 @@
result = False
getPorts = utilities.retry( f=main.Cluster.active( 0 ).REST.getNetCfg,
retValue=False,
- kwargs={ "subjectClass" :"ports" },
+ kwargs={ "subjectClass": "ports" },
sleep=main.sleep )
onosCfg = pprint( getPorts )
sentCfg = pprint( originalCfg.get( "ports" ) )
@@ -233,14 +231,13 @@
main.step( "Remove an interface from a vpls network" )
main.Cluster.active( 0 ).CLI.vplsRemIface( 'VPLS1', 'h1' )
time.sleep( main.sleep )
- #update master config json
+ # update master config json
for network in main.vplsConfig:
if network.get( 'name' ) == 'VPLS1':
ifaces = network.get( 'interfaces' )
ifaces.remove( 'h1' )
main.vpls.verify( main )
-
def CASE11( self, main ):
"""
Clean all VPLS configurations
@@ -251,7 +248,6 @@
main.vplsConfig = []
main.vpls.verify( main )
-
def CASE12( self, main ):
"""
Create a new VPLS network.
@@ -264,7 +260,6 @@
main.vplsConfig.append( network1 )
main.vpls.verify( main )
-
def CASE13( self, main ):
"""
Add interfaces to the new VPLS network.
@@ -292,7 +287,6 @@
network[ 'interfaces' ] = ifaces
main.vpls.verify( main )
-
def CASE14( self, main ):
"""
Add MPLS encapsulation.
@@ -306,7 +300,6 @@
time.sleep( main.sleep )
main.vpls.verify( main )
-
def CASE15( self, main ):
"""
Change an encapsulation type.
@@ -320,7 +313,6 @@
time.sleep( main.sleep )
main.vpls.verify( main )
-
def CASE16( self, main ):
"""
Remove encapsulation.