diff options
author | Peter Mikus <pmikus@cisco.com> | 2019-08-07 12:23:27 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2019-08-07 19:04:30 +0000 |
commit | 402633a25be55e418534161ac2a06bf09b4747b6 (patch) | |
tree | 9fbaeb77410fa2670deef8ed6aa793a10e11fb3a /resources/libraries/robot/performance/performance_configuration.robot | |
parent | 6c6b9edc4690f5c4cd86334d706d7c40a81c85cf (diff) |
Clean: IPv4 keywords
+ Move all base ipv4 related KW to library
+ Remove useless KW to save space in output.xml
+ Remove cross dependency in ip4.robot
Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: If1e3a6370d36caf4ce7411fb956a0b7d0f939b6b
Diffstat (limited to 'resources/libraries/robot/performance/performance_configuration.robot')
-rw-r--r-- | resources/libraries/robot/performance/performance_configuration.robot | 572 |
1 files changed, 25 insertions, 547 deletions
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot index 6e65e26d8e..b78ede38ef 100644 --- a/resources/libraries/robot/performance/performance_configuration.robot +++ b/resources/libraries/robot/performance/performance_configuration.robot @@ -136,9 +136,9 @@ | | Set Test Variable | ${dut1_if2_mac} | | Set Test Variable | ${dut2_if1_mac} | | Set Test Variable | ${dut2_if2_mac} -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | | ... | ${dut1_if1_ip4} | 24 -| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} +| | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} | | ... | ${dut2_if2_ip4} | 24 | | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | ${tg_if1_ip4} | ${tg_if1_mac} | | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | ${tg_if2_ip4} | ${tg_if2_mac} @@ -147,390 +147,6 @@ | | Vpp Route Add | ${dut2} | ${raddr_ip4} | 8 | gateway=${tg_if2_ip4} | | ... | interface=${dut2_if2} -| Initialize IPv4 forwarding in circular topology -| | [Documentation] -| | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node -| | ... | circular topology. Get the interface MAC addresses and setup ARP on -| | ... | all VPP interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG -| | ... | links. In case of 3-node topology setup IPv4 adresses with /30 prefix -| | ... | 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 -| | ... -| | 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} -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | VPP Add IP Neighbor -| | ... | ${dut2} | ${dut2_if1} | 1.1.1.1 | ${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} | 20.20.20.2 | ${tg_if2_mac} -| | ... -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} -| | ... | 10.10.10.1 | 24 -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} -| | ... | 1.1.1.1 | 30 -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} -| | ... | 1.1.1.2 | 30 -| | Configure IP addresses on interfaces | ${dut} | ${dut_if2} -| | ... | 20.20.20.1 | 24 -| | ... -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | 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 | 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] -| | ... | Custom setup of IPv4 topology with scalability of ip routes on all -| | ... | DUT nodes in 2-node / 3-node circular topology -| | ... -| | ... | *Arguments:* -| | ... | - count - IP route count. Type: integer -| | ... -| | ... | *Return:* -| | ... | - No value returned -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Initialize IPv4 forwarding with scaling in 3-node circular \ -| | ... | topology \| 100000 \| -| | ... -| | [Arguments] | ${count} -| | ... -| | ${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} | 1.1.1.1 | ${tg1_if1_mac} -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | VPP Add IP Neighbor -| | ... | ${dut1} | ${dut1_if2} | 2.2.2.2 | ${dut2_if1_mac} -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | VPP Add IP Neighbor -| | ... | ${dut2} | ${dut2_if1} | 2.2.2.1 | ${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} | 3.3.3.1 | ${tg1_if2_mac} -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 2.2.2.1 -| | ... | 30 -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | 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 | 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 | 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 | 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] -| | ... | Create pairs of Vhost-User interfaces for defined number of VMs on -| | ... | VPP node. Set UP state of all VPP interfaces in path. Create -| | ... | nf_nodes+1 FIB tables on DUT with multipath routing. Assign each -| | ... | Virtual interface to FIB table with Physical interface or Virtual -| | ... | interface on both nodes. Setup IPv4 addresses with /30 prefix on -| | ... | DUT-TG links. Set routing on DUT nodes in all FIB tables with prefix -| | ... | /8 and next hop of neighbour IPv4 address. Setup ARP on all VPP -| | ... | interfaces. -| | ... -| | ... | *Arguments:* -| | ... | - nf_nodes - Number of guest VMs. Type: integer -| | ... -| | ... | *Note:* -| | ... | Socket paths for VM are defined in following format: -| | ... | - /var/run/vpp/sock-${VM_ID}-1 -| | ... | - /var/run/vpp/sock-${VM_ID}-2 -| | ... -| | ... | *Example:* -| | ... -| | ... | \| IPv4 forwarding with Vhost-User initialized in a 2-node circular\ -| | ... | topology \| 1 \| -| | ... -| | [Arguments] | ${nf_nodes}=${1} -| | ... -| | Set interfaces in path up -| | ${fib_table_1}= | Set Variable | ${101} -| | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nf_nodes} -| | Add Fib Table | ${dut1} | ${fib_table_1} -| | Add Fib Table | ${dut1} | ${fib_table_2} -| | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table_1} -| | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2} -| | Configure IP addresses on interfaces -| | ... | ${dut1} | ${dut1_if1} | 100.0.0.1 | 30 -| | Configure IP addresses on interfaces -| | ... | ${dut1} | ${dut1_if2} | 200.0.0.1 | 30 -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 100.0.0.2 | ${tg_if1_mac} -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if2} | 200.0.0.2 | ${tg_if2_mac} -| | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=100.0.0.2 -| | ... | interface=${dut1_if1} | vrf=${fib_table_1} -| | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=200.0.0.2 -| | ... | interface=${dut1_if2} | vrf=${fib_table_2} -| | :FOR | ${number} | IN RANGE | 1 | ${nf_nodes}+1 -| | | ${fib_table_1}= | Evaluate | ${100}+${number} -| | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${1} -| | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | | ... | /var/run/vpp/sock-${number}-1 | /var/run/vpp/sock-${number}-2 -| | | ... | dut1-vhost-${number}-if1 | dut1-vhost-${number}-if2 -| | | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if1} | up -| | | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if2} | up -| | | Add Fib Table | ${dut1} | ${fib_table_1} -| | | Add Fib Table | ${dut1} | ${fib_table_2} -| | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if1} -| | | ... | ${fib_table_1} -| | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if2} -| | | ... | ${fib_table_2} -| | | Configure IP addresses on interfaces -| | | ... | ${dut1} | ${dut1-vhost-${number}-if1} | 1.1.1.2 | 30 -| | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | 1.1.2.2 | 30 -| | | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.1.1 -| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.2.1 -| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} - -| Initialize IPv4 forwarding with vhost in 3-node circular topology -| | [Documentation] -| | ... | Create pairs of Vhost-User interfaces for defined number of VMs on all -| | ... | VPP nodes. Set UP state of all VPP interfaces in path. Create -| | ... | nf_nodes+1 FIB tables on each DUT with multipath routing. Assign -| | ... | each Virtual interface to FIB table with Physical interface or Virtual -| | ... | interface on both nodes. Setup IPv4 addresses with /30 prefix on -| | ... | DUT-TG links and /30 prefix on DUT1-DUT2 link. Set routing on all DUT -| | ... | nodes in all FIB tables with prefix /8 and next hop of neighbour IPv4 -| | ... | address. Setup ARP on all VPP interfaces. -| | ... -| | ... | *Arguments:* -| | ... | - nf_nodes - Number of guest VMs. Type: integer -| | ... -| | ... | *Note:* -| | ... | Socket paths for VM are defined in following format: -| | ... | - /var/run/vpp/sock-\${VM_ID}-1 -| | ... | - /var/run/vpp/sock-\${VM_ID}-2 -| | ... -| | ... | *Example:* -| | ... -| | ... | \| IPv4 forwarding with Vhost-User initialized in a 3-node circular\ -| | ... | topology \| 1 \| -| | ... -| | [Arguments] | ${nf_nodes}=${1} -| | ... -| | Set interfaces in path up -| | ${fib_table_1}= | Set Variable | ${101} -| | ${fib_table_2}= | Evaluate | ${fib_table_1}+${nf_nodes} -| | Add Fib Table | ${dut1} | ${fib_table_1} -| | Add Fib Table | ${dut1} | ${fib_table_2} -| | Add Fib Table | ${dut2} | ${fib_table_1} -| | Add Fib Table | ${dut2} | ${fib_table_2} -| | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table_1} -| | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table_2} -| | Assign Interface To Fib Table | ${dut2} | ${dut2_if1} | ${fib_table_1} -| | Assign Interface To Fib Table | ${dut2} | ${dut2_if2} | ${fib_table_2} -| | Configure IP addresses on interfaces -| | ... | ${dut1} | ${dut1_if1} | 100.0.0.1 | 30 -| | Configure IP addresses on interfaces -| | ... | ${dut1} | ${dut1_if2} | 150.0.0.1 | 30 -| | Configure IP addresses on interfaces -| | ... | ${dut2} | ${dut2_if1} | 150.0.0.2 | 30 -| | Configure IP addresses on interfaces -| | ... | ${dut2} | ${dut2_if2} | 200.0.0.1 | 30 -| | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 100.0.0.2 | ${tg_if1_mac} -| | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 200.0.0.2 | ${tg_if2_mac} -| | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=100.0.0.2 -| | ... | interface=${dut1_if1} | vrf=${fib_table_1} -| | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=150.0.0.2 -| | ... | interface=${dut1_if2} | vrf=${fib_table_2} -| | Vpp Route Add | ${dut2} | 10.0.0.0 | 8 | gateway=150.0.0.1 -| | ... | interface=${dut2_if1} | vrf=${fib_table_1} -| | Vpp Route Add | ${dut2} | 20.0.0.0 | 8 | gateway=200.0.0.2 -| | ... | interface=${dut2_if2} | vrf=${fib_table_2} -| | :FOR | ${number} | IN RANGE | 1 | ${nf_nodes}+1 -| | | ${fib_table_1}= | Evaluate | ${100}+${number} -| | | ${fib_table_2}= | Evaluate | ${fib_table_1}+${1} -| | | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | | ... | /var/run/vpp/sock-${number}-1 | /var/run/vpp/sock-${number}-2 -| | | ... | dut1-vhost-${number}-if1 | dut1-vhost-${number}-if2 -| | | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if1} | up -| | | Set Interface State | ${dut1} | ${dut1-vhost-${number}-if2} | up -| | | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | | ... | /var/run/vpp/sock-${number}-1 | /var/run/vpp/sock-${number}-2 -| | | ... | dut2-vhost-${number}-if1 | dut2-vhost-${number}-if2 -| | | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if1} | up -| | | Set Interface State | ${dut2} | ${dut2-vhost-${number}-if2} | up -| | | Add Fib Table | ${dut1} | ${fib_table_1} -| | | Add Fib Table | ${dut1} | ${fib_table_2} -| | | Add Fib Table | ${dut2} | ${fib_table_1} -| | | Add Fib Table | ${dut2} | ${fib_table_2} -| | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if1} -| | | ... | ${fib_table_1} -| | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if2} -| | | ... | ${fib_table_2} -| | | Assign Interface To Fib Table | ${dut2} | ${dut2-vhost-${number}-if1} -| | | ... | ${fib_table_1} -| | | Assign Interface To Fib Table | ${dut2} | ${dut2-vhost-${number}-if2} -| | | ... | ${fib_table_2} -| | | Configure IP addresses on interfaces -| | | ... | ${dut1} | ${dut1-vhost-${number}-if1} | 1.1.1.2 | 30 -| | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | 1.1.2.2 | 30 -| | | ... | ${dut2} | ${dut2-vhost-${number}-if1} | 1.1.1.2 | 30 -| | | ... | ${dut2} | ${dut2-vhost-${number}-if2} | 1.1.2.2 | 30 -| | | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.1.1 -| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.2.1 -| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} -| | | Vpp Route Add | ${dut2} | 20.0.0.0 | 8 | gateway=1.1.1.1 -| | | ... | interface=${dut2-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut2} | 10.0.0.0 | 8 | gateway=1.1.2.1 -| | | ... | interface=${dut2-vhost-${number}-if2} | vrf=${fib_table_2} - -| Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology -| | [Documentation] -| | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node -| | ... | circular topology. In case of 3-node topology create VLAN -| | ... | sub-interfaces between DUTs. In case of 2-node topology create VLAN -| | ... | sub-interface on dut1-if2 interface. Get the interface MAC addresses -| | ... | and setup ARPs. Setup IPv4 addresses with /30 prefix on DUT-TG links -| | ... | and set routing with prefix /30. In case of 3-node set IPv4 adresses -| | ... | with /30 prefix on VLAN and set routing on both DUT nodes with prefix -| | ... | /30. Set next hop of neighbour DUT interface IPv4 address. All -| | ... | interfaces are brought up. -| | ... -| | ... | *Arguments:* -| | ... | - tg_if1_net - TG interface 1 IP subnet used by traffic generator. -| | ... | Type: integer -| | ... | - tg_if2_net - TG interface 2 IP subnet used by traffic generator. -| | ... | Type: integer -| | ... | - subid - ID of the sub-interface to be created. Type: string -| | ... | - tag_rewrite - Method of tag rewrite. Type: string -| | ... -| | ... | _NOTE:_ This KW uses following test case variables: -| | ... | - dut1 - DUT1 node. -| | ... | - dut2 - DUT2 node. -| | ... | - dut1_if2 - DUT1 interface towards DUT2. -| | ... | - dut2_if1 - DUT2 interface towards DUT1. -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Initialize IPv4 forwarding with VLAN dot1q sub-interfaces\ -| | ... | in circular topology \| 10.10.10.0 \| 20.20.20.0 \| 10 \| pop-1 \| -| | ... -| | [Arguments] | ${tg_if1_net} | ${tg_if2_net} | ${subid} | ${tag_rewrite} -| | ... -| | ${dut2_status} | ${value}= | Run Keyword And Ignore Error -| | ... | Variable Should Exist | ${dut2} -| | ... -| | Set interfaces in path up -| | ... -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Initialize VLAN dot1q sub-interfaces in circular topology -| | ... | ${dut1} | ${dut1_if2} | ${dut2} | ${dut2_if1} | ${subid} -| | ... | ELSE | Initialize VLAN dot1q sub-interfaces in circular topology -| | ... | ${dut1} | ${dut1_if2} | SUB_ID=${subid} -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure L2 tag rewrite method on interfaces | ${dut1} -| | ... | ${subif_index_1} | ${dut2} | ${subif_index_2} | ${tag_rewrite} -| | ... | ELSE | Configure L2 tag rewrite method on interfaces -| | ... | ${dut1} | ${subif_index_1} | TAG_REWRITE_METHOD=${tag_rewrite} -| | ... -| | ${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} | 1.1.1.1 | ${tg1_if1_mac} -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | VPP Add IP Neighbor -| | ... | ${dut1} | ${subif_index_1} | 2.2.2.2 | ${dut2_if1_mac} -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | VPP Add IP Neighbor -| | ... | ${dut2} | ${subif_index_2} | 2.2.2.1 | ${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 | ${subif_index_1} -| | VPP Add IP Neighbor | ${dut} | ${dut_if2} | 3.3.3.1 | ${tg1_if2_mac} -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 1.1.1.2 | 30 -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure IP addresses on interfaces | ${dut1} | ${subif_index_1} -| | ... | 2.2.2.1 | 30 -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | 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 | gateway=1.1.1.1 -| | ... | interface=${dut1_if1} -| | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | 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 | 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 IPv6 forwarding in circular topology | | [Documentation] | | ... | Set UP state on VPP interfaces in path on nodes in 2-node / 3-node @@ -730,8 +346,9 @@ | | | ... | ${fib_table_1} | ipv6=${True} | | | Assign Interface To Fib Table | ${dut1} | ${dut1-vhost-${number}-if2} | | | ... | ${fib_table_2} | ipv6=${True} -| | | Configure IP addresses on interfaces +| | | VPP Interface Set IP Address | | | ... | ${dut1} | ${dut1-vhost-${number}-if1} | 1:1::2 | 64 +| | | VPP Interface Set IP Address | | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | 1:2::2 | 64 | | | Vpp Route Add | ${dut1} | 2001:2::0 | 64 | gateway=1:1::1 | | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} @@ -1449,12 +1066,15 @@ | | ... | VPP Add IP Neighbor | | ... | ${dut2} | ${dut2_if1} | 1.1.1.1 | ${dut1_if2_mac} | | ... -| | Configure IP addresses on interfaces +| | VPP Interface Set IP Address | | ... | ${dut1} | ${dut1_if1} | 10.10.10.1 | 24 +| | VPP Interface Set IP Address | | ... | ${dut} | ${dut_if2} | 20.20.20.1 | 24 | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure IP addresses on interfaces +| | ... | VPP Interface Set IP Address | | ... | ${dut1} | ${dut1_if2} | 1.1.1.1 | 30 +| | Run Keyword If | '${dut2_status}' == 'PASS' +| | ... | VPP Interface Set IP Address | | ... | ${dut2} | ${dut2_if1} | 1.1.1.2 | 30 | | ... | | Run Keyword If | '${dut2_status}' == 'PASS' @@ -1687,9 +1307,9 @@ | | ... | interfaces. | | ... | | Set interfaces in path up -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 172.16.0.1 | | ... | 24 -| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 +| | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 172.16.0.2 | | ... | 24 | | ${dut1_if2_mac}= | Get Interface MAC | ${dut1} | ${dut1_if2} | | ${dut2_if1_mac}= | Get Interface MAC | ${dut2} | ${dut2_if1} @@ -1763,9 +1383,9 @@ | | ... | | [Arguments] | ${bd_id1} | ${bd_id2} | | ... -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} | 172.16.0.1 +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | 172.16.0.1 | | ... | 24 -| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} | 172.16.0.2 +| | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | 172.16.0.2 | | ... | 24 | | Set interfaces in path up | | ${dut1s_vxlan}= | Create VXLAN interface | ${dut1} | 24 @@ -1829,9 +1449,9 @@ | | Configure vhost interfaces for L2BD forwarding | ${dut1} | | ... | /var/run/vpp/sock-1-${dut1_bd_id1} | | ... | /var/run/vpp/sock-1-${dut1_bd_id2} -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | | | ... | ${dut1_address} | ${dut1_address_subnet} -| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} | +| | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} | | | ... | ${dut2_address} | ${dut2_address_subnet} | | ${dut1_bd_id1}= | Set Variable | 1 | | ${dut1_bd_id2}= | Set Variable | 2 @@ -2077,13 +1697,13 @@ | | VPP Add IP Neighbor | | ... | ${dut2} | ${dut2_if1} | ${dut1_dut2_address} | ${dut1_if2_mac} | | VPP Add IP Neighbor | ${dut2} | ${dut2_if2} | 20.20.20.2 | ${tg1_if2_mac} -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | | ... | ${dut1_tg_address} | ${duts_prefix} -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | | ... | ${dut1_dut2_address} | ${duts_prefix} -| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} +| | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | | ... | ${dut2_dut1_address} | ${duts_prefix} -| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} +| | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} | | ... | ${dut2_tg_address} | ${duts_prefix} | Initialize LISP GPE IPv4 over IPsec in 3-node circular topology @@ -2195,13 +1815,13 @@ | | ${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} -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | | ... | ${dut1_tg_ip4_address} | ${prefix4} | | VPP Interface Set IP Address | | ... | ${dut1} | ${dut1_if2} | ${dut1_dut2_ip6_address} | ${prefix6} | | VPP Interface Set IP Address | | ... | ${dut2} | ${dut2_if1} | ${dut2_dut1_ip6_address} | ${prefix6} -| | Configure IP addresses on interfaces | ${dut2} | ${dut2_if2} +| | VPP Interface Set IP Address | ${dut2} | ${dut2_if2} | | ... | ${dut2_tg_ip4_address} | ${prefix4} | | Suppress ICMPv6 router advertisement message | ${nodes} | | VPP Add IP Neighbor | ${dut1} | ${dut1_if1} | 10.10.10.2 | ${tg1_if1_mac} @@ -2273,12 +1893,12 @@ | | ... | | Set interfaces in path up | | ... -| | Configure IP addresses on interfaces | ${dut1} | ${dut1_if1} | 10.0.0.1 | 20 +| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1} | 10.0.0.1 | 20 | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure IP addresses on interfaces | ${dut1} | ${dut1_if2} +| | ... | VPP Interface Set IP Address | ${dut1} | ${dut1_if2} | | ... | 11.0.0.1 | 20 | | Run Keyword If | '${dut2_status}' == 'PASS' -| | ... | Configure IP addresses on interfaces | ${dut2} | ${dut2_if1} +| | ... | VPP Interface Set IP Address | ${dut2} | ${dut2_if1} | | ... | 11.0.0.2 | 20 | | ${dut}= | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Set Variable | ${dut2} @@ -2286,7 +1906,7 @@ | | ${dut_if2}= | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Set Variable | ${dut2_if2} | | ... | ELSE | Set Variable | ${dut1_if2} -| | Configure IP addresses on interfaces | ${dut} | ${dut_if2} | 12.0.0.1 | 20 +| | VPP Interface Set IP Address | ${dut} | ${dut_if2} | 12.0.0.1 | 20 | | ... | | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1} | | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2} @@ -2625,148 +2245,6 @@ | | 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] -| | ... | Create pairs of Memif interfaces on DUT node. Put each Memif interface -| | ... | to separate IPv4 VRF with one physical or virtual interface -| | ... | to create a chain accross DUT node. -| | ... -| | ... | *Arguments:* -| | ... | - dut - DUT node. Type: dictionary -| | ... | - count - Number of memif pairs (containers). Type: integer -| | ... -| | ... | *Note:* -| | ... | Socket paths for Memif are defined in following format: -| | ... | - /tmp/memif-\${dut}_CNF\${number}-\${sid} -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Initialize IPv4 routing with memif pairs on DUT node \ -| | ... | \| ${dut} \| ${1} \| -| | ... -| | [Arguments] | ${dut} | ${count} -| | ... -| | ${dut_index}= | Get Index From List | ${duts} | ${dut} -| | ${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 -| | ... -| | ${fib_table_1}= | Set Variable | ${10} -| | Run Keyword If | ${fib_table_1} > ${0} -| | ... | Add Fib Table | ${nodes['${dut}']} | ${fib_table_1} -| | ${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} -| | Assign Interface To Fib Table | ${nodes['${dut}']} | ${${dut}_if1} -| | ... | ${fib_table_1} -| | Configure IP addresses on interfaces | ${nodes['${dut}']} | ${${dut}_if1} -| | ... | ${ip_net_if1}.2 | 30 -| | ${prev_node}= | Run Keyword If | ${dut_index} == ${0} -| | ... | Set Variable | TG -| | ... | ELSE | Get From List | ${duts} | ${dut_index-${1}} -| | ${prev_if}= | Run Keyword If | ${dut_index} == ${0} -| | ... | Set Variable | if1 -| | ... | ELSE | Set Variable | if2 -| | ${prev_if_mac}= | Get Interface MAC | ${nodes['${prev_node}']} -| | ... | ${${prev_node}_${prev_if}} -| | VPP Add IP Neighbor -| | ... | ${nodes['${dut}']} | ${${dut}_if1} | ${ip_net_if1}.1 | ${prev_if_mac} -| | ... -| | ${fib_table_2}= | Evaluate | ${fib_table_1} + ${count} -| | Add Fib Table | ${nodes['${dut}']} | ${fib_table_2} -| | ${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} -| | Assign Interface To Fib Table | ${nodes['${dut}']} | ${${dut}_if2} -| | ... | ${fib_table_2} -| | Configure IP addresses on interfaces | ${nodes['${dut}']} | ${${dut}_if2} -| | ... | ${ip_net_if2}.1 | 30 -| | ${next_node}= | Run Keyword If | ${dut_index} == ${last_dut_index} -| | ... | Set Variable | TG -| | ... | ELSE | Get From List | ${duts} | ${dut_index+${1}} -| | ${next_if}= | Run Keyword If | ${dut_index} == ${last_dut_index} -| | ... | Set Variable | if2 -| | ... | ELSE | Set Variable | if1 -| | ${next_if_mac}= | Get Interface MAC | ${nodes['${next_node}']} -| | ... | ${${next_node}_${next_if}} -| | VPP Add IP Neighbor -| | ... | ${nodes['${dut}']} | ${${dut}_if2} | ${ip_net_if2}.2 | ${next_if_mac} -| | ... -| | ${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}_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} -| | | ${memif1}= | Set Variable | ${${dut}-memif-${number}-if1} -| | | ${memif2}= | Set Variable | ${${dut}-memif-${number}-if2} -| | | ${fib_table_1}= | Evaluate | ${fib_table_1} + ${1} -| | | ${fib_table_2}= | Evaluate | ${fib_table_1} + ${1} -| | | Run Keyword Unless | ${number} == ${count} -| | | ... | Add Fib Table | ${nodes['${dut}']} | ${fib_table_2} -| | | Assign Interface To Fib Table | ${nodes['${dut}']} -| | | ... | ${memif1} | ${fib_table_1} -| | | Assign Interface To Fib Table | ${nodes['${dut}']} -| | | ... | ${memif2} | ${fib_table_2} -| | | ${ip_base_memif1}= | Evaluate -| | | ... | ${ip_base_start} + (${number} - ${1}) * ${2} -| | | ${ip_base_memif2}= | Evaluate | ${ip_base_memif1} + ${1} -| | | ${ip_net_memif1}= | Set Variable -| | | ... | ${ip_base_memif1}.${ip_base_memif1}.${ip_base_memif1} -| | | ${ip_net_memif2}= | Set Variable -| | | ... | ${ip_base_memif2}.${ip_base_memif2}.${ip_base_memif2} -| | | Configure IP addresses on interfaces -| | | ... | ${nodes['${dut}']} | ${memif1} | ${ip_net_memif1}.1 | 30 -| | | ... | ${nodes['${dut}']} | ${memif2} | ${ip_net_memif2}.1 | 30 -| | | Vpp Route Add | ${nodes['${dut}']} | ${tg_if2_net} | 24 -| | | ... | vrf=${fib_table_1} | gateway=${ip_net_memif2}.1 -| | | ... | interface=${memif1} -| | | Vpp Route Add | ${nodes['${dut}']} | ${tg_if1_net} | 24 -| | | ... | vrf=${fib_table_2} | gateway=${ip_net_memif1}.1 -| | | ... | interface=${memif2} -| | | ${memif_if1_key}= | Get interface by sw index | ${nodes['${dut}']} -| | | ... | ${memif1} -| | | ${memif_if1_mac}= | Get interface mac | ${nodes['${dut}']} -| | | ... | ${memif_if1_key} -| | | ${memif_if2_key}= | Get interface by sw index | ${nodes['${dut}']} -| | | ... | ${memif2} -| | | ${memif_if2_mac}= | Get interface mac | ${nodes['${dut}']} -| | | ... | ${memif_if2_key} -| | | VPP Add IP Neighbor | ${nodes['${dut}']} -| | | ... | ${memif1} | ${ip_net_memif2}.1 | ${memif_if2_mac} -| | | VPP Add IP Neighbor | ${nodes['${dut}']} -| | | ... | ${memif2} | ${ip_net_memif1}.1 | ${memif_if1_mac} - -| Initialize IPv4 routing with memif pairs -| | [Documentation] -| | ... | Create pairs of Memif interfaces on all defined VPP nodes. Put each -| | ... | Memif interface to separate IPv4 VRF with one physical or -| | ... | virtual interface to create a chain accross DUT node. -| | ... -| | ... | *Arguments:* -| | ... | - count - Number of memif pairs (containers). Type: integer -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Initialize IPv4 routing with memif pairs \| ${1} \| -| | ... -| | [Arguments] | ${count}=${1} -| | ... -| | :FOR | ${dut} | IN | @{duts} -| | | 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] | | ... | Create single Memif interface on all defined VPP nodes. Cross |