Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Performance: DPDK refactor
[csit.git]
/
resources
/
libraries
/
python
/
VPPUtil.py
diff --git
a/resources/libraries/python/VPPUtil.py
b/resources/libraries/python/VPPUtil.py
index
865775f
..
8744dc0
100644
(file)
--- a/
resources/libraries/python/VPPUtil.py
+++ b/
resources/libraries/python/VPPUtil.py
@@
-1,4
+1,4
@@
-# Copyright (c) 20
19
Cisco and/or its affiliates.
+# Copyright (c) 20
20
Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@
-113,8
+113,7
@@
class VPPUtil:
:param node: Topology node.
:type node: dict
"""
:param node: Topology node.
:type node: dict
"""
- cmd = u"command -v vpp"
- exec_cmd_no_error(node, cmd, message=u"VPP is not installed!")
+ DUTSetup.verify_program_installed(node, u"vpp")
@staticmethod
def adjust_privileges(node):
@staticmethod
def adjust_privileges(node):
@@
-135,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
@@
-155,7
+154,7
@@
class VPPUtil:
:type node: dict
:raises RuntimeError: If VPP service fails to start.
"""
:type node: dict
:raises RuntimeError: If VPP service fails to start.
"""
-
VPPUtil.verify_vpp_installed(node
)
+
DUTSetup.verify_program_installed(node, 'vpp'
)
try:
# Verify responsiveness of vppctl.
VPPUtil.verify_vpp_started(node)
try:
# Verify responsiveness of vppctl.
VPPUtil.verify_vpp_started(node)
@@
-347,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