Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix various pylint 1.5.4 warnings
[csit.git]
/
resources
/
libraries
/
python
/
SFC
/
VerifyPacket.py
diff --git
a/resources/libraries/python/SFC/VerifyPacket.py
b/resources/libraries/python/SFC/VerifyPacket.py
index
84eb6aa
..
a13c760
100644
(file)
--- a/
resources/libraries/python/SFC/VerifyPacket.py
+++ b/
resources/libraries/python/SFC/VerifyPacket.py
@@
-66,7
+66,6
@@
class VerifyPacket(object):
:param payload_data: the payload data in the packet.
:type payload_data: str
:param payload_data: the payload data in the packet.
:type payload_data: str
- :returns: none
:raises RuntimeError: If the vxlan protocol field verify fails.
"""
# get the vxlan packet and check it
:raises RuntimeError: If the vxlan protocol field verify fails.
"""
# get the vxlan packet and check it
@@
-87,7
+86,6
@@
class VerifyPacket(object):
:param test_type: the functional test type.
:type payload_data: str
:type test_type: str
:param test_type: the functional test type.
:type payload_data: str
:type test_type: str
- :returns: none
:raises RuntimeError: If the vxlangpe and nsh protocol
field verify fails.
"""
:raises RuntimeError: If the vxlangpe and nsh protocol
field verify fails.
"""
@@
-110,8
+108,7
@@
class VerifyPacket(object):
raise RuntimeError("Unexpected NSH version: {0}".
format(nsh_pkt.Version))
raise RuntimeError("Unexpected NSH version: {0}".
format(nsh_pkt.Version))
- print type(nsh_pkt.OAM)
- if nsh_pkt.OAM != 0 or nsh_pkt.OAM != 1:
+ if nsh_pkt.OAM != 0 and nsh_pkt.OAM != 1:
raise RuntimeError("Unexpected NSH OAM: {0}".
format(nsh_pkt.OAM))
raise RuntimeError("Unexpected NSH OAM: {0}".
format(nsh_pkt.OAM))
@@
-172,7
+169,6
@@
class VerifyPacket(object):
:type ether: scapy.Ether
:type frame_size: Integer
:type test_type: str
:type ether: scapy.Ether
:type frame_size: Integer
:type test_type: str
- :returns: none
:raises RuntimeError: If the packet field verify fails.
"""
:raises RuntimeError: If the packet field verify fails.
"""