diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/DPDK/L2fwdTest.py | 39 | ||||
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 22 | ||||
| -rw-r--r-- | resources/libraries/robot/dpdk/default.robot | 3 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/interfaces.robot | 22 |
4 files changed, 50 insertions, 36 deletions
diff --git a/resources/libraries/python/DPDK/L2fwdTest.py b/resources/libraries/python/DPDK/L2fwdTest.py index de275f94af..76d1dcb362 100644 --- a/resources/libraries/python/DPDK/L2fwdTest.py +++ b/resources/libraries/python/DPDK/L2fwdTest.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 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: @@ -16,8 +16,8 @@ DUT nodes. """ from resources.libraries.python.Constants import Constants -from resources.libraries.python.ssh import SSH -from resources.libraries.python.topology import NodeType, Topology +from resources.libraries.python.ssh import exec_cmd_no_error +from resources.libraries.python.topology import NodeType class L2fwdTest: @@ -25,35 +25,34 @@ class L2fwdTest: @staticmethod def start_the_l2fwd_test( - dut_node, cpu_cores, nb_cores, queue_nums, jumbo_frames): + 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 node: Will execute the l2fwd on this node. :param cpu_cores: 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 - not (False). - :type dut_node: dict + 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 jumbo_frames: bool + :type rxq_size: int + :type txq_size: int :raises RuntimeError: If the script "run_l2fwd.sh" fails. """ - if dut_node[u"type"] == NodeType.DUT: - ssh = SSH() - ssh.connect(dut_node) - - arch = Topology.get_node_arch(dut_node) + if node[u"type"] == NodeType.DUT: jumbo = u"yes" if jumbo_frames else u"no" - cmd = f"{Constants.REMOTE_FW_DIR}/tests/dpdk/dpdk_scripts" \ + command = f"{Constants.REMOTE_FW_DIR}/tests/dpdk/dpdk_scripts" \ f"/run_l2fwd.sh {cpu_cores} {nb_cores} {queue_nums} {jumbo} " \ - f"{arch}" + f"{rxq_size} {txq_size}" + + message = f"Failed to execute l2fwd test at node {node['host']}" - ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=1800) - if ret_code != 0: - raise RuntimeError( - f"Failed to execute l2fwd test at node {dut_node['host']}" - ) + exec_cmd_no_error(node, command, timeout=1800, message=message) diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index ad76eac4f8..0333c9c092 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -1132,16 +1132,21 @@ class InterfaceUtil: ) @staticmethod - def vpp_create_avf_interface(node, if_key, num_rx_queues=None): + def vpp_create_avf_interface( + node, if_key, num_rx_queues=None, rxq_size=0, txq_size=0): """Create AVF interface on VPP node. :param node: DUT node from topology. :param if_key: Interface key from topology file of interface to be bound to i40evf driver. :param num_rx_queues: Number of RX queues. + :param rxq_size: Size of RXQ (0 = Default API; 512 = Default VPP). + :param txq_size: Size of TXQ (0 = Default API; 512 = Default VPP). :type node: dict :type if_key: str :type num_rx_queues: int + :type rxq_size: int + :type txq_size: int :returns: AVF interface key (name) in topology. :rtype: str :raises RuntimeError: If it is not possible to create AVF interface on @@ -1157,8 +1162,8 @@ class InterfaceUtil: pci_addr=InterfaceUtil.pci_to_int(vf_pci_addr), enable_elog=0, rxq_num=int(num_rx_queues) if num_rx_queues else 0, - rxq_size=0, - txq_size=0 + rxq_size=rxq_size, + txq_size=txq_size ) err_msg = f"Failed to create AVF interface on host {node[u'host']}" with PapiSocketExecutor(node) as papi_exec: @@ -1173,17 +1178,22 @@ class InterfaceUtil: @staticmethod def vpp_create_rdma_interface( - node, if_key, num_rx_queues=None, mode=u"auto"): + node, if_key, num_rx_queues=None, rxq_size=0, txq_size=0, + mode=u"auto"): """Create RDMA interface on VPP node. :param node: DUT node from topology. :param if_key: Physical interface key from topology file of interface to be bound to rdma-core driver. :param num_rx_queues: Number of RX queues. + :param rxq_size: Size of RXQ (0 = Default API; 512 = Default VPP). + :param txq_size: Size of TXQ (0 = Default API; 512 = Default VPP). :param mode: RDMA interface mode - auto/ibv/dv. :type node: dict :type if_key: str :type num_rx_queues: int + :type rxq_size: int + :type txq_size: int :type mode: str :returns: Interface key (name) in topology file. :rtype: str @@ -1196,8 +1206,8 @@ class InterfaceUtil: name=InterfaceUtil.pci_to_eth(node, pci_addr), host_if=InterfaceUtil.pci_to_eth(node, pci_addr), rxq_num=int(num_rx_queues) if num_rx_queues else 0, - rxq_size=1024, - txq_size=1024, + rxq_size=rxq_size, + txq_size=txq_size, mode=getattr(RdmaMode,f"RDMA_API_MODE_{mode.upper()}").value, ) err_msg = f"Failed to create RDMA interface on host {node[u'host']}" diff --git a/resources/libraries/robot/dpdk/default.robot b/resources/libraries/robot/dpdk/default.robot index 00c0691864..cd5318c77a 100644 --- a/resources/libraries/robot/dpdk/default.robot +++ b/resources/libraries/robot/dpdk/default.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 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: @@ -55,6 +55,7 @@ | | | ... | ELSE | Set variable | ${rxq_count_int} | | | Start the l2fwd test | ${nodes['${dut}']} | ${cpus} | ${thr_count_int} | | | ... | ${rxq_count_int} | ${jumbo_frames} +| | | ... | ${nic_rxq_size} | ${nic_txq_size} | | | Run keyword if | ${thr_count_int} > 1 | | | ... | Set Tags | MTHREAD | ELSE | Set Tags | STHREAD | | | Set Tags | ${thr_count_int}T${cpu_count_int}C diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index 163948801a..08a24cb150 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 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: @@ -191,10 +191,10 @@ | | | Run Keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} | | | Run Keyword If | not ${jumbo} | | | ... | ${dut}.Add DPDK No Multi Seg -| | | Run Keyword If | ${rxd_count_int} -| | | ... | ${dut}.Add DPDK Dev Default RXD | ${rxd_count_int} -| | | Run Keyword If | ${txd_count_int} -| | | ... | ${dut}.Add DPDK Dev Default TXD | ${txd_count_int} +| | | Run Keyword If | ${nic_rxq_size} > 0 +| | | ... | ${dut}.Add DPDK Dev Default RXD | ${nic_rxq_size} +| | | Run Keyword If | ${nic_txq_size} > 0 +| | | ... | ${dut}.Add DPDK Dev Default TXD | ${nic_txq_size} | | | Run Keyword If | '${crypto_type}' != '${None}' | | | ... | ${dut}.Add DPDK Cryptodev | ${thr_count_int} | | END @@ -266,11 +266,13 @@ | | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan} | | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan} | | ${dut_new_if1}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if1_vf0} | ${rxq_count_int} +| | ... | ${${dut}_if1_vf0} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size} | | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if1} | | ${dut_new_if2}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if2_vf0} | ${rxq_count_int} +| | ... | ${${dut}_if2_vf0} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${nic_txq_size} | | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if2} | | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1} @@ -297,11 +299,13 @@ | | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan} | | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan} | | ${dut_new_if1}= | VPP Create Rdma Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if1} | ${rxq_count_int} +| | ... | ${${dut}_if1} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${rdma_txq_size} | | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if1} | | ${dut_new_if2}= | VPP Create Rdma Interface | ${nodes['${dut}']} -| | ... | ${${dut}_if2} | ${rxq_count_int} +| | ... | ${${dut}_if2} | num_rx_queues=${rxq_count_int} +| | ... | rxq_size=${nic_rxq_size} | txq_size=${rdma_txq_size} | | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if2} | | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1} |