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: Race condition
[csit.git]
/
resources
/
libraries
/
python
/
VPPUtil.py
diff --git
a/resources/libraries/python/VPPUtil.py
b/resources/libraries/python/VPPUtil.py
index
ca63fa6
..
8744dc0
100644
(file)
--- a/
resources/libraries/python/VPPUtil.py
+++ b/
resources/libraries/python/VPPUtil.py
@@
-134,12
+134,12
@@
class VPPUtil:
:param node: Topology node.
:type node: dict
"""
:param node: Topology node.
:type node: dict
"""
- cmd = u"echo \"show
ver
\" | sudo socat - UNIX-CONNECT:/run/vpp/cli.sock"
+ cmd = u"echo \"show
pci
\" | sudo socat - UNIX-CONNECT:/run/vpp/cli.sock"
exec_cmd_no_error(
node, cmd, sudo=False, message=u"VPP failed to start!", retries=120
)
exec_cmd_no_error(
node, cmd, sudo=False, message=u"VPP failed to start!", retries=120
)
- cmd = u"vppctl show
ver
2>&1 | fgrep -v \"Connection refused\" | " \
+ cmd = u"vppctl show
pci
2>&1 | fgrep -v \"Connection refused\" | " \
u"fgrep -v \"No such file or directory\""
exec_cmd_no_error(
node, cmd, sudo=True, message=u"VPP failed to start!", retries=120
u"fgrep -v \"No such file or directory\""
exec_cmd_no_error(
node, cmd, sudo=True, message=u"VPP failed to start!", retries=120
@@
-346,15
+346,7
@@
class VPPUtil:
with PapiSocketExecutor(node) as papi_exec:
reply = papi_exec.add(cmd).get_reply()
with PapiSocketExecutor(node) as papi_exec:
reply = papi_exec.add(cmd).get_reply()
- threads_data = list()
- for thread in reply[u"thread_data"]:
- thread_data = list()
- for item in thread:
- if isinstance(item, str):
- item = item.rstrip('\x00')
- thread_data.append(item)
- threads_data.append(thread_data)
-
+ threads_data = reply[u"thread_data"]
logger.trace(f"show threads:\n{threads_data}")
return threads_data
logger.trace(f"show threads:\n{threads_data}")
return threads_data