X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fshared%2Finterfaces.robot;h=163948801aa0708ab3d16b8e8334685eb338f54f;hb=b340b5c9925b43869b91197850504760757a0bfe;hp=128c3cb568c6c7acca2e22ede031a2d13a36e5cf;hpb=3d5a75be5a88931690898e0fe52e4f48bc67c5ed;p=csit.git diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index 128c3cb568..163948801a 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -15,6 +15,9 @@ | Library | resources.libraries.python.NodePath | Library | resources.libraries.python.VhostUser +*** Variables *** +| ${dpdk_no_tx_checksum_offload}= | ${True} + *** Keywords *** | Set interfaces in path up | | [Documentation] @@ -181,7 +184,8 @@ | | | | Add DPDK pci devices to all DUTs | | FOR | ${dut} | IN | @{duts} -| | | Run Keyword | ${dut}.Add DPDK No Tx Checksum Offload +| | | Run Keyword If | ${dpdk_no_tx_checksum_offload} +| | | ... | ${dut}.Add DPDK No Tx Checksum Offload | | | Run Keyword | ${dut}.Add DPDK Log Level | debug | | | Run Keyword | ${dut}.Add DPDK Uio Driver | vfio-pci | | | Run Keyword | ${dut}.Add DPDK Dev Default RXQ | ${rxq_count_int} @@ -261,16 +265,12 @@ | | ${if2_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if2} | | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan} | | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan} -| | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} -| | ... | ${${dut}_if1_vf0} -| | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} -| | ... | ${${dut}_if2_vf0} | | ${dut_new_if1}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | ... | ${if1_pci} | ${rxq_count_int} +| | ... | ${${dut}_if1_vf0} | ${rxq_count_int} | | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if1} | | ${dut_new_if2}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | ... | ${if2_pci} | ${rxq_count_int} +| | ... | ${${dut}_if2_vf0} | ${rxq_count_int} | | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if2} | | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1} @@ -296,16 +296,12 @@ | | ${if2_vlan}= | Get Interface Vlan | ${nodes['${dut}']} | ${${dut}_if2} | | Set Test Variable | ${${dut_str}_vlan1} | ${if1_vlan} | | Set Test Variable | ${${dut_str}_vlan2} | ${if2_vlan} -| | ${if1_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} -| | ... | ${${dut}_if1} -| | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} -| | ... | ${${dut}_if2} | | ${dut_new_if1}= | VPP Create Rdma Interface | ${nodes['${dut}']} -| | ... | ${if1_pci} | ${rxq_count_int} +| | ... | ${${dut}_if1} | ${rxq_count_int} | | ${dut_new_if1_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if1} | | ${dut_new_if2}= | VPP Create Rdma Interface | ${nodes['${dut}']} -| | ... | ${if2_pci} | ${rxq_count_int} +| | ... | ${${dut}_if2} | ${rxq_count_int} | | ${dut_new_if2_mac}= | Get Interface MAC | ${nodes['${dut}']} | | ... | ${dut_new_if2} | | Set Test Variable | ${${dut_str}_if1} | ${dut_new_if1} @@ -563,6 +559,10 @@ | | ... | Type: string | | ... | - ${vhost_if2} - Name of the second Vhost-User interface (Optional). | | ... | Type: string +| | ... | - ${is_server} - Server side of connection (Optional). +| | ... | Type: boolean +| | ... | - ${enable_gso} - Generic segmentation offloading (Optional). +| | ... | Type: boolean | | | | ... | _NOTE:_ This KW sets following test case variable: | | ... | - ${${vhost_if1}} - First Vhost-User interface. @@ -577,10 +577,15 @@ | | ... | \| dut2_vhost_if2 \| | | | | [Arguments] | ${dut_node} | ${sock1} | ${sock2} | ${vhost_if1}=vhost_if1 -| | ... | ${vhost_if2}=vhost_if2 -| | -| | ${vhost_1}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock1} -| | ${vhost_2}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock2} +| | ... | ${vhost_if2}=vhost_if2 | ${is_server}=${False} +| | ... | ${enable_gso}=${False} +| | +| | ${vhost_1}= | Vpp Create Vhost User Interface +| | ... | ${dut_node} | ${sock1} | is_server=${is_server} +| | ... | enable_gso=${enable_gso} +| | ${vhost_2}= | Vpp Create Vhost User Interface +| | ... | ${dut_node} | ${sock2} | is_server=${is_server} +| | ... | enable_gso=${enable_gso} | | ${vhost_1_key}= | Get Interface By SW Index | ${dut_node} | ${vhost_1} | | ${vhost_2_key}= | Get Interface By SW Index | ${dut_node} | ${vhost_2} | | ${vhost_1_mac}= | Get Interface MAC | ${dut_node} | ${vhost_1_key}