X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_configuration.robot;h=edb3a9191e7eed6781c82f7c8ade382f512bb1e8;hp=419231ee559fe28c4b58a924b2fa2febae802f09;hb=96a3c5c7ace8357d26e833a46845486787aa75c3;hpb=d53d63c0c0f1c26836d0653222916064844af1d3 diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 419231ee55..edb3a9191e 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -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: @@ -32,7 +32,6 @@ | Resource | resources/libraries/robot/l2/l2_patch.robot | Resource | resources/libraries/robot/ip/ip4.robot | Resource | resources/libraries/robot/ip/ip6.robot -| Resource | resources/libraries/robot/vm/qemu.robot | Resource | resources/libraries/robot/l2/tagging.robot | Resource | resources/libraries/robot/overlay/srv6.robot | Documentation | Performance suite keywords - configuration. @@ -129,9 +128,9 @@ | | | ${if2_pci}= | Get Interface PCI Addr | ${nodes['${dut}']} | | | ... | ${${dut}_if2_vf0} | | | ${dut_eth_vf_if1}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | | ... | ${if1_pci} +| | | ... | ${if1_pci} | ${rxq_count_int} | | | ${dut_eth_vf_if2}= | VPP Create AVF Interface | ${nodes['${dut}']} -| | | ... | ${if2_pci} +| | | ... | ${if2_pci} | ${rxq_count_int} | | | Set Test Variable | ${${dut}_if1} | ${dut_eth_vf_if1} | | | Set Test Variable | ${${dut}_if2} | ${dut_eth_vf_if2} | | Set interfaces in path up @@ -172,8 +171,10 @@ | | Add arp on dut | ${dut1} | ${dut1_if2} | ${dut2_if1_ip4} | ${dut2_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | ${tg_if2_ip4} | ${tg_if2_mac} | | Add arp on dut | ${dut2} | ${dut2_if1} | ${dut1_if2_ip4} | ${dut1_if2_mac} -| | Vpp Route Add | ${dut1} | ${laddr_ip4} | 8 | ${tg_if1_ip4} | ${dut1_if1} -| | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | ${tg_if2_ip4} | ${dut2_if2} +| | Vpp Route Add | ${dut1} | ${laddr_ip4} | 8 | gateway=${tg_if1_ip4} +| | ... | interface=${dut1_if1} +| | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | gateway=${tg_if2_ip4} +| | ... | interface=${dut2_if2} | Initialize IPv4 forwarding in circular topology | | [Documentation] @@ -221,9 +222,11 @@ | | ... | 20.20.20.1 | 24 | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2} +| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=1.1.1.2 +| | ... | interface=${dut1_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1} +| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut2_if1} | Initialize IPv4 forwarding with scaling in circular topology | | [Documentation] @@ -274,16 +277,16 @@ | | ... | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 2.2.2.2 | | ... | 30 | | Configure IP addresses on interfaces | ${dut} | ${dut_if2} | 3.3.3.2 | 30 -| | Vpp Route Add | ${dut1} | 10.0.0.0 | 32 | 1.1.1.1 | ${dut1_if1} -| | ... | count=${count} +| | Vpp Route Add | ${dut1} | 10.0.0.0 | 32 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | 2.2.2.2 | ${dut1_if2} -| | ... | count=${count} +| | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 32 | gateway=2.2.2.2 +| | ... | interface=${dut1_if2} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 10.0.0.0 | 32 | 2.2.2.1 | ${dut2_if1} -| | ... | count=${count} -| | Vpp Route Add | ${dut} | 20.0.0.0 | 32 | 3.3.3.1 | ${dut_if2} -| | ... | count=${count} +| | ... | Vpp Route Add | ${dut2} | 10.0.0.0 | 32 | gateway=2.2.2.1 +| | ... | interface=${dut2_if1} | count=${count} +| | Vpp Route Add | ${dut} | 20.0.0.0 | 32 | gateway=3.3.3.1 +| | ... | interface=${dut_if2} | count=${count} | Initialize IPv4 forwarding with vhost in 2-node circular topology | | [Documentation] @@ -328,14 +331,14 @@ | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | Add arp on dut | ${dut1} | ${dut1_if1} | 1.1.1.1 | ${tg1_if1_mac} | | Add arp on dut | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${tg1_if2_mac} -| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut1_if1} -| | ... | vrf=${fib_table_1} -| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 2.2.2.2 | ${dut1_if2} -| | ... | vrf=${fib_table_2} +| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | vrf=${fib_table_1} +| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=2.2.2.2 +| | ... | interface=${dut1_if2} | vrf=${fib_table_2} | | ${ip_base_start}= | Set Variable | ${4} | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 -| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 -| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 +| | | ${sock1}= | Set Variable | /var/run/vpp/sock-${number}-1 +| | | ${sock2}= | Set Variable | /var/run/vpp/sock-${number}-2 | | | ${fib_table_1}= | Evaluate | ${100}+${number} | | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${1} | | | ${ip_base_vif1}= | Evaluate | ${ip_base_start}+(${number}-1)*2 @@ -382,10 +385,10 @@ | | | ... | ${ip_net_vif1}.2 | 52:54:00:00:${qemu_id}:01 | | | Add arp on dut | ${dut1} | ${dut1-vhost-${number}-if2} | | | ... | ${ip_net_vif2}.2 | 52:54:00:00:${qemu_id}:02 -| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | ${ip_net_vif1}.2 -| | | ... | ${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | ${ip_net_vif2}.2 -| | | ... | ${dut1-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=${ip_net_vif1}.2 +| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=${ip_net_vif2}.2 +| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} | Initialize IPv4 forwarding with vhost in 3-node circular topology | | [Documentation] @@ -444,18 +447,18 @@ | | Add arp on dut | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${dut2_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if1} | 2.2.2.1 | ${dut1_if2_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | 3.3.3.2 | ${tg1_if2_mac} -| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut1_if1} -| | ... | vrf=${fib_table_1} -| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 2.2.2.2 | ${dut1_if2} -| | ... | vrf=${fib_table_2} -| | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 2.2.2.1 | ${dut2_if1} -| | ... | vrf=${fib_table_1} -| | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | 3.3.3.2 | ${dut2_if2} -| | ... | vrf=${fib_table_2} +| | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | vrf=${fib_table_1} +| | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=2.2.2.2 +| | ... | interface=${dut1_if2} | vrf=${fib_table_2} +| | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=2.2.2.1 +| | ... | interface=${dut2_if1} | vrf=${fib_table_1} +| | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | gateway=3.3.3.2 +| | ... | interface=${dut2_if2} | vrf=${fib_table_2} | | ${ip_base_start}= | Set Variable | ${4} | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 -| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 -| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 +| | | ${sock1}= | Set Variable | /var/run/vpp/sock-${number}-1 +| | | ${sock2}= | Set Variable | /var/run/vpp/sock-${number}-2 | | | ${fib_table_1}= | Evaluate | ${100}+${number} | | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${1} | | | ${ip_base_vif1}= | Evaluate | ${ip_base_start}+(${number}-1)*2 @@ -537,14 +540,14 @@ | | | ... | ${ip_net_vif1}.2 | 52:54:00:00:${qemu_id}:01 | | | Add arp on dut | ${dut2} | ${dut2-vhost-${number}-if2} | | | ... | ${ip_net_vif2}.2 | 52:54:00:00:${qemu_id}:02 -| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | ${ip_net_vif1}.2 -| | | ... | ${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | ${ip_net_vif2}.2 -| | | ... | ${dut1-vhost-${number}-if2} | vrf=${fib_table_2} -| | | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | ${ip_net_vif1}.2 -| | | ... | ${dut2-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | ${ip_net_vif2}.2 -| | | ... | ${dut2-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=${ip_net_vif1}.2 +| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Vpp Route Add | ${dut1} | 10.10.10.0 | 24 | gateway=${ip_net_vif2}.2 +| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Vpp Route Add | ${dut2} | 20.20.20.0 | 24 | gateway=${ip_net_vif1}.2 +| | | ... | interface=${dut2-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=${ip_net_vif2}.2 +| | | ... | interface=${dut2-vhost-${number}-if2} | vrf=${fib_table_2} | Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology | | [Documentation] @@ -623,14 +626,16 @@ | | ... | Configure IP addresses on interfaces | ${dut2} | ${subif_index_2} | | ... | 2.2.2.2 | 30 | | Configure IP addresses on interfaces | ${dut} | ${dut_if2} | 3.3.3.2 | 30 -| | Vpp Route Add | ${dut1} | ${tg_if1_net} | 30 | 1.1.1.1 | ${dut1_if1} +| | Vpp Route Add | ${dut1} | ${tg_if1_net} | 30 | gateway=1.1.1.1 +| | ... | interface=${dut1_if1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | 30 | 2.2.2.2 -| | ... | ${subif_index_1} +| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | 30 | gateway=2.2.2.2 +| | ... | interface=${subif_index_1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | 30 | 2.2.2.1 -| | ... | ${subif_index_2} -| | Vpp Route Add | ${dut} | ${tg_if2_net} | 30 | 3.3.3.1 | ${dut_if2} +| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | 30 | gateway=2.2.2.1 +| | ... | interface=${subif_index_2} +| | Vpp Route Add | ${dut} | ${tg_if2_net} | 30 | gateway=3.3.3.1 +| | ... | interface=${dut_if2} | Initialize IPv4 policer 2r3c-${t} in circular topology | | [Documentation] @@ -712,8 +717,10 @@ | | Add Ip Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} | | Add Ip Neighbor | ${dut1} | ${dut1_if2} | 2001:3::2 | ${dut2_if1_mac} | | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:3::1 | ${dut1_if2_mac} -| | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | 2001:3::2 | ${dut1_if2} -| | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | 2001:3::1 | ${dut2_if1} +| | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | gateway=2001:3::2 +| | ... | interface=${dut1_if2} +| | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | gateway=2001:3::1 +| | ... | interface=${dut2_if1} | Initialize IPv6 forwarding with scaling in circular topology | | [Documentation] @@ -765,15 +772,15 @@ | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Add Ip Neighbor | ${dut2} | ${dut2_if1} | 2001:4::1 | ${dut1_if2_mac} | | Add Ip Neighbor | ${dut} | ${dut_if2} | 2001:5::2 | ${tg1_if2_mac} -| | Vpp Route Add | ${dut1} | 2001:1::0 | ${host_prefix} | 2001:3::2 +| | Vpp Route Add | ${dut1} | 2001:1::0 | ${host_prefix} | gateway=2001:3::2 | | ... | interface=${dut1_if1} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 2001:2::0 | ${host_prefix} | 2001:4::2 -| | ... | interface=${dut1_if2} | count=${count} +| | ... | Vpp Route Add | ${dut1} | 2001:2::0 | ${host_prefix} +| | ... | gateway=2001:4::2 | interface=${dut1_if2} | count=${count} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 2001:1::0 | ${host_prefix} | 2001:4::1 -| | ... | interface=${dut2_if1} | count=${count} -| | Vpp Route Add | ${dut} | 2001:2::0 | ${host_prefix} | 2001:5::2 +| | ... | Vpp Route Add | ${dut2} | 2001:1::0 | ${host_prefix} +| | ... | gateway=2001:4::1 | interface=${dut2_if1} | count=${count} +| | Vpp Route Add | ${dut} | 2001:2::0 | ${host_prefix} | gateway=2001:5::2 | | ... | interface=${dut_if2} | count=${count} | Initialize IPv6 forwarding with VLAN dot1q sub-interfaces in circular topology @@ -856,16 +863,16 @@ | | ... | ${prefix} | | VPP Set If IPv6 Addr | ${dut} | ${dut_if2} | 2002:3::2 | ${prefix} | | Suppress ICMPv6 router advertisement message | ${nodes} -| | Vpp Route Add | ${dut1} | ${tg_if1_net} | ${host_prefix} | 2002:1::1 -| | ... | interface=${dut1_if1} +| | Vpp Route Add | ${dut1} | ${tg_if1_net} | ${host_prefix} +| | ... | gateway=2002:1::1 | interface=${dut1_if1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | ${host_prefix} | 2002:2::2 -| | ... | interface=${subif_index_1} +| | ... | Vpp Route Add | ${dut1} | ${tg_if2_net} | ${host_prefix} +| | ... | gateway=2002:2::2 | interface=${subif_index_1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | ${host_prefix} | 2002:2::1 -| | ... | interface=${subif_index_2} -| | Vpp Route Add | ${dut} | ${tg_if2_net} | ${host_prefix} | 2002:3::1 -| | ... | interface=${dut_if2} +| | ... | Vpp Route Add | ${dut2} | ${tg_if1_net} | ${host_prefix} +| | ... | gateway=2002:2::1 | interface=${subif_index_2} +| | Vpp Route Add | ${dut} | ${tg_if2_net} | ${host_prefix} +| | ... | gateway=2002:3::1 | interface=${dut_if2} | Initialize IPv6 iAcl whitelist in 3-node circular topology | | [Documentation] @@ -918,10 +925,10 @@ | | ${sid2}= | Set Variable If | | ... | "${n}" == "1" | ${dut1_sid2} | | ... | "${n}" == "2" | ${dut1_sid2_1} -| | Vpp Route Add | ${dut1} | ${sid1} | ${sid_prefix} | ${dut2_if1_ip6} -| | ... | ${dut1_if2} -| | Vpp Route Add | ${dut2} | ${sid2} | ${sid_prefix} | ${dut1_if2_ip6} -| | ... | ${dut2_if1} +| | Vpp Route Add | ${dut1} | ${sid1} | ${sid_prefix} | gateway=${dut2_if1_ip6} +| | ... | interface=${dut1_if2} +| | Vpp Route Add | ${dut2} | ${sid2} | ${sid_prefix} | gateway=${dut1_if2_ip6} +| | ... | interface=${dut2_if1} # Configure SRv6 for direction0 | | Set SR Encaps Source Address on DUT | ${dut1} | ${dut1_sid1} | | @{sid_list_dir0}= | Run Keyword If | "${n}" == "1" @@ -942,7 +949,7 @@ | | ... | interface=${dut2_if2} | next_hop=${tg_if2_ip6_subnet}2 | | Run Keyword If | "${n}" == "2" and "${prepos}" == "without" | | ... | Vpp Route Add | ${dut2} | ${dut2_sid1_2} | ${sid_prefix} -| | ... | ${tg_if2_ip6_subnet}2 | ${dut2_if2} +| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2} # Configure SRv6 for direction1 | | Set SR Encaps Source Address on DUT | ${dut2} | ${dut2_sid2} | | @{sid_list_dir1}= | Run Keyword If | "${n}" == "1" @@ -963,7 +970,7 @@ | | ... | interface=${dut1_if1} | next_hop=${tg_if1_ip6_subnet}2 | | Run Keyword If | "${n}" == "2" and "${prepos}" == "without" | | ... | Vpp Route Add | ${dut1} | ${dut1_sid2_2} | ${sid_prefix} -| | ... | ${tg_if1_ip6_subnet}2 | ${dut1_if1} +| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${dut1_if1} | | Set interfaces in path up | Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via '${behavior}' behaviour in 3-node circular topology @@ -983,8 +990,8 @@ | | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} -| | ${sock1}= | Set Variable | memif-DUT1_VNF -| | ${sock2}= | Set Variable | memif-DUT2_VNF +| | ${sock1}= | Set Variable | memif-DUT1_CNF +| | ${sock2}= | Set Variable | memif-DUT2_CNF | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock1} | | ... | ${1} | dut1-memif-1-if1 | dut1-memif-1-if2 | ${rxq_count_int} | | ... | ${rxq_count_int} @@ -1023,14 +1030,14 @@ | | ... | ${dut1-memif-1-if2_mac} | | Add Ip Neighbor | ${dut2} | ${dut2-memif-1-if1} | ${dut2_nh} | | ... | ${dut2-memif-1-if2_mac} -| | Vpp Route Add | ${dut1} | ${dut2_sid1} | ${sid_prefix} | ${dut2_if1_ip6} -| | ... | ${dut1_if2} +| | Vpp Route Add | ${dut1} | ${dut2_sid1} | ${sid_prefix} +| | ... | gateway=${dut2_if1_ip6} | interface=${dut1_if2} | | Vpp Route Add | ${dut1} | ${out_sid2_1} | ${sid_prefix} -| | ... | ${tg_if1_ip6_subnet}2 | ${dut1_if1} -| | Vpp Route Add | ${dut2} | ${dut1_sid2} | ${sid_prefix} | ${dut1_if2_ip6} -| | ... | ${dut2_if1} +| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${dut1_if1} +| | Vpp Route Add | ${dut2} | ${dut1_sid2} | ${sid_prefix} +| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_if1} | | Vpp Route Add | ${dut2} | ${out_sid1_1} | ${sid_prefix} -| | ... | ${tg_if2_ip6_subnet}2 | ${dut2_if2} +| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2} # Configure SRv6 for direction0 on DUT1 | | Set SR Encaps Source Address on DUT | ${dut1} | ${dut1_sid1} | | @{sid_list_dir0}= | Create List | ${dut2_sid1} | ${out_sid1_1} @@ -1150,8 +1157,8 @@ | | [Arguments] | ${dut} | ${vm_count}=${1} | | ... | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 -| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 -| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 +| | | ${sock1}= | Set Variable | /var/run/vpp/sock-${number}-1 +| | | ${sock2}= | Set Variable | /var/run/vpp/sock-${number}-2 | | | ${prev_index}= | Evaluate | ${number}-1 | | | Configure vhost interfaces for L2BD forwarding | ${nodes['${dut}']} | | | ... | ${sock1} | ${sock2} | ${dut}-vhost-${number}-if1 @@ -1190,17 +1197,15 @@ | | ... | Setup VLAN between DUTs. All interfaces are brought up. | | ... | | ... | *Arguments:* -| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | | ... | *Example:* | | ... | | ... | \| L2 xconnect with Vhost-User and VLAN initialized in a 3-node\ -| | ... | circular topology \| /tmp/sock1 \| /tmp/sock2 \| 10 \| pop-1 \| +| | ... | circular topology \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | [Arguments] | ${subid} | ${tag_rewrite} | | ... | | Set interfaces in path up | | Initialize VLAN dot1q sub-interfaces in circular topology @@ -1209,11 +1214,11 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /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} -| | ... | ${sock1} | ${sock2} +| | ... | /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} @@ -1225,18 +1230,15 @@ | | ... | with VLAN sub-interface. All interfaces are brought up. | | ... | | ... | *Arguments:* -| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string | | ... | - 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 \| /tmp/sock1 \| /tmp/sock2 \ -| | ... | \| 10 \| pop-1 \| +| | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} +| | [Arguments] | ${subid} | ${tag_rewrite} | | ... | | Set interfaces in path up | | Add DPDK bonded ethernet interfaces to topology file in 3-node single link topology @@ -1251,11 +1253,11 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /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} -| | ... | ${sock1} | ${sock2} +| | ... | /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} @@ -1269,8 +1271,6 @@ | | ... | with VLAN sub-interface. All interfaces are brought up. | | ... | | ... | *Arguments:* -| | ... | - sock1 - Socket path for first Vhost-User interface. Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | - bond_mode - Link bonding mode. Type: string @@ -1279,11 +1279,9 @@ | | ... | *Example:* | | ... | | ... | \| Initialize L2 xconnect with Vhost-User and VLAN with VPP link\ -| | ... | bonding in 3-node circular topology \| /tmp/sock1 \| /tmp/sock2 \ -| | ... | \| 10 \| pop-1 \| \| xor \| l34 \| +| | ... | bonding in 3-node circular topology \| 10 \| pop-1 \| xor \| l34 \| | | ... -| | [Arguments] | ${sock1} | ${sock2} | ${subid} | ${tag_rewrite} | ${bond_mode} -| | ... | ${lb_mode} +| | [Arguments] | ${subid} | ${tag_rewrite} | ${bond_mode} | ${lb_mode} | | ... | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode} @@ -1324,11 +1322,11 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /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} -| | ... | ${sock1} | ${sock2} +| | ... | /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} @@ -1550,9 +1548,11 @@ | | ... | ${dut2} | ${dut2_if1} | 1.1.1.2 | 30 | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | 1.1.1.2 | ${dut1_if2} +| | ... | Vpp Route Add | ${dut1} | 20.20.20.0 | 24 | gateway=1.1.1.2 +| | ... | interface=${dut1_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | 1.1.1.1 | ${dut2_if1} +| | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=1.1.1.1 +| | ... | interface=${dut2_if1} | | ... | | Configure IPv4 ACLs | ${dut1} | ${dut1_if1} | ${dut1_if2} @@ -1686,7 +1686,8 @@ | | ... | | ... | *Arguments:* | | ... | - dut - DUT node. Type: string -| | ... | - vm_count - VM count. Type: integer +| | ... | - nf_chain - NF chain. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer | | ... | | ... | *Note:* | | ... | Socket paths for VM are defined in following format: @@ -1696,47 +1697,72 @@ | | ... | *Example:* | | ... | | ... | \| Initialize L2 bridge domains with Vhost-User on node \| DUT1 \ -| | ... | \| 1 \| +| | ... | \| 1 \| 1 \| | | ... -| | [Arguments] | ${dut} | ${vm_count}=${1} +| | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1} | | ... -| | ${bd_id2}= | Evaluate | ${vm_count}+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 | ${number} | IN RANGE | 1 | ${vm_count}+1 -| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 -| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 +| | :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-${number}-if1 -| | | ... | ${dut}-vhost-${number}-if2 -| | | ${bd_id2}= | Evaluate | ${number}+1 +| | | ... | ${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-${number}-if1} | ${number} +| | | ... | ${${dut}-vhost-${qemu_id}-if1} | ${nf_node} | | | Add interface to bridge domain | ${nodes['${dut}']} -| | | ... | ${${dut}-vhost-${number}-if2} | ${bd_id2} +| | | ... | ${${dut}-vhost-${qemu_id}-if2} | ${bd_id2} | Initialize L2 bridge domains with Vhost-User | | [Documentation] -| | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all -| | ... | defined VPP nodes. Add each Vhost-User interface into L2 bridge +| | ... | Create pairs of Vhost-User interfaces for 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. | | ... | | ... | *Arguments:* -| | ... | - vm_count - VM count. Type: integer +| | ... | - nf_chain - NF chain. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize L2 bridge domains with Vhost-User \| 1 \| +| | ... | \| Initialize L2 bridge domains with Vhost-User \| 1 \| 1 \| | | ... -| | [Arguments] | ${vm_count}=${1} +| | [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} -| | | ... | vm_count=${vm_count} +| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} + +| Initialize L2 bridge domains for multiple chains with Vhost-User +| | [Documentation] +| | ... | Create pairs of Vhost-User interfaces for defined number of NF chains +| | ... | 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. +| | ... +| | ... | *Arguments:* +| | ... | - nf_chains - Number of chains of NFs. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 bridge domains for multiple chains with Vhost-User \ +| | ... | \| 1 \| 1 \| +| | ... +| | [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} | Initialize L2 bridge domain with VXLANoIPv4 in 3-node circular topology | | [Documentation] @@ -1817,15 +1843,13 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | | ... | *Example:* | | ... | | ... | \| L2 bridge domains with Vhost-User and VXLANoIPv4 initialized in a\ -| | ... | 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \| +| | ... | 3-node circular topology \| 1 \| 2 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} +| | [Arguments] | ${bd_id1} | ${bd_id2} | | ... | | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 | | ... | 24 @@ -1837,13 +1861,13 @@ | | ${dut2s_vxlan}= | Create VXLAN interface | ${dut2} | 24 | | ... | 172.16.0.2 | 172.16.0.1 | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /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} | ${dut1s_vxlan} | ${bd_id2} | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2s_vxlan} | ${bd_id1} | | Add interface to bridge domain | ${dut2} | ${vhost_if1} | ${bd_id1} | | Add interface to bridge domain | ${dut2} | ${vhost_if2} | ${bd_id2} @@ -1910,9 +1934,9 @@ | | Add arp on dut | ${dut1} | ${dut1_if1} | ${dut1_gw} | ${tg_if1_mac} | | Add arp on dut | ${dut2} | ${dut2_if2} | ${dut2_gw} | ${tg_if2_mac} | | Vpp Route Add | ${dut1} | ${dut1_route_subnet} | ${dut1_route_mask} -| | ... | ${dut1_gw} | ${dut1_if1} +| | ... | gateway=${dut1_gw} | interface=${dut1_if1} | | Vpp Route Add | ${dut2} | ${dut2_route_subnet} | ${dut2_route_mask} -| | ... | ${dut2_gw} | ${dut2_if2} +| | ... | gateway=${dut2_gw} | interface=${dut2_if2} | | Add interface to bridge domain | ${dut1} | ${dut1_if2} | ${dut1_bd_id2} | | Add interface to bridge domain | ${dut2} | ${dut2_if1} | ${dut2_bd_id1} | | Add interface to bridge domain | ${dut1} | ${vhost_if1} | ${dut1_bd_id1} @@ -1981,18 +2005,15 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | | ... | *Example:* | | ... | | ... | \| L2 bridge domains with Vhost-User and VLAN initialized in circular\ -| | ... | topology \| 1 \| 2 \| /tmp/sock1 \| /tmp/sock2 \| 10 \| pop-1 \| +| | ... | topology \| 1 \| 2 \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} | | ... | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2} @@ -2011,14 +2032,14 @@ | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} | | ... | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /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} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | ${sock1} | ${sock2} +| | ... | /var/run/vpp/sock-1-${bd_id1} | /var/run/vpp/sock-1-${bd_id2} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Add interface to bridge domain | ${dut2} | ${subif_index_2} | | ... | ${bd_id1} @@ -2041,8 +2062,6 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... @@ -2052,8 +2071,7 @@ | | ... | link bonding in a 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \ | | ... | \| /tmp/sock2 \| 10 \| pop-1 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} +| | [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 @@ -2068,13 +2086,13 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /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} -| | ... | ${sock1} | ${sock2} +| | ... | /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} @@ -2094,8 +2112,6 @@ | | ... | *Arguments:* | | ... | - bd_id1 - Bridge domain ID. Type: integer | | ... | - bd_id2 - Bridge domain ID. Type: integer -| | ... | - sock1 - Sock path for first Vhost-User interface. Type: string -| | ... | - sock2 - Sock path for second Vhost-User interface. Type: string | | ... | - subid - ID of the sub-interface to be created. Type: string | | ... | - tag_rewrite - Method of tag rewrite. Type: string | | ... | - bond_mode - Link bonding mode. Type: string @@ -2104,11 +2120,11 @@ | | ... | *Example:* | | ... | | ... | \| Initialize L2 bridge domains with Vhost-User and VLAN with VPP\ -| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \| /tmp/sock1 \ -| | ... | \| /tmp/sock2 \| 10 \| pop-1 \| xor \| l34 \| +| | ... | link bonding in a 3-node circular topology \| 1 \| 2 \ +| | ... | \| 10 \| pop-1 \| xor \| l34 \| | | ... -| | [Arguments] | ${bd_id1} | ${bd_id2} | ${sock1} | ${sock2} | ${subid} -| | ... | ${tag_rewrite} | ${bond_mode} | ${lb_mode} +| | [Arguments] | ${bd_id1} | ${bd_id2} | ${subid} | ${tag_rewrite} +| | ... | ${bond_mode} | ${lb_mode} | | ... | | Set interfaces in path up | | ${dut1_eth_bond_if1}= | VPP Create Bond Interface | ${dut1} | ${bond_mode} @@ -2149,13 +2165,13 @@ | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | ${sock1} | ${sock2} +| | ... | /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} -| | ... | ${sock1} | ${sock2} +| | ... | /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} @@ -2252,6 +2268,45 @@ | | 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 +| Configure chains of NFs connected via vhost-user +| | [Documentation] +| | ... | Start 1..N chains of 1..N QEMU guests (VNFs) with two vhost-user\ +| | ... | interfaces and interconnecting NF. +| | ... +| | ... | *Arguments:* +| | ... | - nf_chains - Number of chains of NFs. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - jumbo - Jumbo frames are used (True) or are not used (False) +| | ... | in the test. Type: boolean +| | ... | - perf_qemu_qsz - Virtio Queue Size. Type: integer +| | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. +| | ... | Type: boolean +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean +| | ... | - vnf - Network function as a payload. Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Configure chains of VMs connected via vhost-user +| | ... | \| 1 \| 1 \| False \| 1024 \| False \| False \| vpp +| | ... +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${jumbo}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} +| | ... | ${auto_scale}=${True} | ${vnf}=vpp +| | ... +| | Import Library | resources.libraries.python.QemuManager | ${nodes} +| | ... | WITH NAME | vnf_manager +| | Run Keyword | vnf_manager.Construct VMs on all nodes +| | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | jumbo=${jumbo} +| | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs} +| | ... | auto_scale=${auto_scale} | vnf=${vnf} +| | ... | tg_if1_mac=${tg_if1_mac} | tg_if2_mac=${tg_if2_mac} +| | ... | cpu_count_int=${cpu_count_int} | rxq_count_int=${rxq_count_int} +| | Run Keyword | vnf_manager.Start All VMs | pinning=${True} +| | Run Keyword If | ${use_tuned_cfs} | vnf_manager.Set Scheduler All VMs +| | All VPP Interfaces Ready Wait | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual + | Configure guest VM with dpdk-testpmd connected via vhost-user | | [Documentation] | | ... | Start QEMU guest with two vhost-user interfaces and interconnecting\ @@ -2263,6 +2318,7 @@ | | ... | - sock2 - Socket path for second Vhost-User interface. | | ... | Type: string | | ... | - vm_name - QemuUtil instance name. Type: string +| | ... | - nf_cpus: List of allocated CPUs. Type: list | | ... | - qemu_id - Qemu Id when starting more then one guest VM on DUT | | ... | node. Type: integer | | ... | - jumbo - Set True if jumbo frames are used in the test. @@ -2270,6 +2326,8 @@ | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: int | | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. | | ... | Type: bool +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Note:* | | ... | KW uses test variables \${rxq_count_int}, \${thr_count_int} and @@ -2278,70 +2336,43 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VM with dpdk-testpmd connected via vhost-user \ -| | ... | \| ${nodes['DUT1']} \| /tmp/sock-2-1 \| /tmp/sock-2-2 \| DUT1_VM2 \ -| | ... | \| qemu_id=${2} \| +| | ... | \| ${nodes['DUT1']} \| /tmp/sock-1-1 \| /tmp/sock-1-2 \ +| | ... | \| DUT1_VM2 \| qemu_id=${2} \| | | ... -| | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${qemu_id}=${1} -| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${nf_cpus} +| | ... | ${qemu_id}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True} | | ... -| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} -| | ... | WITH NAME | ${vm_name} -| | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']} -| | ${serial_port}= | Evaluate | ${qemu_id} + ${4555} -| | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port} -| | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021} -| | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port} -| | ${if1_status} | ${value}= | Run Keyword And Ignore Error -| | ... | Variable Should Exist | ${${dut}_if1} -| | @{if_list}= | Run Keyword If | '${if1_status}' == 'PASS' -| | ... | Create List | ${${dut}_if1} -| | ... | ELSE | Create List | ${${dut}_if1_1} | ${${dut}_if1_2} -| | ${if2_status} | ${value}= | Run Keyword And Ignore Error -| | ... | Variable Should Exist | ${${dut}_if2} -| | Run Keyword If | '${if2_status}' == 'PASS' -| | ... | Append To List | ${if_list} | ${${dut}_if2} -| | ... | ELSE | Append To List | ${if_list} | ${${dut}_if2_1} | ${${dut}_if2_2} -| | ${dut_numa}= | Get interfaces numa node | ${nodes['${dut}']} | @{if_list} -# Compute CPU placement for VM based on expected DUT placement. -| | ${os_cpus}= | Set Variable | ${1} -| | ${dut_main_cpus}= | Set Variable | ${1} -| | ${dut_wk_cpus}= | Set Variable | ${cpu_count_int} -| | ${vm_cpus}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus} -| | ${skip_dut}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus} + ${os_cpus} -| | ${skip_cpu}= | Evaluate | ${skip_dut} + (${qemu_id} - ${1}) * ${vm_cpus} -| | ${qemu_cpus}= | Cpu slice of list per node | ${nodes['${dut}']} -| | ... | ${dut_numa} | skip_cnt=${skip_cpu} | cpu_cnt=${vm_cpus} -| | ... | smt_used=${smt_used} -| | ${vm_thrs}= | Get Length | ${qemu_cpus} -| | Run keyword | ${vm_name}.Qemu Set Queue Count | ${rxq_count_int} -| | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz} -| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} -| | ... | jumbo_frames=${jumbo} -| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} -| | ... | jumbo_frames=${jumbo} | | ${apply_patch}= | Set Variable | ${False} | | ${perf_qemu_path}= | Set Variable If | ${apply_patch} -| | ... | ${perf_qemu_path}-patch/bin/ -| | ... | ${perf_qemu_path}-base/bin/ +| | ... | ${perf_qemu_path}-patch/bin +| | ... | ${perf_qemu_path}-base/bin +| | ${nf_cpus_count}= | Get Length | ${nf_cpus} +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${1} +| | Import Library | resources.libraries.python.QemuUtils | ${nodes['${dut}']} +| | ... | qemu_id=${qemu_id} | smp=${nf_cpus_count} | mem=${2048} +| | ... | img=${perf_vm_image} | bin_path=${perf_qemu_path} +| | ... | WITH NAME | ${vm_name} +| | Run Keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} +| | Run Keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} | | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${nodes['${dut}']} -| | ... | apply_patch=${False} -| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} -| | Run keyword | ${vm_name}.Qemu Set Smp | ${vm_thrs} | ${vm_thrs} | 1 | 1 -| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image} -| | ${vm}= | Run keyword | ${vm_name}.Qemu Start -| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus} -| | Run keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy +| | ... | apply_patch=${apply_patch} +| | ${vm}= | Run Keyword | ${vm_name}.Qemu Start +| | Run Keyword | ${vm_name}.Qemu Set Affinity | @{nf_cpus} +| | Run Keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy | | ${max_pkt_len}= | Set Variable If | ${jumbo} | 9200 | ${EMPTY} -| | ${testpmd_cpus}= | Evaluate | ${thr_count_int} + ${1} | | ${testpmd_cpus}= | Cpu list per node str | ${nodes['${dut}']} | ${0} -| | ... | cpu_cnt=${testpmd_cpus} +| | ... | cpu_cnt=${nf_cpus_count} | | Dpdk Testpmd Start | ${vm} | eal_corelist=${testpmd_cpus} -| | ... | eal_mem_channels=4 | pmd_fwd_mode=io | pmd_disable_hw_vlan=${TRUE} +| | ... | pmd_fwd_mode=io | pmd_disable_hw_vlan=${TRUE} | | ... | pmd_rxd=${perf_qemu_qsz} | pmd_txd=${perf_qemu_qsz} -| | ... | pmd_rxq=${rxq_count_int} | pmd_txq=${rxq_count_int} -| | ... | pmd_max_pkt_len=${max_pkt_len} +| | ... | pmd_rxq=${rxq} | pmd_txq=${rxq} | pmd_max_pkt_len=${max_pkt_len} | | Return From Keyword | ${vm} | Configure guest VMs with dpdk-testpmd connected via vhost-user on node @@ -2362,20 +2393,24 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd connected via \ -| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 256 \| +| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 1024 \| | | ... | | [Arguments] | ${dut} | ${vm_count}=${1} | ${jumbo}=${False} | -| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 -| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 -| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 +| | | ${nf_cpus}= | Create network function CPU list | ${dut} +| | | ... | chains=${1} | nodeness=${vm_count} | chain_id=${1} +| | | ... | node_id=${number} | auto_scale=${True} +| | | ${sock1}= | Set Variable | /var/run/vpp/sock-${number}-1 +| | | ${sock2}= | Set Variable | /var/run/vpp/sock-${number}-2 | | | ${vm}= | | | ... | Configure guest VM with dpdk-testpmd connected via vhost-user -| | | ... | ${dut} | ${sock1} | ${sock2} | ${dut}_VM${number} -| | | ... | qemu_id=${number} | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz} -| | | ... | use_tuned_cfs=${use_tuned_cfs} -| | | Set To Dictionary | ${${dut}_vm_refs} | ${dut}_VM${number} | ${vm} +| | | ... | ${dut} | ${sock1} | ${sock2} | ${TEST NAME}${dut}_VM${number} +| | | ... | ${nf_cpus} | qemu_id=${number} | jumbo=${jumbo} +| | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs} +| | | Set To Dictionary | ${${dut}_vm_refs} | ${TEST NAME}${dut}_VM${number} +| | | ... | ${vm} | Configure guest VMs with dpdk-testpmd connected via vhost-user | | [Documentation] @@ -2394,17 +2429,18 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd connected via vhost-user\ -| | ... | \| 1 \| False \| 256 \| +| | ... | \| 1 \| False \| 1024 \| | | ... -| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Configure guest VMs with dpdk-testpmd connected via vhost-user on node | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} -| | All VPP Interfaces Ready Wait | ${nodes} +| | All VPP Interfaces Ready Wait | ${nodes} | timeout=${90} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual | Configure guest VM with dpdk-testpmd-mac connected via vhost-user | | [Documentation] @@ -2420,6 +2456,7 @@ | | ... | - vm_name - QemuUtil instance name. Type: string | | ... | - eth0_mac - MAC address of first Vhost interface. Type: string | | ... | - eth1_mac - MAC address of second Vhost interface. Type: string +| | ... | - nf_cpus: List of allocated CPUs. Type: list | | ... | - qemu_id - Qemu Id when starting more then one guest VM on DUT | | ... | node. Type: integer | | ... | - jumbo - Set True if jumbo frames are used in the test. @@ -2427,6 +2464,8 @@ | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: int | | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. | | ... | Type: bool +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Note:* | | ... | KW uses test variables \${rxq_count_int}, \${thr_count_int} and @@ -2439,58 +2478,41 @@ | | ... | \| 00:00:00:00:00:01 \| 00:00:00:00:00:02 \| | | ... | | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} -| | ... | ${eth0_mac} | ${eth1_mac} | ${qemu_id}=${1} | ${jumbo}=${False} -| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False} +| | ... | ${eth0_mac} | ${eth1_mac} | ${nf_cpus} | ${qemu_id}=${1} +| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${True} | | ... -| | Import Library | resources.libraries.python.QemuUtils | qemu_id=${qemu_id} +| | ${apply_patch}= | Set Variable | ${False} +| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} +| | ... | ${perf_qemu_path}-patch/bin +| | ... | ${perf_qemu_path}-base/bin +| | ${nf_cpus_count}= | Get Length | ${nf_cpus} +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${1} +| | Import Library | resources.libraries.python.QemuUtils | ${nodes['${dut}']} +| | ... | qemu_id=${qemu_id} | smp=${nf_cpus_count} | mem=${2048} +| | ... | img=${perf_vm_image} | bin_path=${perf_qemu_path} | | ... | WITH NAME | ${vm_name} -| | Run keyword | ${vm_name}.Qemu Set Node | ${nodes['${dut}']} -| | ${serial_port}= | Evaluate | ${qemu_id} + ${4555} -| | Run keyword | ${vm_name}.Qemu Set Serial Port | ${serial_port} -| | ${ssh_fwd_port}= | Evaluate | ${qemu_id} + ${10021} -| | Run keyword | ${vm_name}.Qemu Set Ssh Fwd Port | ${ssh_fwd_port} -| | ${dut_numa}= | Get interfaces numa node | ${nodes['${dut}']} -| | ... | ${${dut}_if1} | ${${dut}_if2} -# Compute CPU placement for VM based on expected DUT placement. -| | ${os_cpus}= | Set Variable | ${1} -| | ${dut_main_cpus}= | Set Variable | ${1} -| | ${dut_wk_cpus}= | Set Variable | ${cpu_count_int} -| | ${vm_cpus}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus} -| | ${skip_dut}= | Evaluate | ${dut_wk_cpus} + ${dut_main_cpus} + ${os_cpus} -| | ${skip_cpu}= | Evaluate | ${skip_dut} + (${qemu_id} - ${1}) * ${vm_cpus} -| | ${qemu_cpus}= | Cpu slice of list per node | ${nodes['${dut}']} -| | ... | ${dut_numa} | skip_cnt=${skip_cpu} | cpu_cnt=${vm_cpus} -| | ... | smt_used=${smt_used} -| | ${vm_thrs}= | Get Length | ${qemu_cpus} -| | Run keyword | ${vm_name}.Qemu Set Queue Count | ${rxq_count_int} -| | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} -| | ... | jumbo_frames=${jumbo} +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} | | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} -| | ... | jumbo_frames=${jumbo} -| | ${apply_patch}= | Set Variable | ${False} -| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} -| | ... | ${perf_qemu_path}-patch/bin/ -| | ... | ${perf_qemu_path}-base/bin/ +| | ... | jumbo_frames=${jumbo} | queues=${rxq_count_int} +| | ... | queue_size=${perf_qemu_qsz} | | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${nodes['${dut}']} | | ... | apply_patch=${False} -| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} -| | Run keyword | ${vm_name}.Qemu Set Smp | ${vm_thrs} | ${vm_thrs} | 1 | 1 -| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image} | | ${vm}= | Run keyword | ${vm_name}.Qemu Start -| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus} +| | Run keyword | ${vm_name}.Qemu Set Affinity | @{nf_cpus} | | Run keyword If | ${use_tuned_cfs} | ${vm_name}.Qemu Set Scheduler Policy | | ${max_pkt_len}= | Set Variable If | ${jumbo} | 9200 | ${EMPTY} -| | ${testpmd_cpus}= | Evaluate | ${thr_count_int} + ${1} | | ${testpmd_cpus}= | Cpu list per node str | ${nodes['${dut}']} | ${0} -| | ... | cpu_cnt=${testpmd_cpus} +| | ... | cpu_cnt=${nf_cpus_count} | | Dpdk Testpmd Start | ${vm} | eal_corelist=${testpmd_cpus} -| | ... | eal_mem_channels=4 | pmd_fwd_mode=mac | pmd_eth_peer_0=0,${eth0_mac} +| | ... | pmd_fwd_mode=mac | pmd_eth_peer_0=0,${eth0_mac} | | ... | pmd_eth_peer_1=1,${eth1_mac} | pmd_disable_hw_vlan=${TRUE} | | ... | pmd_rxd=${perf_qemu_qsz} | pmd_txd=${perf_qemu_qsz} -| | ... | pmd_rxq=${rxq_count_int} | pmd_txq=${rxq_count_int} -| | ... | pmd_max_pkt_len=${max_pkt_len} +| | ... | pmd_rxq=${rxq} | pmd_txq=${rxq} | pmd_max_pkt_len=${max_pkt_len} | | Return From Keyword | ${vm} | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user on node @@ -2501,7 +2523,7 @@ | | ... | | ... | *Arguments:* | | ... | - dut - DUT node to start guest VM on. Type: dictionary -| | ... | - vm_count} - Number of guest VMs. Type: int +| | ... | - vm_count - Number of guest VMs. Type: int | | ... | - jumbo - Jumbo frames are used (True) or are not used (False) | | ... | in the test. Type: boolean | | ... | - perf_qemu_qsz - Virtio Queue Size. Type: int @@ -2514,22 +2536,26 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd-mac connected via \ -| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 256 \| +| | ... | vhost-user on node \| DUT1 \| 1 \| False \| 1024 \| | | ... | | [Arguments] | ${dut} | ${vm_count}=${1} | ${jumbo}=${False} | -| | ... | ${perf_qemu_qsz}=${256} | ${use_tuned_cfs}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | :FOR | ${number} | IN RANGE | 1 | ${vm_count}+1 -| | | ${sock1}= | Set Variable | /tmp/sock-${number}-1 -| | | ${sock2}= | Set Variable | /tmp/sock-${number}-2 +| | | ${nf_cpus}= | Create network function CPU list | ${dut} +| | | ... | chains=${1} | nodeness=${vm_count} | chain_id=${1} +| | | ... | node_id=${number} | auto_scale=${True} +| | | ${sock1}= | Set Variable | /var/run/vpp/sock-${number}-1 +| | | ${sock2}= | Set Variable | /var/run/vpp/sock-${number}-2 | | | ${vm}= | | | ... | Configure guest VM with dpdk-testpmd-mac connected via vhost-user -| | | ... | ${dut} | ${sock1} | ${sock2} | ${dut}_VM${number} +| | | ... | ${dut} | ${sock1} | ${sock2} | ${TEST NAME}${dut}_VM${number} | | | ... | ${${dut}-vhost-${number}-if1_mac} -| | | ... | ${${dut}-vhost-${number}-if2_mac} | qemu_id=${number} -| | | ... | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz} +| | | ... | ${${dut}-vhost-${number}-if2_mac} | nf_cpus=${nf_cpus} +| | | ... | qemu_id=${number} | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz} | | | ... | use_tuned_cfs=${use_tuned_cfs} -| | | Set To Dictionary | ${${dut}_vm_refs} | ${dut}_VM${number} | ${vm} +| | | Set To Dictionary | ${${dut}_vm_refs} | ${TEST NAME}${dut}_VM${number} +| | | ... | ${vm} | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user | | [Documentation] @@ -2548,77 +2574,145 @@ | | ... | *Example:* | | ... | | ... | \| Configure guest VMs with dpdk-testpmd-mac connected via vhost-user\ -| | ... | \| 1 \| False \| 256 \| +| | ... | \| 1 \| False \| 1024 \| | | ... -| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${256} -| | ... | ${use_tuned_cfs}=${False} +| | [Arguments] | ${vm_count}=${1} | ${jumbo}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Configure guest VMs with dpdk-testpmd-mac connected via vhost-user on node | | | ... | ${dut} | vm_count=${vm_count} | jumbo=${jumbo} | | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} -| | All VPP Interfaces Ready Wait | ${nodes} +| | All VPP Interfaces Ready Wait | ${nodes} | timeout=${90} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual -| Configure guest VM with linux bridge connected via vhost-user +| Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user on node | | [Documentation] -| | ... | Start QEMU guest with two vhost-user interfaces and interconnecting\ -| | ... | linux bridge. +| | ... | Start 1 chain of 1..N QEMU guests (VNFs) with two vhost-user\ +| | ... | interfaces and interconnecting DPDK testpmd with fwd mode set to mac\ +| | ... | rewrite on VPP node. | | ... | | ... | *Arguments:* | | ... | - dut - DUT node to start guest VM on. Type: dictionary -| | ... | - sock1 - Socket path for first Vhost-User interface. -| | ... | Type: string -| | ... | - sock2 - Socket path for second Vhost-User interface. -| | ... | Type: string -| | ... | - vm_name - QemuUtil instance name. Type: string -| | ... | - skip_cnt - number of cpus which will be skipped. Type: int +| | ... | - nf_chains - Number of chains of NFs. Type: integer +| | ... | - nf_chain - NF chain ID. Type: integer +| | ... | - nf_nodes - Number of guest VMs. Type: integer +| | ... | - jumbo - Jumbo frames are used (True) or are not used (False) +| | ... | in the test. Type: boolean +| | ... | - perf_qemu_qsz - Virtio Queue Size. Type: integer +| | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. +| | ... | Type: boolean +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... -| | ... | _NOTE:_ This KW expects following test case variables to be set: -| | ... | - cpu_count_int - Number of Physical CPUs allocated for DUT. +| | ... | *Example:* +| | ... +| | ... | \| Configure chain of NFs with dpdk-testpmd-mac connected via \ +| | ... | vhost-user on node \| DUT1 \| 1 \| 1 \| 1 \| False \| 1024 \| +| | ... +| | [Arguments] | ${dut} | ${nf_chains}=${1} | ${nf_chain}=${1} +| | ... | ${nf_nodes}=${1} | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${False} +| | ... +| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} +| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} +| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes} + ${1} +| | | ${nf_cpus}= | Create network function CPU list | ${dut} +| | | ... | chains=${nf_chains} | nodeness=${nf_nodes} | chain_id=${nf_chain} +| | | ... | node_id=${nf_node} | auto_scale=${False} +| | | ${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 +| | | ${nf_name}= | Set Variable | ${dut}_VM${qemu_id} +| | | ${prev_qemu_id}= | Evaluate | ${qemu_id} - ${1} +| | | ${next_qemu_id}= | Evaluate | ${qemu_id} + ${1} +| | | ${prev_qemu_id_hex}= | Convert To Hex | ${prev_qemu_id} | length=2 +| | | ... | lowercase=yes +| | | ${next_qemu_id_hex}= | Convert To Hex | ${next_qemu_id} | length=2 +| | | ... | lowercase=yes +| | | ${vif1_mac}= | Set Variable If | ${nf_node} == ${1} +| | | ... | ${tg_if1_mac} +| | | ... | 52:54:00:00:${prev_qemu_id_hex}:02 +| | | ${vif2_mac}= | Set Variable If | ${nf_node} == ${nf_nodes} +| | | ... | ${tg_if2_mac} +| | | ... | 52:54:00:00:${next_qemu_id_hex}:01 +| | | ${vm}= +| | | ... | Configure guest VM with dpdk-testpmd-mac connected via vhost-user +| | | ... | ${dut} | ${sock1} | ${sock2} | ${nf_name} | ${vif1_mac} +| | | ... | ${vif2_mac} | ${nf_cpus} | qemu_id=${qemu_id} | jumbo=${jumbo} +| | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${use_tuned_cfs} +| | | ... | auto_scale=${auto_scale} +| | | Set To Dictionary | ${${dut}_vm_refs} | ${nf_name} | ${vm} + +| Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user +| | [Documentation] +| | ... | Start 1 chain of 1..N QEMU guests (VNFs) with two vhost-user\ +| | ... | interfaces and interconnecting DPDK testpmd with fwd mode set to mac\ +| | ... | rewrite on all defined VPP nodes. +| | ... +| | ... | *Arguments:* +| | ... | - nf_chains - Number of chains of NFs. Type: integer +| | ... | - nf_chain - NF chain ID. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - jumbo - Jumbo frames are used (True) or are not used (False) +| | ... | in the test. Type: boolean +| | ... | - perf_qemu_qsz - Virtio Queue Size. Type: integer +| | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. +| | ... | Type: boolean +| | ... | - auto_scale - Whether to use same amount of RXQs for vhost interface +| | ... | in VM as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... -| | ... | \| Configure guest VM with linux bridge connected via vhost-user \ -| | ... | \| ${nodes['DUT1']} \| /tmp/sock1 \| /tmp/sock2 \| DUT1_VM \| ${6} \| +| | ... | \| Configure chain of NFs with dpdk-testpmd-mac connected via\ +| | ... | vhost-user \| 1 \| 1 \| 1 \| False \| 1024 \| | | ... -| | [Arguments] | ${dut} | ${sock1} | ${sock2} | ${vm_name} | ${skip_cnt}=${6} -| | ... | ${count}=${5} +| | [Arguments] | ${nf_chains}=${1} | ${nf_chain}=${1} | ${nf_nodes}=${1} +| | ... | ${jumbo}=${False} | ${perf_qemu_qsz}=${1024} +| | ... | ${use_tuned_cfs}=${False} | ${auto_scale}=${False} | | ... -| | Import Library | resources.libraries.python.QemuUtils -| | ... | WITH NAME | ${vm_name} -| | Run keyword | ${vm_name}.Qemu Set Node | ${dut} -| | ${dut_numa}= | Get interfaces numa node | ${dut} -| | ... | ${dut1_if1} | ${dut1_if2} -| | ${vm_phy_cpus}= | Evaluate | ${cpu_count_int} + ${1} -| | ${skip_cnt}= | Evaluate | ${skip} + (${qemu_id} - ${1}) * ${vm_phy_cpus} -| | ${qemu_cpus}= | Cpu slice of list per node | ${dut} | ${dut_numa} -| | ... | skip_cnt=${skip_cnt} | cpu_cnt=${vm_phy_cpus} | smt_used=${smt_used} -| | ${vm_thr_cpus}= | Get Length | ${qemu_cpus} -| | Run keyword | ${vm_name}.Qemu Set Queue Size | ${perf_qemu_qsz} -| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock1} -| | Run keyword | ${vm_name}.Qemu Add Vhost User If | ${sock2} -| | ${apply_patch}= | Set Variable | ${False} -| | ${perf_qemu_path}= | Set Variable If | ${apply_patch} -| | ... | ${perf_qemu_path}-patch/bin/ -| | ... | ${perf_qemu_path}-base/bin/ -| | Run Keyword If | ${qemu_build} | ${vm_name}.Build QEMU | ${dut} -| | ... | apply_patch=${apply_patch} -| | Run keyword | ${vm_name}.Qemu Set Path | ${perf_qemu_path} -| | Run keyword | ${vm_name}.Qemu Set Smp | ${vm_thr_cpus} | ${vm_thr_cpus} -| | ... | 1 | 1 -| | Run keyword | ${vm_name}.Qemu Set Mem Size | 2048 -| | Run keyword | ${vm_name}.Qemu Set Disk Image | ${perf_vm_image} -| | ${vm}= | Run keyword | ${vm_name}.Qemu Start -| | Run keyword | ${vm_name}.Qemu Set Affinity | @{qemu_cpus} -| | ${br}= | Set Variable | br0 -| | ${vhost1}= | Get Vhost User If Name By Sock | ${vm} | ${sock1} -| | ${vhost2}= | Get Vhost User If Name By Sock | ${vm} | ${sock2} -| | Linux Add Bridge | ${vm} | ${br} | ${vhost1} | ${vhost2} -| | Set Interface State | ${vm} | ${vhost1} | up | if_type=name -| | Set Interface State | ${vm} | ${vhost2} | up | if_type=name -| | Set Interface State | ${vm} | ${br} | up | if_type=name -| | Return From Keyword | ${vm} +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user on node +| | | ... | ${dut} | nf_chains=${nf_chains} | nf_chain=${nf_chain} +| | | ... | nf_nodes=${nf_nodes} | jumbo=${jumbo} +| | | ... | perf_qemu_qsz=${perf_qemu_qsz} | use_tuned_cfs=${False} +| | | ... | auto_scale=${auto_scale} + +| Configure chains of NFs with dpdk-testpmd-mac connected via vhost-user +| | [Documentation] +| | ... | Start 1..N chains of 1..N QEMU guests (VNFs) with two vhost-user\ +| | ... | interfaces and interconnecting DPDK testpmd with fwd mode set to mac\ +| | ... | rewrite on all defined VPP nodes. +| | ... +| | ... | *Arguments:* +| | ... | - nf_chains - Number of chains of NFs. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - jumbo - Jumbo frames are used (True) or are not used (False) +| | ... | in the test. Type: boolean +| | ... | - perf_qemu_qsz - Virtio Queue Size. Type: integer +| | ... | - use_tuned_cfs - Set True if CFS RR should be used for Qemu SMP. +| | ... | Type: boolean +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Configure chains of VMs with dpdk-testpmd-mac connected via \ +| | ... | vhost-user \| 1 \| 1 \| False \| 1024 \| +| | ... +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${jumbo}=${False} +| | ... | ${perf_qemu_qsz}=${1024} | ${use_tuned_cfs}=${False} +| | ... | ${auto_scale}=${False} +| | ... +| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 +| | | Configure chain of NFs with dpdk-testpmd-mac connected via vhost-user +| | | ... | nf_chains=${nf_chains} | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | | ... | jumbo=${jumbo} | perf_qemu_qsz=${perf_qemu_qsz} +| | | ... | use_tuned_cfs=${False} | auto_scale=${auto_scale} +| | All VPP Interfaces Ready Wait | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=Virtual | Initialize LISP IPv4 forwarding in 3-node circular topology | | [Documentation] | Custom setup of IPv4 addresses on all DUT nodes and TG \ @@ -2876,13 +2970,17 @@ | | ... | Add arp on dut | ${dut2} | ${dut2_if1} | 11.0.0.1 | ${dut1_if2_mac} | | Add arp on dut | ${dut} | ${dut_if2} | 12.0.0.2 | ${tg_if2_mac} | | ... -| | Vpp Route Add | ${dut1} | 20.0.0.0 | 18 | 10.0.0.2 | ${dut1_if1} +| | Vpp Route Add | ${dut1} | 20.0.0.0 | 18 | gateway=10.0.0.2 +| | ... | interface=${dut1_if1} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut1} | 12.0.0.2 | 32 | 11.0.0.2 | ${dut1_if2} +| | ... | Vpp Route Add | ${dut1} | 12.0.0.2 | 32 | gateway=11.0.0.2 +| | ... | interface=${dut1_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | 12.0.0.2 | ${dut2_if2} +| | ... | Vpp Route Add | ${dut2} | 12.0.0.0 | 24 | gateway=12.0.0.2 +| | ... | interface=${dut2_if2} | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | 11.0.0.1 | ${dut2_if1} +| | ... | Vpp Route Add | ${dut2} | 200.0.0.0 | 30 | gateway=11.0.0.1 +| | ... | interface=${dut2_if1} | | ... | | Configure inside and outside interfaces | | ... | ${dut1} | ${dut1_if1} | ${dut1_if2} @@ -2901,7 +2999,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-\${dut}_VNF\${number}-\${sid} +| | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid} | | ... | | ... | KW uses test variable \${rxq_count_int} set by KW Add worker threads | | ... | and rxqueues to all DUTs @@ -2914,8 +3012,8 @@ | | [Arguments] | ${dut} | ${count} | | ... | | :FOR | ${number} | IN RANGE | 1 | ${count}+1 -| | | ${sock1}= | Set Variable | memif-${dut}_VNF -| | | ${sock2}= | Set Variable | memif-${dut}_VNF +| | | ${sock1}= | Set Variable | memif-${dut}_CNF +| | | ${sock2}= | Set Variable | memif-${dut}_CNF | | | ${prev_index}= | Evaluate | ${number}-1 | | | Set up memif interfaces on DUT node | ${nodes['${dut}']} | | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1 @@ -2947,43 +3045,52 @@ | | | Initialize L2 xconnect with memif pairs on DUT node | ${dut} | ${count} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 Bridge Domain with memif pairs on DUT node | | [Documentation] | | ... | Create pairs of Memif interfaces on DUT node. Put each Memif interface -| | ... | to separate L2 bridge domain with one physical or virtual interface +| | ... | to separate L2 bridge domain with one physical or memif interface | | ... | to create a chain accross DUT node. | | ... | | ... | *Arguments:* | | ... | - dut - DUT node. Type: dictionary -| | ... | - count - Number of memif pairs (containers). Type: integer +| | ... | - nf_chain - NF chain. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-\${dut}_VNF\${number}-\${sid} +| | ... | - /tmp/memif-\${dut}_CNF\${nf_id}-\${sid} | | ... | | ... | *Example:* | | ... | | ... | \| Initialize L2 Bridge Domain with memif pairs on DUT node \ -| | ... | \| ${dut} \| ${1} \| +| | ... | \| ${dut} \| 1 \| 1 \| | | ... -| | [Arguments] | ${dut} | ${count} +| | [Arguments] | ${dut} | ${nf_chain}=${1} | ${nf_nodes}=${1} +| | ... | ${auto_scale}=${True} | | ... -| | ${bd_id2}= | Evaluate | ${count}+1 +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${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 | ${number} | IN RANGE | 1 | ${count}+1 -| | | ${sock1}= | Set Variable | memif-${dut}_VNF -| | | ${sock2}= | Set Variable | memif-${dut}_VNF +| | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1 +| | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} +| | | ${sock1}= | Set Variable | memif-${dut}_CNF +| | | ${sock2}= | Set Variable | memif-${dut}_CNF | | | Set up memif interfaces on DUT node | ${nodes['${dut}']} -| | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1 -| | | ... | ${dut}-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int} -| | | ${bd_id2}= | Evaluate | ${number}+1 +| | | ... | ${sock1} | ${sock2} | ${nf_id} | ${dut}-memif-${nf_id}-if1 +| | | ... | ${dut}-memif-${nf_id}-if2 | ${rxq} | ${rxq} +| | | ${bd_id2}= | Evaluate | ${nf_node}+1 | | | Add interface to bridge domain | ${nodes['${dut}']} -| | | ... | ${${dut}-memif-${number}-if1} | ${number} +| | | ... | ${${dut}-memif-${nf_id}-if1} | ${nf_node} | | | Add interface to bridge domain | ${nodes['${dut}']} -| | | ... | ${${dut}-memif-${number}-if2} | ${bd_id2} +| | | ... | ${${dut}-memif-${nf_id}-if2} | ${bd_id2} | Initialize L2 Bridge Domain with memif pairs | | [Documentation] @@ -2992,20 +3099,120 @@ | | ... | virtual interface to create a chain accross DUT node. | | ... | | ... | *Arguments:* -| | ... | - count - Number of memif pairs (containers). Type: integer +| | ... | - nf_chain - NF chain. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean | | ... | | ... | *Example:* | | ... -| | ... | \| Initialize L2 Bridge Domain with memif pairs \| ${1} \| +| | ... | \| Initialize L2 Bridge Domain with memif pairs \| 1 \| 1 \| | | ... -| | [Arguments] | ${count}=${1} +| | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Initialize L2 Bridge Domain with memif pairs on DUT node | ${dut} -| | | ... | ${count} +| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | | ... | auto_scale=${auto_scale} + +| Initialize L2 Bridge Domain for multiple chains with memif pairs +| | [Documentation] +| | ... | Create pairs of Memif interfaces for defined number of NF chains +| | ... | with defined number of NF nodes on all defined VPP nodes. Add each +| | ... | Memif interface into L2 bridge domains with learning enabled +| | ... | with physical inteface or Memif interface of another NF. +| | ... +| | ... | *Arguments:* +| | ... | - nf_chains - Number of chains of NFs. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per chain. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 Bridge Domain for multiple chains with memif pairs \ +| | ... | \| 1 \| 1 \| +| | ... +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} +| | ... +| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 +| | | Initialize L2 Bridge Domain with memif pairs | nf_chain=${nf_chain} +| | | ... | nf_nodes=${nf_nodes} | auto_scale=${auto_scale} +| | Set interfaces in path up +| | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif + +| Initialize L2 Bridge Domain for pipeline with memif pairs +| | [Documentation] +| | ... | Create pairs of Memif interfaces on all defined VPP nodes. Put each +| | ... | Memif interface to separate L2 bridge domain with one physical or +| | ... | virtual interface to create a service pipeline on DUT node. +| | ... +| | ... | *Arguments:* +| | ... | - nf_chain - NF pipe. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per pipeline. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 Bridge Domain for pipeline with memif pairs \ +| | ... | \| 1 \| 1 \| +| | ... +| | [Arguments] | ${nf_chain}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} +| | ... +| | ${rxq}= | Run Keyword If | ${auto_scale} == ${True} +| | ... | Set Variable | ${rxq_count_int} +| | ... | ELSE | Set Variable | ${1} +| | ${duts}= | Get Matches | ${nodes} | DUT* +| | :FOR | ${dut} | IN | @{duts} +| | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} | ${1} +| | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if2} | ${2} +| | | ${nf_id_frst}= | Evaluate | (${nf_chain}-${1}) * ${nf_nodes} + ${1} +| | | ${nf_id_last}= | Evaluate | (${nf_chain}-${1}) * ${nf_nodes} + ${nf_nodes} +| | | ${sid_frst}= | Evaluate | ${nf_id_frst} * ${2} - ${1} +| | | ${sid_last}= | Evaluate | ${nf_id_last} * ${2} +| | | Set up single memif interface on DUT node | ${nodes['${dut}']} +| | | ... | memif-${dut}_CNF | mid=${nf_id_frst} | sid=${sid_frst} +| | | ... | memif_if=${dut}-memif-${nf_id_frst}-if1 +| | | ... | rxq=${rxq} | txq=${rxq} +| | | Set up single memif interface on DUT node | ${nodes['${dut}']} +| | | ... | memif-${dut}_CNF | mid=${nf_id_last} | sid=${sid_last} +| | | ... | memif_if=${dut}-memif-${nf_id_last}-if2 +| | | ... | rxq=${rxq} | txq=${rxq} +| | | Add interface to bridge domain | ${nodes['${dut}']} +| | | ... | ${${dut}-memif-${nf_id_frst}-if1} | ${1} +| | | Add interface to bridge domain | ${nodes['${dut}']} +| | | ... | ${${dut}-memif-${nf_id_last}-if2} | ${2} + +| Initialize L2 Bridge Domain for multiple pipelines with memif pairs +| | [Documentation] +| | ... | Create pairs of Memif interfaces for defined number of NF pipelines +| | ... | with defined number of NF nodes on all defined VPP nodes. Add each +| | ... | Memif interface into L2 bridge domains with learning enabled +| | ... | with physical inteface or Memif interface of another NF. +| | ... +| | ... | *Arguments:* +| | ... | - nf_chains - Number of pipelines of NFs. Type: integer +| | ... | - nf_nodes - Number of NFs nodes per pipeline. Type: integer +| | ... | - auto_scale - Whether to use same amount of RXQs for memif interface +| | ... | in containers as vswitch, otherwise use single RXQ. Type: boolean +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize L2 Bridge Domain for multiple pipelines with memif \ +| | ... | pairs \| 1 \| 1 \| +| | ... +| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} +| | ... +| | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 +| | | Initialize L2 Bridge Domain for pipeline with memif pairs +| | | ... | nf_chain=${nf_chain} | nf_nodes=${nf_nodes} +| | | ... | auto_scale=${auto_scale} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 Bridge Domain with memif pairs and VLAN in circular topology | | [Documentation] @@ -3046,8 +3253,8 @@ | | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} | | ... | | ${number}= | Set Variable | ${1} -| | ${sock1}= | Set Variable | memif-DUT1_VNF -| | ${sock2}= | Set Variable | memif-DUT1_VNF +| | ${sock1}= | Set Variable | memif-DUT1_CNF +| | ${sock2}= | Set Variable | memif-DUT1_CNF | | ${memif_if1_name}= | Set Variable | DUT1-memif-${number}-if1 | | ${memif_if2_name}= | Set Variable | DUT1-memif-${number}-if2 | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock2} @@ -3058,9 +3265,9 @@ | | Add interface to bridge domain | ${dut1} | ${${memif_if2_name}} | ${bd_id2} | | Add interface to bridge domain | ${dut1} | ${subif_index_1} | ${bd_id2} | | ${sock1}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Set Variable | memif-DUT2_VNF +| | ... | Set Variable | memif-DUT2_CNF | | ${sock2}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Set Variable | memif-DUT2_VNF +| | ... | Set Variable | memif-DUT2_CNF | | ${memif_if1_name}= | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Set Variable | DUT2-memif-${number}-if1 | | ${memif_if2_name}= | Run Keyword If | '${dut2_status}' == 'PASS' @@ -3082,6 +3289,7 @@ | | ... | Add interface to bridge domain | ${dut2} | ${dut2_if2} | ${bd_id2} | | ... | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize IPv4 routing with memif pairs on DUT node | | [Documentation] @@ -3095,7 +3303,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-\${dut}_VNF\${number}-\${sid} +| | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid} | | ... | | ... | *Example:* | | ... @@ -3118,8 +3326,9 @@ | | ${ip_base_if1}= | Evaluate | ${dut_index} + ${1} | | ${ip_net_if1}= | Set Variable | | ... | ${ip_base_if1}.${ip_base_if1}.${ip_base_if1} -| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if1_net} | 24 | vrf=${fib_table_1} -| | ... | gateway=${ip_net_if1}.1 | interface=${${dut}_if1} | multipath=${TRUE} +| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if1_net} | 24 +| | ... | vrf=${fib_table_1} | gateway=${ip_net_if1}.1 +| | ... | interface=${${dut}_if1} | multipath=${TRUE} | | Assign Interface To Fib Table | ${nodes['${dut}']} | ${${dut}_if1} | | ... | ${fib_table_1} | | Configure IP addresses on interfaces | ${nodes['${dut}']} | ${${dut}_if1} @@ -3140,8 +3349,9 @@ | | ${ip_base_if2}= | Evaluate | ${ip_base_if1} + ${1} | | ${ip_net_if2}= | Set Variable | | ... | ${ip_base_if2}.${ip_base_if2}.${ip_base_if2} -| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if2_net} | 24 | vrf=${fib_table_2} -| | ... | gateway=${ip_net_if2}.2 | interface=${${dut}_if2} | multipath=${TRUE} +| | Vpp Route Add | ${nodes['${dut}']} | ${tg_if2_net} | 24 +| | ... | vrf=${fib_table_2} | gateway=${ip_net_if2}.2 +| | ... | interface=${${dut}_if2} | multipath=${TRUE} | | Assign Interface To Fib Table | ${nodes['${dut}']} | ${${dut}_if2} | | ... | ${fib_table_2} | | Configure IP addresses on interfaces | ${nodes['${dut}']} | ${${dut}_if2} @@ -3160,8 +3370,8 @@ | | ${fib_table_1}= | Evaluate | ${fib_table_1} - ${1} | | ${ip_base_start}= | Set Variable | ${31} | | :FOR | ${number} | IN RANGE | 1 | ${count+${1}} -| | | ${sock1}= | Set Variable | memif-${dut}_VNF -| | | ${sock2}= | Set Variable | memif-${dut}_VNF +| | | ${sock1}= | Set Variable | memif-${dut}_CNF +| | | ${sock2}= | Set Variable | memif-${dut}_CNF | | | Set up memif interfaces on DUT node | ${nodes['${dut}']} | | | ... | ${sock1} | ${sock2} | ${number} | ${dut}-memif-${number}-if1 | | | ... | ${dut}-memif-${number}-if2 | ${rxq_count_int} | ${rxq_count_int} @@ -3224,6 +3434,7 @@ | | | Initialize IPv4 routing with memif pairs on DUT node | ${dut} | ${count} | | Set interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 xconnect for single memif | | [Documentation] @@ -3235,7 +3446,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-DUT1_VNF\${number}-\${sid} +| | ... | - /tmp/memif-DUT1_CNF\${number}-\${sid} | | ... | | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads | | ... | and rxqueues to all DUTs @@ -3248,14 +3459,16 @@ | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | ${sock}= | Set Variable | memif-${dut}_VNF +| | | ${sock}= | Set Variable | memif-${dut}_CNF +| | | ${sid}= | Evaluate | (${number} * ${2}) - ${1} | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock} -| | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int} -| | | ... | ${rxq_count_int} +| | | ... | mid=${number} | sid=${sid} | memif_if=${dut}-memif-${number}-if1 +| | | ... | rxq=${rxq_count_int} | txq=${rxq_count_int} | | | Configure L2XC | ${nodes['${dut}']} | ${${dut}_if1} | | | ... | ${${dut}-memif-${number}-if1} | | Set single interfaces in path up | | Show Memif on all DUTs | ${nodes} +| | VPP round robin RX placement on all DUTs | ${nodes} | prefix=memif | Initialize L2 Bridge Domain for single memif | | [Documentation] @@ -3267,7 +3480,7 @@ | | ... | | ... | *Note:* | | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-DUT1_VNF\${number}-\${sid} +| | ... | - /tmp/memif-DUT1_CNF\${number}-\${sid} | | ... | | ... | KW uses test variable ${rxq_count_int} set by KW Add worker threads | | ... | and rxqueues to all DUTs @@ -3280,10 +3493,11 @@ | | ... | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} -| | | ${sock}= | Set Variable | memif-${dut}_VNF +| | | ${sock}= | Set Variable | memif-${dut}_CNF +| | | ${sid}= | Evaluate | (${number} * ${2}) - ${1} | | | Set up single memif interface on DUT node | ${nodes['${dut}']} | ${sock} -| | | ... | ${number} | ${dut}-memif-${number}-if1 | ${rxq_count_int} -| | | ... | ${rxq_count_int} +| | | ... | mid=${number} | sid=${sid} | memif_if=${dut}-memif-${number}-if1 +| | | ... | rxq=${rxq_count_int} | txq=${rxq_count_int} | | | Add interface to bridge domain | ${nodes['${dut}']} | ${${dut}_if1} | | | ... | ${number} | | | Add interface to bridge domain | ${nodes['${dut}']}