[ONOS-7039] [ONOS-7044] Fix PEP8 Warnings in TestON
Change-Id: Ied79ff9caff5487a6df50466307f757468d7ca3a
diff --git a/TestON/examples/Assert/Assert.py b/TestON/examples/Assert/Assert.py
index 2e2f957..3136932 100644
--- a/TestON/examples/Assert/Assert.py
+++ b/TestON/examples/Assert/Assert.py
@@ -1,5 +1,5 @@
-'''
-Copyright 2013 Open Networking Foundation (ONF)
+"""
+Copyright 2013 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>,
@@ -9,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
@@ -20,33 +20,42 @@
along with TestON. If not, see <http://www.gnu.org/licenses/>.
-'''
-class Assert :
+"""
+class Assert:
- def __init__(self) :
+ def __init__( self ):
self.default = ''
- def CASE1(self,main) :
+ def CASE1( self, main ):
-
- main.case("Using assert to verify the result")
- main.step("Using assert_equal to verify the result is equivalent or not")
+ main.case( "Using assert to verify the result" )
+ main.step( "Using assert_equal to verify the result is equivalent or not" )
expect = main.TRUE
actual = main.TRUE
- main.log.warn(main.response_parser('<real></real><imag>2</imag><__complex__>true</__complex__>', "json"))
- utilities.assert_equals(expect=expect,actual=actual,onpass="expect is equal to actual",onfail="expect is not equal to actual")
+ main.log.warn(
+ main.response_parser( '<real></real><imag>2</imag><__complex__>true</__complex__>',
+ "json" ) )
+ utilities.assert_equals( expect=expect, actual=actual,
+ onpass="expect is equal to actual",
+ onfail="expect is not equal to actual" )
- main.step("Using assert_matches to verify the result matches or not")
+ main.step( "Using assert_matches to verify the result matches or not" )
expect = "Res(.*)"
actual = "Result"
- utilities.assert_matches(expect=expect,actual=actual,onpass="expect is macthes to actual",onfail="expect is not matches to actual")
+ utilities.assert_matches( expect=expect, actual=actual,
+ onpass="expect is macthes to actual",
+ onfail="expect is not matches to actual" )
- main.step("Using assert_greater to verify the result greater or not")
+ main.step( "Using assert_greater to verify the result greater or not" )
expect = 10
actual = 5
- utilities.assert_greater(expect=actual,actual=expect,onpass="expect is greater than the actual",onfail="expect is not greater than the actual")
+ utilities.assert_greater( expect=actual, actual=expect,
+ onpass="expect is greater than the actual",
+ onfail="expect is not greater than the actual" )
- main.step("Using assert_lesser to verify the result lesser or not")
+ main.step( "Using assert_lesser to verify the result lesser or not" )
expect = 5
actual = 10
- utilities.assert_lesser(expect=actual,actual=expect,onpass="expect is lesser than the actual",onfail="expect is not lesser than the actual")
+ utilities.assert_lesser( expect=actual, actual=expect,
+ onpass="expect is lesser than the actual",
+ onfail="expect is not lesser than the actual" )
diff --git a/TestON/examples/ExperimentTest/ExperimentTest.py b/TestON/examples/ExperimentTest/ExperimentTest.py
index a57a8f0..a04c548 100644
--- a/TestON/examples/ExperimentTest/ExperimentTest.py
+++ b/TestON/examples/ExperimentTest/ExperimentTest.py
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-'''
+"""
Created on 26-Nov-2012
-Copyright 2012 Open Networking Foundation (ONF)
+Copyright 2012 Open Networking Foundation ( ONF )
-@author: Raghav Kashyap(raghavkashyap@paxterrasolutions.com)
+author:: Raghav Kashyap( raghavkashyap@paxterrasolutions.com )
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>,
@@ -12,7 +12,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
@@ -26,41 +26,40 @@
ofautomation>run ExperimentTest example 1
will execute this example.
-'''
+"""
class ExperimentTest:
- '''
+
+ """
Testing of the Experimental Mode
- '''
-
- def __init__(self):
+ """
+ def __init__( self ):
self.default = ""
- def CASE1(self,main):
- '''
+ def CASE1( self, main ):
+ """
Testing the configuration of the host by using checkIP functionof Mininet driver
- '''
+ """
main.EXPERIMENTAL_MODE = main.TRUE
- main.case("Testing the configuration of the host")
- main.step("Host IP Checking using checkIP")
- result = main.Mininet1.checkIP(main.params['CASE1']['destination'])
- main.step("Verifying the result")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Host h2 IP address configured",onfail="Host h2 IP address didn't configured")
- main.step("Calling Non Existing API for Experimental Mode")
- testReturn = main.POX2.verify_flow(returns=main.TRUE)
- utilities.assert_equals(expect=main.TRUE,actual=testReturn,onpass="Host h2 IP address configured",onfail="Host h2 IP address didn't configured")
+ main.case( "Testing the configuration of the host" )
+ main.step( "Host IP Checking using checkIP" )
+ result = main.Mininet1.checkIP( main.params[ 'CASE1' ][ 'destination' ] )
+ main.step( "Verifying the result" )
+ utilities.assert_equals( expect=main.TRUE, actual=result, onpass="Host h2 IP address configured", onfail="Host h2 IP address didn't configured" )
+ main.step( "Calling Non Existing API for Experimental Mode" )
+ testReturn = main.POX2.verify_flow( returns=main.TRUE )
+ utilities.assert_equals( expect=main.TRUE, actual=testReturn, onpass="Host h2 IP address configured", onfail="Host h2 IP address didn't configured" )
- def CASE2(self,main):
- '''
+ def CASE2( self, main ):
+ """
Testing of the reachability of the hosts by using pingall of Mininet driver
- '''
+ """
main.EXPERIMENTAL_MODE = main.TRUE
- main.case("Testing Reachabilty of all the hosts")
- main.step("Checking Hosts reachability by using pingall")
+ main.case( "Testing Reachabilty of all the hosts" )
+ main.step( "Checking Hosts reachability by using pingall" )
result = main.Mininet1.pingall()
- main.step("Verifying the result")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="All hosts are reacchable",onfail="Hosts are not reachable")
- main.step("Calling Non Existing API for Experimental Mode")
- testReturn = main.Mininet1.verify_flow(returns=main.TRUE)
- utilities.assert_equals(expect=main.TRUE,actual=testReturn,onpass="Host h2 IP address configured",onfail="Host h2 IP address didn't configured")
-
+ main.step( "Verifying the result" )
+ utilities.assert_equals( expect=main.TRUE, actual=result, onpass="All hosts are reacchable", onfail="Hosts are not reachable" )
+ main.step( "Calling Non Existing API for Experimental Mode" )
+ testReturn = main.Mininet1.verify_flow( returns=main.TRUE )
+ utilities.assert_equals( expect=main.TRUE, actual=testReturn, onpass="Host h2 IP address configured", onfail="Host h2 IP address didn't configured" )
diff --git a/TestON/examples/StepParams/StepParams.py b/TestON/examples/StepParams/StepParams.py
index 584dca1..c7e0915 100644
--- a/TestON/examples/StepParams/StepParams.py
+++ b/TestON/examples/StepParams/StepParams.py
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-'''
+"""
Created on 28-Nov-2012
-Copyright 2012 Open Networking Foundation (ONF)
+Copyright 2012 Open Networking Foundation ( ONF )
-@author: Anil Kumar (anilkumar.s@paxterrasolutions.com)
+author:: Anil Kumar ( anilkumar.s@paxterrasolutions.com )
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>,
@@ -12,7 +12,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
@@ -21,40 +21,40 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
-'''
+"""
class StepParams:
- '''
+
+ """
This example shows the usage of the STEP level parameters, in params file the
- [[CASE1]]
- [[[STEP1]]]
+ [ [ CASE1 ] ]
+ [ [ [ STEP1 ] ] ]
'host' = 'h2'
We can get this STEP level parameter like :
- main.params['CASE1']['STEP1']['host']
+ main.params[ 'CASE1' ][ 'STEP1' ][ 'host' ]
ofautomation>run StepParams example 1
- '''
- def __init__(self):
+ """
+ def __init__( self ):
self.default = ""
- def CASE1(self,main):
- '''
+ def CASE1( self, main ):
+ """
This example will showcase the usage of STEP level parameters to specify the host as h2
- '''
- main.case("Using STEP level parameters to specify the host as h2")
- main.step("Host IP Checking using checkIP")
- result = main.Mininet1.checkIP(main.params['CASE1']['STEP1']['host'])
- main.step("Verifying the result")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Host h2 IP address configured",onfail="Host h2 IP address didn't configured")
+ """
+ main.case( "Using STEP level parameters to specify the host as h2" )
+ main.step( "Host IP Checking using checkIP" )
+ result = main.Mininet1.checkIP( main.params[ 'CASE1' ][ 'STEP1' ][ 'host' ] )
+ main.step( "Verifying the result" )
+ utilities.assert_equals( expect=main.TRUE, actual=result, onpass="Host h2 IP address configured", onfail="Host h2 IP address didn't configured" )
-
- def CASE2(self,main):
- '''
+ def CASE2( self, main ):
+ """
This example will showcase the usage of STEP level parameters to specify the host as h3
- '''
- main.case("Using STEP level parameters to specify the host as h3")
- main.step("Host IP Checking using checkIP")
- result = main.Mininet1.checkIP(main.params['CASE2']['STEP1']['host'])
- main.step("Verifying the result")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Host h3 IP address configured",onfail="Host h3 IP address didn't configured")
+ """
+ main.case( "Using STEP level parameters to specify the host as h3" )
+ main.step( "Host IP Checking using checkIP" )
+ result = main.Mininet1.checkIP( main.params[ 'CASE2' ][ 'STEP1' ][ 'host' ] )
+ main.step( "Verifying the result" )
+ utilities.assert_equals( expect=main.TRUE, actual=result, onpass="Host h3 IP address configured", onfail="Host h3 IP address didn't configured" )
diff --git a/TestON/examples/Topology/Topology.py b/TestON/examples/Topology/Topology.py
index 5cfd5b6..b1e40c0 100644
--- a/TestON/examples/Topology/Topology.py
+++ b/TestON/examples/Topology/Topology.py
@@ -1,9 +1,9 @@
#!/usr/bin/env python
-'''
+"""
Created on 28-Nov-2012
-Copyright 2012 Open Networking Foundation (ONF)
+Copyright 2012 Open Networking Foundation ( ONF )
-@author: Anil Kumar (anilkumar.s@paxterrasolutions.com)
+author:: Anil Kumar ( anilkumar.s@paxterrasolutions.com )
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>,
@@ -12,7 +12,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
@@ -21,21 +21,21 @@
You should have received a copy of the GNU General Public License
along with TestON. If not, see <http://www.gnu.org/licenses/>.
-'''
+"""
class Topology:
- '''
+ """
This example shows, how we can use the topology file:
In topo file we can specify the component like below:
- [TOPOLOGY]
+ [ TOPOLOGY ]
- [[COMPONENT]]
- [[["Mininet1"]]]
+ [ [ COMPONENT ] ]
+ [ [ [ "Mininet1" ] ] ]
The usage of this component in the test script like below:
- main.Mininet1.checkIP(main.params['CASE1']['destination'])
+ main.Mininet1.checkIP( main.params[ 'CASE1' ][ 'destination' ] )
Here we are using the Mininet1 which of type Mininet
@@ -43,18 +43,16 @@
ofautomation>run Topology example 1
will execute this example.
- '''
- def __init__(self):
+ """
+ def __init__( self ):
self.default = ""
- def CASE1(self,main):
- '''
+ def CASE1( self, main ):
+ """
This will showcase the usage of Topology
- '''
- main.case("Usage of Topology")
- main.step("Mininet1 specified in Topology , using the Mininet1 to check host ip")
- result = main.Mininet1.checkIP(main.params['CASE1']['destination'])
- main.step("Verifying the result")
- utilities.assert_equals(expect=main.TRUE,actual=result,onpass="Host h2 IP address configured",onfail="Host h2 IP address didn't configured")
-
-
+ """
+ main.case( "Usage of Topology" )
+ main.step( "Mininet1 specified in Topology , using the Mininet1 to check host ip" )
+ result = main.Mininet1.checkIP( main.params[ 'CASE1' ][ 'destination' ] )
+ main.step( "Verifying the result" )
+ utilities.assert_equals( expect=main.TRUE, actual=result, onpass="Host h2 IP address configured", onfail="Host h2 IP address didn't configured" )