aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/Memif.py
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2018-09-04 19:19:11 +0200
committerPeter Mikus <pmikus@cisco.com>2018-09-05 08:14:11 +0000
commitb4e5c717f5e2c39ded81f0c6f7b0f9f61945befd (patch)
treeb6ea5dd837375dc9661d98087cc3cff31bc04c63 /resources/libraries/python/Memif.py
parent0ad00a491e7c39f126abcd087bc2743dbdc3a1af (diff)
Fix various pylint violations
+ SchedUtils.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty + VatHistory.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty + VppCounters.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty + Memif.py: ++ Do not use `len(SEQUENCE)` to determine if a sequence is empty ++ Either all return statements in a function should return an expression, or none of them should. ++ Update :return: on possible None. + Classify.py: Unnecessary "else" after "return" + ContainerUtils.py: Useless super delegation in method '__init__' + CpuUtils.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty + DropRateSearch.py: Either all return statements in a function should return an expression, or none of them should. + IPv4NodeAddress.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty ++ Also improve docstrings. + IPv4Setup.py: Useless super delegation in method '__init__' + IPv6Setup.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty ++ Also improve docstrings. + IPv6Setup.py: standard import "from ipaddress import IPv6Network" should be placed before "from robot.api import logger" + MacSwap.py: Trailing newlines + NATUtil.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty + NodePath.py: Unnecessary "else" after "return" + Tap.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty + topology.py: Either all return statements in a function should return an expression, or none of them should. + topology.py: Unnecessary "else" after "return" ++ Do not use `len(SEQUENCE)` to determine if a sequence is empty ++ Improve docstrings + DUTSetup.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty ++ Also do not compare int(ret_code) just to access zero-ness. + ssh.py: Do not use `len(SEQUENCE)` to determine if a sequence is empty + InterfaceUtil.py: Unnecessary "else" after "return" Change-Id: Iba4244aa79661ee7df15fed5c7c6dbf04dfa88b2 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/python/Memif.py')
-rw-r--r--resources/libraries/python/Memif.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/resources/libraries/python/Memif.py b/resources/libraries/python/Memif.py
index acde3ecc17..76e775fcca 100644
--- a/resources/libraries/python/Memif.py
+++ b/resources/libraries/python/Memif.py
@@ -145,7 +145,7 @@ class Memif(object):
memif_data = memif_data.replace(garbage, '')
for line in memif_data.splitlines():
- if line.startswith('Sending') or len(line) == 0:
+ if not line or line.startswith('Sending'):
continue
elif line.startswith('memif'):
if memif_name:
@@ -177,7 +177,7 @@ class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface name.
+ :returns: Memif interface name, or None if not found.
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
@@ -196,7 +196,7 @@ class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface MAC address.
+ :returns: Memif interface MAC address, or None if not found.
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
@@ -205,6 +205,7 @@ class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('mac', None)
+ return None
@staticmethod
def vpp_get_memif_interface_socket(node, sw_if_idx):
@@ -214,7 +215,7 @@ class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface socket path.
+ :returns: Memif interface socket path, or None if not found.
:rtype: str
"""
with VatTerminal(node, json_param=False) as vat:
@@ -223,6 +224,7 @@ class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('socket', None)
+ return None
@staticmethod
def vpp_get_memif_interface_id(node, sw_if_idx):
@@ -232,7 +234,7 @@ class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface ID.
+ :returns: Memif interface ID, or None if not found.
:rtype: int
"""
with VatTerminal(node, json_param=False) as vat:
@@ -241,6 +243,7 @@ class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return int(memif_data[item].get('id', None))
+ return None
@staticmethod
def vpp_get_memif_interface_role(node, sw_if_idx):
@@ -250,7 +253,7 @@ class Memif(object):
:param sw_if_idx: DUT node.
:type node: dict
:type sw_if_idx: int
- :returns: Memif interface role.
+ :returns: Memif interface role, or None if not found.
:rtype: int
"""
with VatTerminal(node, json_param=False) as vat:
@@ -259,3 +262,4 @@ class Memif(object):
for item in memif_data:
if memif_data[item]['sw_if_index'] == str(sw_if_idx):
return memif_data[item].get('role', None)
+ return None