X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=b04f9d9f3486c67c05639f1d2498d47b6b63fa13;hb=c58cba70baa74588619018a2e8b461592bff1bf4;hp=a6f1acecd0a62eaf3de7ad49f5e1cb9b269ac6f4;hpb=248d1a52e06622dc9eb1dfdd6ca9f6670b4c0bc3;p=csit.git diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index a6f1acecd0..b04f9d9f34 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -601,10 +601,10 @@ | | Suppress ICMPv6 router advertisement message | ${nodes} | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 2001:2::0 | 24 | gateway=2001:3::2 +| | ... | Vpp Route Add | ${dut1} | 2001:2::0 | 64 | gateway=2001:3::2 | | ... | interface=${dut1_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 2001:1::0 | 24 | gateway=2001:3::1 +| | ... | Vpp Route Add | ${dut2} | 2001:1::0 | 64 | gateway=2001:3::1 | | ... | interface=${dut2_if1} | | ... | | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' @@ -1187,45 +1187,6 @@ | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} -| Initialize L2 xconnect with Vhost-User and VLAN with DPDK link bonding in 3-node circular topology -| | [Documentation] -| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Setup VLAN -| | ... | on BondEthernet interfaces between DUTs. Cross connect one Vhost -| | ... | interface with physical interface towards TG and other Vhost interface -| | ... | with VLAN sub-interface. All interfaces are brought up. -| | ... -| | ... | *Arguments:* -| | ... | - subid - ID of the sub-interface to be created. Type: string -| | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with DPDK link\ -| | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| -| | ... -| | [Arguments] | ${subid} | ${tag_rewrite} -| | ... -| | Set interfaces in path up -| | Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology -| | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1} -| | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1} -| | Initialize VLAN dot1q sub-interfaces in circular topology -| | ... | ${dut1} | ${dut1_eth_bond_if1} | ${dut2} | ${dut2_eth_bond_if1} -| | ... | ${subid} -| | Configure L2 tag rewrite method on interfaces -| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} -| | ... | ${tag_rewrite} -| | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 -| | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} -| | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} -| | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 -| | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} -| | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} - | Initialize L2 xconnect with Vhost-User and VLAN with VPP link bonding in 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one @@ -1658,8 +1619,8 @@ | | ... | | ... | *Note:* | | ... | Socket paths for VM are defined in following format: -| | ... | - /tmp/sock-\${VM_ID}-1 -| | ... | - /tmp/sock-\${VM_ID}-2 +| | ... | - /var/run/vpp/sock-\${VM_ID}-1 +| | ... | - /var/run/vpp/sock-\${VM_ID}-2 | | ... | | ... | *Example:* | | ... @@ -1668,24 +1629,27 @@ | | ... | | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1} | | ... -| | ${bd_id2}= | Evaluate | ${nf_nodes}+1 -| | Add interface to bridge domain | ${nodes['${dut}']} -| | ... | ${${dut}_if1} | ${1} -| | Add interface to bridge domain | ${nodes['${dut}']} -| | ... | ${${dut}_if2} | ${bd_id2} -| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1 +| | ${bd_id1}= | Evaluate | ${nf_nodes} * (${nf_chain} - 1) + ${nf_chain} +| | ${bd_id2}= | Evaluate | ${nf_nodes} * ${nf_chain} + ${nf_chain} +| | ${dut_str}= | Convert To Lowercase | ${dut} +| | Add interface to bridge domain +| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${nf_chain}_1} +| | ... | ${bd_id1} +| | Add interface to bridge domain +| | ... | ${nodes['${dut}']} | ${${dut_str}_${prev_layer}_${nf_chain}_2} +| | ... | ${bd_id2} +| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes} + 1 | | | ${qemu_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} -| | | ${sock1}= | Set Variable | /var/run/vpp/sock-${qemu_id}-1 -| | | ${sock2}= | Set Variable | /var/run/vpp/sock-${qemu_id}-2 -| | | Configure vhost interfaces for L2BD forwarding | ${nodes['${dut}']} -| | | ... | ${sock1} | ${sock2} -| | | ... | ${dut}-vhost-${qemu_id}-if1 -| | | ... | ${dut}-vhost-${qemu_id}-if2 -| | | ${bd_id2}= | Evaluate | ${nf_node}+1 -| | | Add interface to bridge domain | ${nodes['${dut}']} -| | | ... | ${${dut}-vhost-${qemu_id}-if1} | ${nf_node} -| | | Add interface to bridge domain | ${nodes['${dut}']} -| | | ... | ${${dut}-vhost-${qemu_id}-if2} | ${bd_id2} +| | | Configure vhost interfaces for L2BD forwarding +| | | ... | ${nodes['${dut}']} +| | | ... | /var/run/vpp/sock-${qemu_id}-1 | /var/run/vpp/sock-${qemu_id}-2 +| | | ... | ${dut}-vhost-${qemu_id}-if1 | ${dut}-vhost-${qemu_id}-if2 +| | | ${bd_id1}= | Evaluate | ${qemu_id} + (${nf_chain} - 1) +| | | ${bd_id2}= | Evaluate | ${bd_id1} + 1 +| | | Add interface to bridge domain +| | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${qemu_id}-if1} | ${bd_id1} +| | | Add interface to bridge domain +| | | ... | ${nodes['${dut}']} | ${${dut}-vhost-${qemu_id}-if2} | ${bd_id2} | Initialize L2 bridge domains with Vhost-User | | [Documentation] @@ -1704,10 +1668,9 @@ | | ... | | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | Initialize L2 bridge domains with Vhost-User on node | ${dut} -| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | | Initialize L2 bridge domains with Vhost-User on node +| | | ... | ${dut} | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} | Initialize L2 bridge domains for multiple chains with Vhost-User | | [Documentation] @@ -1715,6 +1678,7 @@ | | ... | with defined number of VNF nodes on all defined VPP nodes. Add each | | ... | Vhost-User interface into L2 bridge domains with learning enabled | | ... | with physical inteface or Vhost-User interface of another VM. +| | ... | Put all interfaces in path up. | | ... | | ... | *Arguments:* | | ... | - nf_chains - Number of chains of NFs. Type: integer @@ -1727,9 +1691,10 @@ | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | | ... -| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 -| | | Initialize L2 bridge domains with Vhost-User | nf_chain=${nf_chain} -| | | ... | nf_nodes=${nf_nodes} +| | Set interfaces in path up +| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains} + 1 +| | | Initialize L2 bridge domains with Vhost-User +| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} | Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | [Documentation] @@ -2018,54 +1983,6 @@ | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} -| Initialize L2 bridge domains with Vhost-User and VLAN with DPDK link bonding in a 3-node circular topology -| | [Documentation] -| | ... | Create two Vhost-User interfaces on all defined VPP nodes. Setup VLAN -| | ... | on BondEthernet interfaces between DUTs. Add one Vhost-User interface -| | ... | into L2 bridge domains with learning enabled with physical interface -| | ... | towards TG and other Vhost-User interface into L2 bridge domains with -| | ... | learning enabled with VLAN sub-interface. All interfaces are brought -| | ... | up. -| | ... -| | ... | *Arguments:* -| | ... | - bd_id1 - Bridge domain ID. Type: integer -| | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - subid - ID of the sub-interface to be created. Type: string -| | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Initialize L2 bridge domains with Vhost-User and VLAN with DPDK\ -| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \ -| | ... | \| /tmp/sock2 \| 10 \| pop-1 \| -| | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} -| | ... -| | Set interfaces in path up -| | Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology -| | Set Interface State | ${dut1} | ${dut1_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut1} | ${dut1_eth_bond_if1} -| | Set Interface State | ${dut2} | ${dut2_eth_bond_if1} | up -| | VPP Set interface MTU | ${dut2} | ${dut2_eth_bond_if1} -| | Initialize VLAN dot1q sub-interfaces in circular topology -| | ... | ${dut1} | ${dut1_eth_bond_if1} | ${dut2} | ${dut2_eth_bond_if1} -| | ... | ${subid} -| | Configure L2 tag rewrite method on interfaces -| | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} -| | ... | ${tag_rewrite} -| | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} -| | Add interface to bridge domain | ${dut1} | ${dut1_if1} | ${bd_id1} -| | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${bd_id1} -| | Add interface to bridge domain | ${dut1} | ${vhost_if2} | ${bd_id2} -| | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} -| | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} -| | Add interface to bridge domain | ${dut2} | ${subif_index_2} | ${bd_id1} -| | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} -| | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} -| | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} - | Initialize L2 bridge domains with Vhost-User and VLAN with VPP link bonding in a 3-node circular topology | | [Documentation] | | ... | Create two Vhost-User interfaces on all defined VPP nodes. Create one @@ -2145,6 +2062,17 @@ | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} +| Add VLAN strip offload switch off +| | [Documentation] +| | ... | Add VLAN Strip Offload switch off on all PCI devices. +| | ... +| | :FOR | ${dut} | IN | @{duts} +| | | ${dut_str}= | Convert To Lowercase | ${dut} +| | | Run keyword | ${dut}.Add DPDK Dev Parameter | ${${dut_str}_if1_pci} +| | | ... | vlan-strip-offload | off +| | | Run keyword | ${dut}.Add DPDK Dev Parameter | ${${dut_str}_if2_pci} +| | | ... | vlan-strip-offload | off + | Add VLAN strip offload switch off between DUTs in 3-node single link topology | | [Documentation] | | ... | Add VLAN Strip Offload switch off on PCI devices between DUTs to VPP @@ -2169,18 +2097,6 @@ | | Run keyword | DUT2.Add DPDK Dev Parameter | ${dut2_if1_2_pci} | | ... | vlan-strip-offload | off -| Add DPDK bonded ethernet interfaces to DUTs in 3-node single link topology -| | [Documentation] -| | ... | Add DPDK bonded Ethernet interfaces with mode XOR and transmit policy -| | ... | l34 to VPP configuration file. -| | ... -| | Run keyword | DUT1.Add DPDK Eth Bond Dev | 0 | 2 | l34 | ${dut1_if2_pci} -| | Run keyword | DUT2.Add DPDK Eth Bond Dev | 0 | 2 | l34 | ${dut2_if1_pci} - -| Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology -| | Add Eth Interface | ${dut1} | ${dut1_eth_bond_if1_name} | ifc_pfx=eth_bond -| | Add Eth Interface | ${dut2} | ${dut2_eth_bond_if1_name} | ifc_pfx=eth_bond - | Initialize LISP IPv4 forwarding in 3-node circular topology | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \ | | ... | Don`t set route. @@ -2996,7 +2912,7 @@ | | | ${acl} = | Run Keyword If | '${acl}' == '${EMPTY}' | | | ... | Set Variable | ipv4 ${acl_action} src ${subnet} | | | ... | ELSE -| | | ... | Catenate | SEPARATOR=, | ${acl} +| | | ... | Catenate | SEPARATOR=", " | ${acl} | | | ... | ipv4 ${acl_action} src ${subnet} | | Add Replace Acl Multi Entries | ${dut} | rules=${acl} | | @{acl_list} = | Create List | ${0}