aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2024-05-31 10:11:32 +0200
committerVratko Polak <vrpolak@cisco.com>2024-05-31 10:11:32 +0200
commit10e9064182d5590d96afb335a24d583b5c8222f4 (patch)
tree6d840e4b260786f17c1ab309993dbb3769bcde4f
parent8b2ca2f17acca6f93d15dc10015ad3543f3550df (diff)
style(jumbo): Unify naming of jumbo flag
Previously, the flag was sometimes called "jumbo", sometimes "jumbo_frames". As we never use "jumbo" for things other than frame size, unify the flag to "jumbo". Change-Id: Ib688389799a4550ac9f51375f4defc06a02e6f03 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
-rw-r--r--resources/libraries/python/DPDK/L3fwdTest.py22
-rw-r--r--resources/libraries/python/DPDK/TestpmdTest.py20
-rw-r--r--resources/libraries/python/KubernetesUtils.py2
-rw-r--r--resources/libraries/python/QemuManager.py28
-rw-r--r--resources/libraries/python/QemuUtils.py16
5 files changed, 44 insertions, 44 deletions
diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py
index 178c747da5..f7da7bdb3b 100644
--- a/resources/libraries/python/DPDK/L3fwdTest.py
+++ b/resources/libraries/python/DPDK/L3fwdTest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 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:
@@ -31,7 +31,7 @@ class L3fwdTest:
@staticmethod
def start_l3fwd_on_all_duts(
- nodes, topology_info, phy_cores, rx_queues=None, jumbo_frames=False,
+ nodes, topology_info, phy_cores, rx_queues=None, jumbo=False,
rxd=None, txd=None):
"""
Execute the l3fwd on all dut nodes.
@@ -40,7 +40,7 @@ class L3fwdTest:
:param topology_info: All the info from the topology file.
:param phy_cores: Number of physical cores to use.
:param rx_queues: Number of RX queues.
- :param jumbo_frames: Jumbo frames on/off.
+ :param jumbo: Jumbo frames on/off.
:param rxd: Number of RX descriptors.
:param txd: Number of TX descriptors.
@@ -48,7 +48,7 @@ class L3fwdTest:
:type topology_info: dict
:type phy_cores: int
:type rx_queues: int
- :type jumbo_frames: bool
+ :type jumbo: bool
:type rxd: int
:type txd: int
:raises RuntimeError: If bash return code is not 0.
@@ -76,7 +76,7 @@ class L3fwdTest:
L3fwdTest.start_l3fwd(
nodes, node, if1=if1, if2=if2, lcores_list=cpu_dp,
nb_cores=dp_count_int, queue_nums=rxq_count_int,
- jumbo_frames=jumbo_frames, tg_flip=tg_flip
+ jumbo=jumbo, tg_flip=tg_flip
)
for node in nodes:
if u"DUT" in node:
@@ -88,7 +88,7 @@ class L3fwdTest:
L3fwdTest.start_l3fwd(
nodes, nodes[node], if1=if1, if2=if2,
lcores_list=cpu_dp, nb_cores=dp_count_int,
- queue_nums=rxq_count_int, jumbo_frames=jumbo_frames,
+ queue_nums=rxq_count_int, jumbo=jumbo,
tg_flip=tg_flip
)
else:
@@ -98,7 +98,7 @@ class L3fwdTest:
@staticmethod
def start_l3fwd(
nodes, node, if1, if2, lcores_list, nb_cores, queue_nums,
- jumbo_frames, tg_flip):
+ jumbo, tg_flip):
"""
Execute the l3fwd on the dut_node.
@@ -113,7 +113,7 @@ class L3fwdTest:
:param lcores_list: The lcore list string for the l3fwd routing
:param nb_cores: The cores number for the forwarding
:param queue_nums: The queues number for the NIC
- :param jumbo_frames: Indication if the jumbo frames are used (True) or
+ :param jumbo: Indication if the jumbo frames are used (True) or
not (False).
:param tg_flip: Whether TG ports are reordered.
:type nodes: dict
@@ -123,7 +123,7 @@ class L3fwdTest:
:type lcores_list: str
:type nb_cores: str
:type queue_nums: str
- :type jumbo_frames: bool
+ :type jumbo: bool
:type tg_flip: bool
"""
if node[u"type"] == NodeType.DUT:
@@ -144,7 +144,7 @@ class L3fwdTest:
f"({port}, {queue}, {lcores[index % NB_PORTS]}),"
index += 1
- if jumbo_frames:
+ if jumbo:
l3fwd_args = DpdkUtil.get_l3fwd_args(
eal_corelist=f"1,{lcores_list}",
eal_driver=False,
@@ -155,7 +155,7 @@ class L3fwdTest:
pmd_eth_dest_0=f"\\\"0,{adj_mac0}\\\"",
pmd_eth_dest_1=f"\\\"1,{adj_mac1}\\\"",
pmd_parse_ptype=True,
- pmd_max_pkt_len=jumbo_frames
+ pmd_max_pkt_len=jumbo
)
else:
l3fwd_args = DpdkUtil.get_l3fwd_args(
diff --git a/resources/libraries/python/DPDK/TestpmdTest.py b/resources/libraries/python/DPDK/TestpmdTest.py
index 3baba30715..c141851bdc 100644
--- a/resources/libraries/python/DPDK/TestpmdTest.py
+++ b/resources/libraries/python/DPDK/TestpmdTest.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Cisco and/or its affiliates.
+# Copyright (c) 2024 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:
@@ -30,7 +30,7 @@ class TestpmdTest:
@staticmethod
def start_testpmd_on_all_duts(
- nodes, topology_info, phy_cores, rx_queues=None, jumbo_frames=False,
+ nodes, topology_info, phy_cores, rx_queues=None, jumbo=False,
rxd=None, txd=None, nic_rxq_size=None, nic_txq_size=None):
"""
Start the testpmd with M worker threads and rxqueues N and jumbo
@@ -40,7 +40,7 @@ class TestpmdTest:
:param topology_info: All the info from the topology file.
:param phy_cores: Number of physical cores to use.
:param rx_queues: Number of RX queues.
- :param jumbo_frames: Jumbo frames on/off.
+ :param jumbo: Jumbo frames on/off.
:param rxd: Number of RX descriptors.
:param txd: Number of TX descriptors.
:param nic_rxq_size: RX queue size.
@@ -50,7 +50,7 @@ class TestpmdTest:
:type topology_info: dict
:type phy_cores: int
:type rx_queues: int
- :type jumbo_frames: bool
+ :type jumbo: bool
:type rxd: int
:type txd: int
:type nic_rxq_size: int
@@ -80,7 +80,7 @@ class TestpmdTest:
TestpmdTest.start_testpmd(
node, if1=if1, if2=if2, lcores_list=cpu_dp,
nb_cores=dp_count_int, queue_nums=rxq_count_int,
- jumbo_frames=jumbo_frames, rxq_size=nic_rxq_size,
+ jumbo=jumbo, rxq_size=nic_rxq_size,
txq_size=nic_txq_size
)
for node in nodes:
@@ -99,7 +99,7 @@ class TestpmdTest:
nodes[node], if1=if1, if2=if2,
lcores_list=cpu_dp, nb_cores=dp_count_int,
queue_nums=rxq_count_int,
- jumbo_frames=jumbo_frames,
+ jumbo=jumbo,
rxq_size=nic_rxq_size, txq_size=nic_txq_size
)
else:
@@ -109,7 +109,7 @@ class TestpmdTest:
@staticmethod
def start_testpmd(
node, if1, if2, lcores_list, nb_cores, queue_nums,
- jumbo_frames, rxq_size=1024, txq_size=1024):
+ jumbo, rxq_size=1024, txq_size=1024):
"""
Execute the testpmd on the DUT node.
@@ -119,7 +119,7 @@ class TestpmdTest:
:param lcores_list: The DPDK run cores.
:param nb_cores: The cores number for the forwarding.
:param queue_nums: The queues number for the NIC.
- :param jumbo_frames: Indication if the jumbo frames are used (True) or
+ :param jumbo: 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.
@@ -129,7 +129,7 @@ class TestpmdTest:
:type lcores_list: str
:type nb_cores: int
:type queue_nums: str
- :type jumbo_frames: bool
+ :type jumbo: bool
:type rxq_size: int
:type txq_size: int
:raises RuntimeError: If the script "run_testpmd.sh" fails.
@@ -138,7 +138,7 @@ class TestpmdTest:
if_pci0 = Topology.get_interface_pci_addr(node, if1)
if_pci1 = Topology.get_interface_pci_addr(node, if2)
- pmd_max_pkt_len = u"9200" if jumbo_frames else u"1518"
+ pmd_max_pkt_len = u"9200" if jumbo else u"1518"
testpmd_args = DpdkUtil.get_testpmd_args(
eal_corelist=f"1,{lcores_list}",
eal_driver=False,
diff --git a/resources/libraries/python/KubernetesUtils.py b/resources/libraries/python/KubernetesUtils.py
index 9ded0e8b9e..a58c337a18 100644
--- a/resources/libraries/python/KubernetesUtils.py
+++ b/resources/libraries/python/KubernetesUtils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2024 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:
diff --git a/resources/libraries/python/QemuManager.py b/resources/libraries/python/QemuManager.py
index 259b4c6981..78c88ddf3c 100644
--- a/resources/libraries/python/QemuManager.py
+++ b/resources/libraries/python/QemuManager.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Cisco and/or its affiliates.
+# Copyright (c) 2024 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:
@@ -165,18 +165,18 @@ class QemuManager:
vif1_mac=kwargs[u"vif1_mac"],
vif2_mac=kwargs[u"vif2_mac"],
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
self.machines[name].add_vhost_user_if(
f"/run/vpp/sock-{qemu_id}-1",
- jumbo_frames=kwargs[u"jumbo"],
+ jumbo=kwargs[u"jumbo"],
queues=kwargs[u"queues"],
queue_size=kwargs[u"perf_qemu_qsz"],
virtio_feature_mask=virtio_feature_mask
)
self.machines[name].add_vhost_user_if(
f"/run/vpp/sock-{qemu_id}-2",
- jumbo_frames=kwargs[u"jumbo"],
+ jumbo=kwargs[u"jumbo"],
queues=kwargs[u"queues"],
queue_size=kwargs[u"perf_qemu_qsz"],
virtio_feature_mask=virtio_feature_mask
@@ -215,7 +215,7 @@ class QemuManager:
arpip1=u"1.1.1.1",
arpif1=u"avf-0/0/7/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
else:
self.machines[name].configure_kernelvm_vnf(
@@ -231,7 +231,7 @@ class QemuManager:
arpip1=u"3.3.3.1",
arpif1=u"avf-0/0/6/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
self.machines[name].add_vfio_pci_if(
pci=Topology.get_interface_pci_addr(
@@ -275,7 +275,7 @@ class QemuManager:
arpip1=u"1.1.1.1",
arpif1=u"avf-0/0/7/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
else:
self.machines[name].configure_kernelvm_vnf(
@@ -291,7 +291,7 @@ class QemuManager:
arpip1=u"3.3.3.1",
arpif1=u"avf-0/0/6/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
self.machines[name].add_vfio_pci_if(
pci=Topology.get_interface_pci_addr(
@@ -335,7 +335,7 @@ class QemuManager:
arpip1=u"1.1.1.1",
arpif1=u"avf-0/0/7/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
else:
self.machines[name].configure_kernelvm_vnf(
@@ -351,7 +351,7 @@ class QemuManager:
arpip1=u"3.3.3.1",
arpif1=u"avf-0/0/6/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
self.machines[name].add_vfio_pci_if(
pci=Topology.get_interface_pci_addr(
@@ -395,7 +395,7 @@ class QemuManager:
arpip1=u"1.1.1.1",
arpif1=u"avf-0/0/7/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
else:
self.machines[name].configure_kernelvm_vnf(
@@ -411,7 +411,7 @@ class QemuManager:
arpip1=u"3.3.3.1",
arpif1=u"avf-0/0/6/0",
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
self.machines[name].add_vfio_pci_if(
pci=Topology.get_interface_pci_addr(
@@ -445,13 +445,13 @@ class QemuManager:
self.machines[name].add_kernelvm_params()
self.machines[name].configure_kernelvm_vnf(
queues=kwargs[u"queues"],
- jumbo_frames=kwargs[u"jumbo"]
+ jumbo=kwargs[u"jumbo"]
)
self.machines[name].add_net_user()
self.machines[name].add_vhost_user_if(
f"/run/vpp/sock-{qemu_id}-1",
server=False,
- jumbo_frames=kwargs[u"jumbo"],
+ jumbo=kwargs[u"jumbo"],
queues=kwargs[u"queues"],
queue_size=kwargs[u"perf_qemu_qsz"],
virtio_feature_mask=virtio_feature_mask
diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py
index 2df89ee87c..8dac06001c 100644
--- a/resources/libraries/python/QemuUtils.py
+++ b/resources/libraries/python/QemuUtils.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Cisco and/or its affiliates.
+# Copyright (c) 2024-2024 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:
@@ -236,25 +236,25 @@ class QemuUtils:
)
def add_vhost_user_if(
- self, socket, server=True, jumbo_frames=False, queue_size=None,
+ self, socket, server=True, jumbo=False, queue_size=None,
queues=1, virtio_feature_mask=None):
"""Add Vhost-user interface.
:param socket: Path of the unix socket.
:param server: If True the socket shall be a listening socket.
- :param jumbo_frames: Set True if jumbo frames are used in the test.
+ :param jumbo: Set True if jumbo frames are used in the test.
:param queue_size: Vring queue size.
:param queues: Number of queues.
:param virtio_feature_mask: Mask of virtio features to be enabled.
:type socket: str
:type server: bool
- :type jumbo_frames: bool
+ :type jumbo: bool
:type queue_size: int
:type queues: int
:type virtio_feature_mask: int
"""
self._nic_id += 1
- if jumbo_frames:
+ if jumbo:
logger.debug(u"Jumbo frames temporarily disabled!")
self._params.add_with_value(
u"chardev", f"socket,id=char{self._nic_id},"
@@ -342,7 +342,7 @@ class QemuUtils:
vpp_config.add_dpdk_dev(u"0000:00:06.0", u"0000:00:07.0")
vpp_config.add_dpdk_dev_default_rxq(kwargs[u"queues"])
vpp_config.add_dpdk_log_level(u"debug")
- if not kwargs[u"jumbo_frames"]:
+ if not kwargs[u"jumbo"]:
vpp_config.add_dpdk_no_multi_seg()
vpp_config.add_dpdk_no_tx_checksum_offload()
if "ipsec" in self._opt.get(u'vnf'):
@@ -371,7 +371,7 @@ class QemuUtils:
:param kwargs: Key-value pairs to construct command line parameters.
:type kwargs: dict
"""
- pmd_max_pkt_len = u"9200" if kwargs[u"jumbo_frames"] else u"1518"
+ pmd_max_pkt_len = u"9200" if kwargs[u"jumbo"] else u"1518"
testpmd_cmd = DpdkUtil.get_testpmd_cmdline(
eal_corelist=f"0-{self._opt.get(u'smp') - 1}",
eal_driver=False,
@@ -398,7 +398,7 @@ class QemuUtils:
:param kwargs: Key-value pairs to construct command line parameters.
:type kwargs: dict
"""
- pmd_max_pkt_len = u"9200" if kwargs[u"jumbo_frames"] else u"1518"
+ pmd_max_pkt_len = u"9200" if kwargs[u"jumbo"] else u"1518"
testpmd_cmd = DpdkUtil.get_testpmd_cmdline(
eal_corelist=f"0-{self._opt.get(u'smp') - 1}",
eal_driver=False,