Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Introduce VPP-IPsec container tests.
[csit.git]
/
resources
/
libraries
/
python
/
VPPUtil.py
diff --git
a/resources/libraries/python/VPPUtil.py
b/resources/libraries/python/VPPUtil.py
index
72325d8
..
7dabb4f
100644
(file)
--- a/
resources/libraries/python/VPPUtil.py
+++ b/
resources/libraries/python/VPPUtil.py
@@
-19,7
+19,7
@@
from resources.libraries.python.Constants import Constants
from resources.libraries.python.DUTSetup import DUTSetup
from resources.libraries.python.PapiExecutor import PapiSocketExecutor
from resources.libraries.python.ssh import exec_cmd_no_error
from resources.libraries.python.DUTSetup import DUTSetup
from resources.libraries.python.PapiExecutor import PapiSocketExecutor
from resources.libraries.python.ssh import exec_cmd_no_error
-from resources.libraries.python.topology import NodeType
+from resources.libraries.python.topology import
Topology, SocketType,
NodeType
class VPPUtil:
class VPPUtil:
@@
-55,13
+55,20
@@
class VPPUtil:
exec_cmd_no_error(node, command, timeout=30, sudo=True)
@staticmethod
exec_cmd_no_error(node, command, timeout=30, sudo=True)
@staticmethod
- def restart_vpp_service(node):
+ def restart_vpp_service(node
, node_key=None
):
"""Restart VPP service on the specified topology node.
:param node: Topology node.
"""Restart VPP service on the specified topology node.
:param node: Topology node.
+ :param node_key: Topology node key.
:type node: dict
:type node: dict
+ :type node_key: str
"""
DUTSetup.restart_service(node, Constants.VPP_UNIT)
"""
DUTSetup.restart_service(node, Constants.VPP_UNIT)
+ if node_key:
+ Topology.add_new_socket(
+ node, SocketType.PAPI, node_key, Constants.SOCKSVR_PATH)
+ Topology.add_new_socket(
+ node, SocketType.STATS, node_key, Constants.SOCKSTAT_PATH)
@staticmethod
def restart_vpp_service_on_all_duts(nodes):
@staticmethod
def restart_vpp_service_on_all_duts(nodes):
@@
-70,18
+77,23
@@
class VPPUtil:
:param nodes: Topology nodes.
:type nodes: dict
"""
:param nodes: Topology nodes.
:type nodes: dict
"""
- for node
in nodes.value
s():
+ for node
_key, node in nodes.item
s():
if node[u"type"] == NodeType.DUT:
if node[u"type"] == NodeType.DUT:
- VPPUtil.restart_vpp_service(node)
+ VPPUtil.restart_vpp_service(node
, node_key
)
@staticmethod
@staticmethod
- def stop_vpp_service(node):
+ def stop_vpp_service(node
, node_key=None
):
"""Stop VPP service on the specified topology node.
:param node: Topology node.
"""Stop VPP service on the specified topology node.
:param node: Topology node.
+ :param node_key: Topology node key.
:type node: dict
:type node: dict
+ :type node_key: str
"""
DUTSetup.stop_service(node, Constants.VPP_UNIT)
"""
DUTSetup.stop_service(node, Constants.VPP_UNIT)
+ if node_key:
+ Topology.del_node_socket_id(node, SocketType.PAPI, node_key)
+ Topology.del_node_socket_id(node, SocketType.STATS, node_key)
@staticmethod
def stop_vpp_service_on_all_duts(nodes):
@staticmethod
def stop_vpp_service_on_all_duts(nodes):
@@
-90,9
+102,9
@@
class VPPUtil:
:param nodes: Topology nodes.
:type nodes: dict
"""
:param nodes: Topology nodes.
:type nodes: dict
"""
- for node
in nodes.value
s():
+ for node
_key, node in nodes.item
s():
if node[u"type"] == NodeType.DUT:
if node[u"type"] == NodeType.DUT:
- VPPUtil.stop_vpp_service(node)
+ VPPUtil.stop_vpp_service(node
, node_key
)
@staticmethod
def verify_vpp_installed(node):
@staticmethod
def verify_vpp_installed(node):
@@
-111,12
+123,12
@@
class VPPUtil:
:param node: Topology node.
:type node: dict
"""
:param node: Topology node.
:type node: dict
"""
- cmd = u"echo \"show
pci
\" | sudo socat - UNIX-CONNECT:/run/vpp/cli.sock"
+ cmd = u"echo \"show
ver
\" | 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
pci
2>&1 | fgrep -v \"Connection refused\" | " \
+ cmd = u"vppctl show
ver
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
@@
-227,7
+239,7
@@
class VPPUtil:
for cmd in cmds:
try:
for cmd in cmds:
try:
- PapiSocketExecutor.run_cli_cmd(node, cmd)
+ PapiSocketExecutor.run_cli_cmd
_on_all_sockets
(node, cmd)
except AssertionError:
if fail_on_error:
raise
except AssertionError:
if fail_on_error:
raise
@@
-253,7
+265,8
@@
class VPPUtil:
:param node: Topology node.
:type node: dict
"""
:param node: Topology node.
:type node: dict
"""
- PapiSocketExecutor.run_cli_cmd(node, "elog trace api cli barrier")
+ PapiSocketExecutor.run_cli_cmd_on_all_sockets(
+ node, u"elog trace api cli barrier")
@staticmethod
def vpp_enable_elog_traces_on_all_duts(nodes):
@staticmethod
def vpp_enable_elog_traces_on_all_duts(nodes):
@@
-273,7
+286,8
@@
class VPPUtil:
:param node: Topology node.
:type node: dict
"""
:param node: Topology node.
:type node: dict
"""
- PapiSocketExecutor.run_cli_cmd(node, u"show event-logger")
+ PapiSocketExecutor.run_cli_cmd_on_all_sockets(
+ node, u"show event-logger")
@staticmethod
def show_event_logger_on_all_duts(nodes):
@staticmethod
def show_event_logger_on_all_duts(nodes):