aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python/DPDK
diff options
context:
space:
mode:
Diffstat (limited to 'resources/libraries/python/DPDK')
-rw-r--r--resources/libraries/python/DPDK/L3fwdTest.py25
1 files changed, 9 insertions, 16 deletions
diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index 84c623e716..d4b9f16197 100644
--- a/resources/libraries/python/DPDK/L3fwdTest.py
+++ b/resources/libraries/python/DPDK/L3fwdTest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 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:
@@ -19,6 +19,7 @@ from resources.libraries.python.ssh import SSH
from resources.libraries.python.constants import Constants
from resources.libraries.python.topology import NodeType, Topology
+
class L3fwdTest(object):
"""Test the DPDK l3fwd performance."""
@@ -50,35 +51,27 @@ class L3fwdTest(object):
adj_mac0, adj_mac1 = L3fwdTest.get_adj_mac(nodes_info, dut_node,
dut_if1, dut_if2)
- list_cores = lcores_list.split(',')
+ list_cores = [int(item) for item in lcores_list.split(',')]
# prepare the port config param
+ nb_cores = int(nb_cores)
index = 0
port_config = ''
for port in range(0, 2):
for queue in range(0, int(queue_nums)):
- if int(nb_cores) == 1:
- index = 0
- temp_str = '({port}, {queue}, {core}),'.\
- format(port=port, queue=queue,
- core=int(list_cores[index]))
- else:
- temp_str = '({port}, {queue}, {core}),'.\
- format(port=port, queue=queue,
- core=int(list_cores[index]))
-
- port_config += temp_str
- index = index + 1
+ index = 0 if nb_cores == 1 else index
+ port_config += '({port}, {queue}, {core}),'.\
+ format(port=port, queue=queue, core=list_cores[index])
+ index += 1
ssh = SSH()
ssh.connect(dut_node)
- jumbo = 'yes' if jumbo_frames else 'no'
cmd = '{fwdir}/tests/dpdk/dpdk_scripts/run_l3fwd.sh ' \
'"{lcores}" "{ports}" {mac1} {mac2} {jumbo}'.\
format(fwdir=Constants.REMOTE_FW_DIR, lcores=lcores_list,
ports=port_config.rstrip(','), mac1=adj_mac0,
- mac2=adj_mac1, jumbo=jumbo)
+ mac2=adj_mac1, jumbo='yes' if jumbo_frames else 'no')
ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600)
if ret_code != 0: