diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/Constants.py | 1 | ||||
| -rw-r--r-- | resources/libraries/python/InterfaceUtil.py | 2 | ||||
| -rw-r--r-- | resources/libraries/robot/crypto/ipsec.robot | 63 | ||||
| -rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 152 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/container.robot | 94 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 2 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/memif.robot | 10 |
7 files changed, 160 insertions, 164 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index da61f539da..cb66a5d8d5 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -111,6 +111,7 @@ class Constants(object): "Intel-X710": 10000000000, "Intel-XL710": 24500000000, "Intel-XXV710": 24500000000, + "virtual": 100000000, } # Suite file names use somewhat more rich (less readable) codes for NICs. diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py index 7706c14e06..22e7160dc9 100644 --- a/resources/libraries/python/InterfaceUtil.py +++ b/resources/libraries/python/InterfaceUtil.py @@ -1650,6 +1650,8 @@ class InterfaceUtil(object): """ worker_id = 0 worker_cnt = len(VPPUtil.vpp_show_threads(node)) - 1 + if not worker_cnt: + return for placement in InterfaceUtil.vpp_sw_interface_rx_placement_dump(node): for interface in node['interfaces'].values(): if placement['sw_if_index'] == interface['vpp_sw_index'] \ diff --git a/resources/libraries/robot/crypto/ipsec.robot b/resources/libraries/robot/crypto/ipsec.robot index 95fdb9134d..d5966a6cf5 100644 --- a/resources/libraries/robot/crypto/ipsec.robot +++ b/resources/libraries/robot/crypto/ipsec.robot @@ -40,7 +40,9 @@ | | ... | \| ${encr_alg}= \| Crypto Alg AES CBC 128 \| | | ... | \| ${auth_alg}= \| Integ Alg SHA1 96 \| | | ... | \| Generate keys for IPSec \| ${encr_alg} \| ${auth_alg} \| +| | ... | | [Arguments] | ${crypto_alg} | ${integ_alg} +| | ... | | ${encr_key_len}= | Get Crypto Alg Key Len | ${crypto_alg} | | ${encr_key}= | Generate Random String | ${encr_key_len} | | ${auth_key_len}= | Get Integ Alg Key Len | ${integ_alg} @@ -52,33 +54,16 @@ | | [Documentation] | Setup path for IPsec testing TG<-->DUT1. | | ... | | ... | _NOTE:_ This KW sets following test case variable: -| | ... | - tg_node - TG node. Type: dictionary -| | ... | - tg_if - TG interface connected to DUT. Type: string -| | ... | - tg_if_mac - TG interface MAC. Type: string -| | ... | - dut_node - DUT node. Type: dictionary -| | ... | - dut_if - DUT interface connected to TG. Type: string -| | ... | - dut_if_mac - DUT interface MAC. Type: string | | ... | - dut_lo - DUT loopback interface. Type: string | | ... | | ... | *Example:* | | ... | \| Configure path for IPSec test \| -| | Append Nodes | ${nodes['TG']} | ${nodes['DUT1']} -| | Compute Path -| | ${tg_if} | ${tg_node}= | Next Interface -| | ${dut_if} | ${dut_node}= | Next Interface -| | ${dut_if_mac}= | Get Interface Mac | ${dut_node} | ${dut_if} -| | ${tg_if_mac}= | Get Interface Mac | ${tg_node} | ${tg_if} -| | ${dut_lo}= | Vpp Create Loopback | ${dut_node} -| | Set Interface State | ${dut_node} | ${dut_if} | up -| | Set Interface State | ${dut_node} | ${dut_lo} | up -| | Vpp Node Interfaces Ready Wait | ${dut_node} -| | Set Test Variable | ${tg_node} -| | Set Test Variable | ${tg_if} -| | Set Test Variable | ${tg_if_mac} -| | Set Test Variable | ${dut_node} -| | Set Test Variable | ${dut_if} -| | Set Test Variable | ${dut_if_mac} -| | Set Test Variable | ${dut_lo} +| | ... +| | ${dut1_lo1}= | Vpp Create Loopback | ${dut1} +| | Set Interface State | ${dut1} | ${dut1_if1} | up +| | Set Interface State | ${dut1} | ${dut1_lo1} | up +| | Vpp Node Interfaces Ready Wait | ${dut1} +| | Set Test Variable | ${dut1_lo1} | Configure topology for IPv4 IPsec testing | | [Documentation] | Setup topology for IPv4 IPsec testing. @@ -91,14 +76,17 @@ | | ... | | ... | *Example:* | | ... | \| Configure topology for IPv4 IPsec testing \| +| | ... | | Configure path for IPSec test -| | VPP Interface Set IP Address | ${dut_node} | ${dut_if} | ${dut_if_ip4} -| | ... | ${ip4_plen} -| | VPP Interface Set IP Address | ${dut_node} | ${dut_lo} | ${dut_lo_ip4} -| | ... | ${ip4_plen} -| | VPP Add IP Neighbor | ${dut_node} | ${dut_if} | ${tg_if_ip4} | ${tg_if_mac} -| | Vpp Route Add | ${dut_node} | ${tg_lo_ip4} | ${ip4_plen} -| | ... | gateway=${tg_if_ip4} | interface=${dut_if} +| | VPP Interface Set IP Address +| | ... | ${dut1} | ${dut1_if1} | ${dut_if_ip4} | ${ip4_plen} +| | VPP Interface Set IP Address +| | ... | ${dut1} | ${dut1_lo1} | ${dut_lo_ip4} | ${ip4_plen} +| | VPP Add IP Neighbor +| | ... | ${dut1} | ${dut1_if1} | ${tg_if_ip4} | ${tg_if1_mac} +| | Vpp Route Add +| | ... | ${dut1} | ${tg_lo_ip4} | ${ip4_plen} | gateway=${tg_if_ip4} +| | ... | interface=${dut1_if1} | | Set Test Variable | ${dut_tun_ip} | ${dut_if_ip4} | | Set Test Variable | ${dut_src_ip} | ${dut_lo_ip4} | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip4} @@ -115,15 +103,18 @@ | | ... | | ... | *Example:* | | ... | \| Configure topology for IPv6 IPsec testing \| +| | ... | | Configure path for IPSec test | | VPP Interface Set IP Address -| | ... | ${dut_node} | ${dut_if} | ${dut_if_ip6} | ${ip6_plen} +| | ... | ${dut1} | ${dut1_if1} | ${dut_if_ip6} | ${ip6_plen} | | VPP Interface Set IP Address -| | ... | ${dut_node} | ${dut_lo} | ${dut_lo_ip6} | ${ip6_plen} -| | VPP Add IP Neighbor | ${dut_node} | ${dut_if} | ${tg_if_ip6} | ${tg_if_mac} +| | ... | ${dut1} | ${dut1_lo1} | ${dut_lo_ip6} | ${ip6_plen} +| | VPP Add IP Neighbor +| | ... | ${dut1} | ${dut1_if1} | ${tg_if_ip6} | ${tg_if1_mac} | | Vpp All RA Suppress Link Layer | ${nodes} -| | Vpp Route Add | ${dut_node} | ${tg_lo_ip6} | ${ip6_plen_rt} -| | ... | gateway=${tg_if_ip6} | interface=${dut_if} +| | Vpp Route Add +| | ... | ${dut1} | ${tg_lo_ip6} | ${ip6_plen_rt} | gateway=${tg_if_ip6} +| | ... | interface=${dut1_if1} | | Set Test Variable | ${dut_tun_ip} | ${dut_if_ip6} | | Set Test Variable | ${dut_src_ip} | ${dut_lo_ip6} | | Set Test Variable | ${tg_tun_ip} | ${tg_if_ip6} @@ -218,10 +209,12 @@ | | ... | \| 52:54:00:d4:d8:22 \| ${encr_alg} \| sixteenbytes_key \ | | ... | \| ${auth_alg} \| twentybytessecretkey \| ${1001} \| ${1000} \ | | ... | \| 192.168.3.3 \| 192.168.4.4 \| 192.168.100.2 \| 192.168.100.3 \| +| | ... | | [Arguments] | ${node} | ${interface} | ${dst_mac} | ${crypto_alg} | | ... | ${crypto_key} | ${integ_alg} | ${integ_key} | ${l_spi} | | ... | ${r_spi} | ${l_ip} | ${r_ip} | ${l_tunnel}=${None} | | ... | ${r_tunnel}=${None} +| | ... | | ${src_mac}= | Get Interface Mac | ${node} | ${interface} | | ${if_name}= | Get Interface Name | ${node} | ${interface} | | ${args}= | Traffic Script Gen Arg | ${if_name} | ${if_name} | ${src_mac} diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 63810ee471..fee12959da 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -49,7 +49,6 @@ # software interfaces. Run KW at the start phase of VPP setup to split # from other "functional" configuration. This will allow modularity of this # library -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error | | | ... | Variable Should Exist | ${${dut}_if1} @@ -67,8 +66,6 @@ | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_1} | up | | | Run Keyword Unless | '${if2_status}' == 'PASS' | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if2_2} | up -| | All VPP Interfaces Ready Wait | ${nodes} | retries=${300} -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error | | | ... | Variable Should Exist | ${${dut}_if1} @@ -97,7 +94,6 @@ # software interfaces. Run KW at the start phase of VPP setup to split # from other "functional" configuration. This will allow modularity of this # library -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error | | | ... | Variable Should Exist | ${${dut}_if1} @@ -107,8 +103,6 @@ | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_1} | up | | | Run Keyword Unless | '${if1_status}' == 'PASS' | | | ... | Set Interface State | ${nodes['${dut}']} | ${${dut}_if1_2} | up -| | All VPP Interfaces Ready Wait | ${nodes} | retries=${300} -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${if1_status} | ${value}= | Run Keyword And Ignore Error | | | ... | Variable Should Exist | ${${dut}_if1} @@ -180,19 +174,25 @@ | | ... | on DUT1-DUT2 link and set routing on both DUT nodes with prefix /24 | | ... | and next hop of neighbour DUT interface IPv4 address. | | ... +| | ... | *Arguments:* +| | ... | - remote_host1_ip - IP address of remote host1 (Optional). +| | ... | Type: string +| | ... | - remote_host2_ip - IP address of remote host2 (Optional). +| | ... | Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize IPv4 forwarding in circular topology \ +| | ... | \| 192.168.0.1 \| 192.168.0.2 \| +| | ... +| | [Arguments] | ${remote_host1_ip}=${NONE} | ${remote_host2_ip}=${NONE} +| | ... | | ${dut2_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${dut2} | | ... | | Set interfaces in path up | | ... -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | ${dut1_if2_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut1} | ${dut1_if2} -| | ${dut2_if1_mac}= | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Get Interface MAC | ${dut2} | ${dut2_if1} -| | ... -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac} +| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg_if1_mac} | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | VPP Add IP Neighbor | | ... | ${dut1} | ${dut1_if2} | 1.1.1.2 | ${dut2_if1_mac} @@ -205,7 +205,7 @@ | | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Set Variable | ${dut2_if2} | | ... | ELSE | Set Variable | ${dut1_if2} -| | VPP Add IP Neighbor | ${dut} | ${dut_if2} | 20.20.20.2 | ${tg1_if2_mac} +| | VPP Add IP Neighbor | ${dut} | ${dut_if2} | 20.20.20.2 | ${tg_if2_mac} | | ... | | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | | ... | 10.10.10.1 | 24 @@ -224,6 +224,21 @@ | | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=1.1.1.1 | | ... | interface=${dut2_if1} +| | ... +| | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' +| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 32 +| | ... | gateway=10.10.10.2 | interface=${dut1_if1} +| | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' +| | ... | Vpp Route Add | ${dut} | ${remote_host2_ip} | 32 +| | ... | gateway=20.20.20.2 | interface=${dut_if2} +| | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' +| | ... | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 32 +| | ... | gateway=1.1.1.2 | interface=${dut1_if2} +| | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' +| | ... | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Vpp Route Add | ${dut2} | ${remote_host2_ip} | 32 +| | ... | gateway=1.1.1.1 | interface=${dut2_if1} | Initialize IPv4 forwarding with scaling in circular topology | | [Documentation] @@ -576,50 +591,78 @@ | | Policer Classify Set Match IP | 10.10.10.2 | ${False} | | Policer Set Configuration -| Initialize IPv6 forwarding in 2-node circular topology +| Initialize IPv6 forwarding in circular topology | | [Documentation] -| | ... | Set UP state on VPP interfaces in path on nodes in 2-node circular -| | ... | topology. Get the interface MAC addresses and setup neighbour on all -| | ... | VPP interfaces. Setup IPv6 addresses with /128 prefixes on all -| | ... | interfaces. +| | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node +| | ... | circular topology. Get the interface MAC addresses and setup neighbor +| | ... | on all VPP interfaces. Setup IPv6 addresses with /64 prefix on DUT-TG +| | ... | links. In case of 3-node topology setup IPv6 adresses with /64 prefix +| | ... | on DUT1-DUT2 link and set routing on both DUT nodes with prefix /64 +| | ... | and next hop of neighbour DUT interface IPv4 address. | | ... -| | Set interfaces in path up -| | ${prefix}= | Set Variable | 64 -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${tg1_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} -| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 2001:1::1 | ${prefix} -| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 2001:2::1 | ${prefix} -| | Suppress ICMPv6 router advertisement message | ${nodes} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if2} | 2001:2::2 | ${tg1_if2_mac} - -| Initialize IPv6 forwarding in 3-node circular topology -| | [Documentation] -| | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular -| | ... | topology. Get the interface MAC addresses and setup neighbour on all -| | ... | VPP interfaces. Setup IPv6 addresses with /128 prefixes on all -| | ... | interfaces. Set routing on both DUT nodes with prefix /64 and -| | ... | next hop of neighbour DUT interface IPv6 address. +| | ... | *Arguments:* +| | ... | - remote_host1_ip - IP address of remote host1 (Optional). +| | ... | Type: string +| | ... | - remote_host2_ip - IP address of remote host2 (Optional). +| | ... | Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Initialize IPv6 forwarding in circular topology \ +| | ... | \| 3ffe:5f::1 \| 3ffe:5f::2 \| +| | ... +| | [Arguments] | ${remote_host1_ip}=${NONE} | ${remote_host2_ip}=${NONE} +| | ... +| | ${dut2_status} | ${value}= | Run Keyword And Ignore Error +| | ... | Variable Should Exist | ${dut2} | | ... | | Set interfaces in path up -| | ${prefix}= | Set Variable | 64 -| | ${tg1_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} -| | ${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} -| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 2001:1::1 | ${prefix} -| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 2001:3::1 | ${prefix} -| | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 2001:3::2 | ${prefix} -| | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} | 2001:2::1 | ${prefix} +| | ... +| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg_if1_mac} +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | VPP Add IP Neighbor +| | ... | ${dut1} | ${dut1_if2} | 2001:3::1 | ${dut2_if1_mac} +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | VPP Add IP Neighbor +| | ... | ${dut2} | ${dut2_if1} | 2001:3::2 | ${dut1_if2_mac} +| | ${dut}= | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Set Variable | ${dut2} +| | ... | ELSE | Set Variable | ${dut1} +| | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Set Variable | ${dut2_if2} +| | ... | ELSE | Set Variable | ${dut1_if2} +| | VPP Add IP Neighbor | ${dut} | ${dut_if2} | 2001:2::2 | ${tg_if2_mac} +| | ... +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 2001:1::1 | 64 +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 2001:3::1 | 64 +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 2001:3::2 | 64 +| | VPP Interface Set IP Address | ${dut} | ${dut_if2} | 2001:2::1 | 64 +| | ... | | Suppress ICMPv6 router advertisement message | ${nodes} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 2001:1::2 | ${tg1_if1_mac} -| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 2001:2::2 | ${tg1_if2_mac} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if2} | 2001:3::2 | ${dut2_if1_mac} -| | VPP Add IP Neighbor | ${dut2} | ${dut2_if1} | 2001:3::1 | ${dut1_if2_mac} -| | Vpp Route Add | ${dut1} | 2001:2::0 | ${prefix} | gateway=2001:3::2 +| | ... +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Vpp Route Add | ${dut1} | 2001:2::0 | 24 | gateway=2001:3::2 | | ... | interface=${dut1_if2} -| | Vpp Route Add | ${dut2} | 2001:1::0 | ${prefix} | gateway=2001:3::1 +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Vpp Route Add | ${dut2} | 2001:1::0 | 24 | gateway=2001:3::1 | | ... | interface=${dut2_if1} +| | ... +| | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' +| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 128 +| | ... | gateway=2001:1::2 | interface=${dut1_if1} +| | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' +| | ... | Vpp Route Add | ${dut} | ${remote_host2_ip} | 128 +| | ... | gateway=2001:2::2 | interface=${dut_if2} +| | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' +| | ... | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | 128 +| | ... | gateway=2001:3::2 | interface=${dut1_if2} +| | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' +| | ... | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | Vpp Route Add | ${dut2} | ${remote_host2_ip} | 128 +| | ... | gateway=2001:3::1 | interface=${dut2_if1} | Initialize IPv6 forwarding with scaling in circular topology | | [Documentation] @@ -2812,10 +2855,8 @@ | | ... | | [Arguments] | ${dut} | ${count} | | ... -| | @{duts}= | Get Matches | ${nodes} | DUT* | | ${dut_index}= | Get Index From List | ${duts} | ${dut} -| | ${duts_length}= | Get Length | ${duts} -| | ${last_dut_index}= | Evaluate | ${duts_length} - ${1} +| | ${last_dut_index}= | Evaluate | ${duts_count} - ${1} | | ... | | ${tg_if1_net}= | Set Variable | 10.10.10.0 | | ${tg_if2_net}= | Set Variable | 20.20.20.0 @@ -2929,7 +2970,6 @@ | | ... | | [Arguments] | ${count}=${1} | | ... -| | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | Initialize IPv4 routing with memif pairs on DUT node | ${dut} | ${count} | | Set interfaces in path up diff --git a/resources/libraries/robot/shared/container.robot b/resources/libraries/robot/shared/container.robot index c8320b7508..6067a81c4e 100644 --- a/resources/libraries/robot/shared/container.robot +++ b/resources/libraries/robot/shared/container.robot @@ -31,29 +31,31 @@ | | ... | - auto_scale - If True, use same amount of Dataplane threads for | | ... | network function as DUT, otherwise use single physical core for | | ... | every network function. Type: boolean -| | ... | - nested: Set True if starting nested containers. -| | ... | Type: boolean, default value: ${False} +| | ... | - pinning: Set True if CPU pinning should be done on starting +| | ... | containers. Type: boolean, default value: ${False} | | ... | | ... | *Example:* | | ... | | ... | \| Construct container on all DUTs \| 1 \| 1 \| 1 \| 1 \| ${True} \| | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${nf_chain}=${1} -| | ... | ${nf_node}=${1} | ${auto_scale}=${True} | ${nested}=${False} +| | ... | ${nf_node}=${1} | ${auto_scale}=${True} | ${pinning}=${True} | | ... | | ${nf_dtcr_status} | ${value}= | Run Keyword And Ignore Error | | ... | Variable Should Exist | ${nf_dtcr} | | ${nf_dtcr}= | Run Keyword If | '${nf_dtcr_status}' == 'PASS' | | ... | Set Variable | ${nf_dtcr} | ELSE | Set Variable | ${1} -| | ${nf_dtc}= | Run Keyword Unless | ${nested} +| | ${nf_dtc}= | Run Keyword If | ${pinning} | | ... | Set Variable If | ${auto_scale} | ${cpu_count_int} | | ... | ${nf_dtc} | | ${duts}= | Get Matches | ${nodes} | DUT* | | :FOR | ${dut} | IN | @{duts} | | | ${nf_id}= | Evaluate | (${nf_chain} - ${1}) * ${nf_nodes} + ${nf_node} | | | ${env}= | Create List | DEBIAN_FRONTEND=noninteractive -| | | ${uuid}= | Get Variable Value | ${dcr_uuid} | ${Empty} -| | | ${root}= | Get Variable Value | ${dcr_root} | ${Empty} +| | | ${dut1_uuid_length} = | Get Length | ${dut1_uuid} +| | | ${root}= | Run Keyword If | ${dut1_uuid_length} +| | | ... | Get Docker Mergeddir | ${nodes['DUT1']} | ${dut1_uuid} +| | | ... | ELSE | Set Variable | ${EMPTY} | | | ${mnt}= | Create List | | | ... | ${root}/tmp/:/mnt/host/ | | | ... | ${root}/dev/vfio/:/dev/vfio/ @@ -62,15 +64,15 @@ | | | ... | ${root}/usr/lib/x86_64-linux-gnu/:/usr/lib/x86_64-linux-gnu/ | | | ... | ${root}/usr/share/vpp/:/usr/share/vpp/ | | | ${nf_cpus}= | Set Variable | ${None} -| | | ${nf_cpus}= | Run Keyword Unless | ${nested} +| | | ${nf_cpus}= | Run Keyword If | ${pinning} | | | ... | Get Affinity NF | ${nodes} | ${dut} | | | ... | nf_chains=${nf_chains} | nf_nodes=${nf_nodes} | | | ... | nf_chain=${nf_chain} | nf_node=${nf_node} | | | ... | vs_dtc=${cpu_count_int} | nf_dtc=${nf_dtc} | nf_dtcr=${nf_dtcr} | | | &{cont_args}= | Create Dictionary -| | | ... | name=${dut}_${container_group}${nf_id}${uuid} +| | | ... | name=${dut}_${container_group}${nf_id}${dut1_uuid} | | | ... | node=${nodes['${dut}']} | mnt=${mnt} | env=${env} -| | | Run Keyword Unless | ${nested} +| | | Run Keyword If | ${pinning} | | | ... | Set To Dictionary | ${cont_args} | cpuset_cpus=${nf_cpus} | | | Run Keyword | ${container_group}.Construct container | &{cont_args} @@ -84,8 +86,8 @@ | | ... | - auto_scale - If True, use same amount of Dataplane threads for | | ... | network function as DUT, otherwise use single physical core for | | ... | every network function. Type: boolean -| | ... | - nested: Set True if starting nested containers. -| | ... | Type: boolean, default value: ${False} +| | ... | - pinning: Set True if CPU pinning should be done on starting +| | ... | containers. Type: boolean, default value: ${False} | | ... | | ... | *Example:* | | ... @@ -93,38 +95,38 @@ | | ... | \| ${True} \| | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${nf_chain}=${1} -| | ... | ${auto_scale}=${True} | ${nested}=${False} +| | ... | ${auto_scale}=${True} | ${pinning}=${True} | | ... | | :FOR | ${nf_node} | IN RANGE | 1 | ${nf_nodes}+1 | | | Construct container on all DUTs | nf_chains=${nf_chains} | | | ... | nf_nodes=${nf_nodes} | nf_chain=${nf_chain} | nf_node=${nf_node} -| | | ... | auto_scale=${auto_scale} | nested=${nested} +| | | ... | auto_scale=${auto_scale} | pinning=${pinning} | Construct chains of containers on all DUTs | | [Documentation] | Construct 1..N chains of 1..N CNFs on all DUT nodes. | | ... | | ... | *Arguments:* | | ... | - nf_chains: Total number of chains (Optional). Type: integer, default -| | ... | value: ${1} +| | ... | value: ${1} | | ... | - nf_nodes: Total number of nodes per chain (Optional). Type: integer, -| | ... | default value: ${1} +| | ... | default value: ${1} | | ... | - auto_scale - If True, use same amount of Dataplane threads for | | ... | network function as DUT, otherwise use single physical core for | | ... | every network function. Type: boolean -| | ... | - nested: Set True if starting nested containers. -| | ... | Type: boolean, default value: ${False} +| | ... | - pinning: Set True if CPU pinning should be done on starting +| | ... | containers. Type: boolean, default value: ${True} | | ... | | ... | *Example:* | | ... | | ... | \| Construct chains of containers on all DUTs \| 1 \| 1 \| | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} -| | ... | ${nested}=${False} +| | ... | ${pinning}=${True} | | ... | | :FOR | ${nf_chain} | IN RANGE | 1 | ${nf_chains}+1 | | | Construct chain of containers on all DUTs | nf_chains=${nf_chains} | | | ... | nf_nodes=${nf_nodes} | nf_chain=${nf_chain} -| | | ... | auto_scale=${auto_scale} | nested=${nested} +| | | ... | auto_scale=${auto_scale} | pinning=${pinning} | Acquire all '${group}' containers | | [Documentation] | Acquire all container(s) in specific container group on @@ -182,9 +184,9 @@ | | ... | | Run Keyword | ${group}.Destroy all containers -| Start containers for performance test +| Start containers for test | | [Documentation] -| | ... | Start containers for performance test. +| | ... | Start containers for test. | | ... | | ... | *Arguments:* | | ... | - nf_chains: Total number of chains. Type: integer @@ -192,12 +194,15 @@ | | ... | - auto_scale - If True, use same amount of Dataplane threads for | | ... | network function as DUT, otherwise use single physical core for | | ... | every network function. Type: boolean +| | ... | - pinning: Set True if CPU pinning should be done on starting +| | ... | containers. Type: boolean, default value: ${False} | | ... | | ... | *Example:* | | ... -| | ... | \| Start containers for performance test \| 1 \| 1 \| +| | ... | \| Start containers for test \| 1 \| 1 \| | | ... | | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True} +| | ... | ${pinning}=${True} | | ... | | Set Test Variable | @{container_groups} | @{EMPTY} | | Set Test Variable | ${container_group} | CNF @@ -205,50 +210,7 @@ | | Import Library | resources.libraries.python.ContainerUtils.ContainerManager | | ... | engine=${container_engine} | WITH NAME | ${container_group} | | Construct chains of containers on all DUTs | ${nf_chains} | ${nf_nodes} -| | ... | auto_scale=${auto_scale} -| | Acquire all '${container_group}' containers -| | Create all '${container_group}' containers -| | Configure VPP in all '${container_group}' containers -| | Stop VPP service on all DUTs | ${nodes} -| | Start VPP in all '${container_group}' containers -| | Restart VPP service on all DUTs | ${nodes} -| | Verify VPP on all DUTs | ${nodes} -| | Save VPP PIDs -| | Append To List | ${container_groups} | ${container_group} - -| Start containers for device test -| | [Documentation] -| | ... | Start containers for device test. -| | ... -| | ... | *Arguments:* -| | ... | - nf_chains: Total number of chains (Optional). Type: integer, default -| | ... | value: ${1} -| | ... | - nf_nodes: Total number of nodes per chain (Optional). Type: integer, -| | ... | default value: ${1} -| | ... -| | ... | _NOTE:_ This KW sets following test case variables: -| | ... | - dcr_uuid - Parent container UUID. -| | ... | - dcr_root - Parent container overlay. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Set up functional test with containers \| 1 \| 1 \| -| | ... -| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} -| | ... -| | Set Test Variable | @{container_groups} | @{EMPTY} -| | Set Test Variable | ${container_group} | CNF -| | Import Library | resources.libraries.python.ContainerUtils.ContainerManager -| | ... | engine=${container_engine} | WITH NAME | ${container_group} -| | ... -| | ${dcr_uuid}= | Get Environment Variable | CSIT_DUT1_UUID -| | ${dcr_root}= | Run Keyword | Get Docker Mergeddir | ${nodes['DUT1']} -| | ... | ${dcr_uuid} -| | Set Test Variable | ${dcr_uuid} -| | Set Test Variable | ${dcr_root} -| | ... -| | Construct chains of containers on all DUTs | ${nf_chains} | ${nf_nodes} -| | ... | nested=${True} +| | ... | auto_scale=${auto_scale} | pinning=${pinning} | | Acquire all '${container_group}' containers | | Create all '${container_group}' containers | | Configure VPP in all '${container_group}' containers diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index 31c4ae3e0a..86e124ad62 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -24,6 +24,7 @@ | Library | resources.libraries.python.CpuUtils | Library | resources.libraries.python.DUTSetup | Library | resources.libraries.python.L2Util +| Library | resources.libraries.python.Namespaces | Library | resources.libraries.python.SchedUtils | Library | resources.libraries.python.Tap | Library | resources.libraries.python.TGSetup @@ -43,6 +44,7 @@ | Resource | resources/libraries/robot/shared/suite_setup.robot | Resource | resources/libraries/robot/shared/test_teardown.robot | Resource | resources/libraries/robot/shared/test_setup.robot +| Resource | resources/libraries/robot/shared/traffic.robot *** Keywords *** | Show Vpp Errors On All DUTs diff --git a/resources/libraries/robot/shared/memif.robot b/resources/libraries/robot/shared/memif.robot index 0b092c2f6a..0fda454764 100644 --- a/resources/libraries/robot/shared/memif.robot +++ b/resources/libraries/robot/shared/memif.robot @@ -34,10 +34,6 @@ | | ... | - txq - TX queues; 0 means do not set (Optional). Type: integer, | | ... | default value: ${1} | | ... | - role - Memif role (Optional). Type: string, default value: SLAVE -| | ... | - dcr_uuid - UUID string (including prefix - underscore character) of -| | ... | DUT1 /tmp volume created outside of the DUT1 docker in case of -| | ... | vpp-device test. ${EMPTY} value means that /tmp directory is inside -| | ... | the DUT1 docker. (Optional). Type: string, default value: ${EMPTY} | | ... | | ... | _NOTE:_ This KW sets following test case variable: | | ... | - ${${memif_if1}} - 1st Memif interface. @@ -55,15 +51,15 @@ | | ... | | [Arguments] | ${dut_node} | ${filename1} | ${filename2} | ${mid}=${1} | | ... | ${memif_if1}=memif_if1 | ${memif_if2}=memif_if2 | ${rxq}=${1} -| | ... | ${txq}=${1} | ${role}=SLAVE | ${dcr_uuid}=${EMPTY} +| | ... | ${txq}=${1} | ${role}=SLAVE | | ... | | ${sid_1}= | Evaluate | (${mid}*2)-1 | | ${sid_2}= | Evaluate | (${mid}*2) | | ${memif_1}= | Create memif interface | ${dut_node} -| | ... | ${filename1}${mid}${dcr_uuid}-${sid_1} | ${mid} | ${sid_1} +| | ... | ${filename1}${mid}${dut1_uuid}-${sid_1} | ${mid} | ${sid_1} | | ... | rxq=${rxq} | txq=${txq} | role=${role} | | ${memif_2}= | Create memif interface | ${dut_node} -| | ... | ${filename2}${mid}${dcr_uuid}-${sid_2} | ${mid} | ${sid_2} +| | ... | ${filename2}${mid}${dut1_uuid}-${sid_2} | ${mid} | ${sid_2} | | ... | rxq=${rxq} | txq=${txq} | role=${role} | | Set Interface State | ${dut_node} | ${memif_1} | up | | Set Interface State | ${dut_node} | ${memif_2} | up |