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: NF_density MAC addresses
[csit.git]
/
resources
/
libraries
/
python
/
DPDK
/
L2fwdTest.py
diff --git
a/resources/libraries/python/DPDK/L2fwdTest.py
b/resources/libraries/python/DPDK/L2fwdTest.py
index
fa2f879
..
76d1dcb
100644
(file)
--- a/
resources/libraries/python/DPDK/L2fwdTest.py
+++ b/
resources/libraries/python/DPDK/L2fwdTest.py
@@
-1,4
+1,4
@@
-# Copyright (c) 20
16
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:
@@
-11,44
+11,48
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-
-"""
-This module exists to provide the l2fwd test for DPDK on topology nodes.
+"""This module implements functionality which sets L2 forwarding for DPDK on
+DUT nodes.
"""
"""
-from resources.libraries.python.ssh import SSH
-from resources.libraries.python.constants import Constants as con
+from resources.libraries.python.Constants import Constants
+from resources.libraries.python.ssh import exec_cmd_no_error
+from resources.libraries.python.topology import NodeType
-class L2fwdTest(object):
- """Test the DPDK l2fwd performance."""
+
+class L2fwdTest:
+ """Setup the DPDK for l2fwd performance test."""
@staticmethod
@staticmethod
- def start_the_l2fwd_test(dut_node, cpu_coremask, nb_cores, queue_nums,
- jumbo_frames):
+ def start_the_l2fwd_test(
+ node, cpu_cores, nb_cores, queue_nums, jumbo_frames,
+ rxq_size=1024, txq_size=1024):
"""
"""
- Execute the l2fwd on the
dut_
node.
+ Execute the l2fwd on the
DUT
node.
- :param
dut_
node: Will execute the l2fwd on this node.
- :param cpu_core
mask: The DPDK run core mask
.
+ :param node: Will execute the l2fwd on this node.
+ :param cpu_core
s: The DPDK run cores
.
:param nb_cores: The cores number for the forwarding.
:param queue_nums: The queues number for the NIC.
:param nb_cores: The cores number for the forwarding.
:param queue_nums: The queues number for the NIC.
- :param jumbo_frames: Is jumbo frames or not.
- :type dut_node: dict
- :type cpu_coremask: str
+ :param jumbo_frames: Indication if the jumbo frames are used (True) or
+ not (False).
+ :param rxq_size: RXQ size. Default=1024.
+ :param txq_size: TXQ size. Default=1024.
+ :type node: dict
+ :type cpu_cores: str
:type nb_cores: str
:type queue_nums: str
:type nb_cores: str
:type queue_nums: str
- :type jumbo_frames: str
- :returns: none
+ :type jumbo_frames: bool
+ :type rxq_size: int
+ :type txq_size: int
+ :raises RuntimeError: If the script "run_l2fwd.sh" fails.
"""
"""
- ssh = SSH()
- ssh.connect(dut_node)
-
- cmd = 'cd {0}/dpdk-tests/dpdk_scripts/ && sudo ./run_l2fwd.sh ' \
- '{1} {2} {3} {4}'.format(con.REMOTE_FW_DIR, cpu_coremask, \
- nb_cores, queue_nums, jumbo_frames)
+ if node[u"type"] == NodeType.DUT:
+ jumbo = u"yes" if jumbo_frames else u"no"
+ command = f"{Constants.REMOTE_FW_DIR}/tests/dpdk/dpdk_scripts" \
+ f"/run_l2fwd.sh {cpu_cores} {nb_cores} {queue_nums} {jumbo} " \
+ f"{rxq_size} {txq_size}"
- (ret_code, _, _) = ssh.exec_command(cmd, timeout=600)
- if ret_code != 0:
- raise Exception('Failed to execute l2fwd test at node {0}'
- .format(dut_node['host']))
+ message = f"Failed to execute l2fwd test at node {node['host']}"
+ exec_cmd_no_error(node, command, timeout=1800, message=message)