diff options
Diffstat (limited to 'resources/libraries/robot')
| -rw-r--r-- | resources/libraries/robot/ip/ip4.robot | 60 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/interfaces.robot | 6 |
2 files changed, 58 insertions, 8 deletions
diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot index 7209c6ccec..84f422e8bc 100644 --- a/resources/libraries/robot/ip/ip4.robot +++ b/resources/libraries/robot/ip/ip4.robot @@ -305,6 +305,8 @@ | | ... | | ... | *Arguments:* | | ... | - nf_nodes - Number of guest VMs. Type: integer +| | ... | - testpmd_mac - Switch for testpmd_mac test configuration. +| | ... | Type: boolean | | ... | | ... | *Note:* | | ... | Socket paths for VM are defined in following format: @@ -316,7 +318,7 @@ | | ... | \| IPv4 forwarding with Vhost-User initialized in a 2-node circular\ | | ... | topology \| 1 \| | | ... -| | [Arguments] | ${nf_nodes}=${1} +| | [Arguments] | ${nf_nodes}=${1} | ${testpmd_mac}=${FALSE} | | ... | | Set interfaces in path up | | ${fib_table_1}= | Set Variable | ${101} @@ -353,9 +355,23 @@ | | | ... | ${dut1} | ${dut1-vhost-${number}-if1} | 1.1.1.2 | 30 | | | VPP Interface Set IP Address | | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | 1.1.2.2 | 30 -| | | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.1.1 +| | | Run Keyword Unless | ${testpmd_mac} +| | | ... | 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 +| | | Run Keyword Unless | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.2.1 +| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | VPP Add IP Neighbor | ${dut1} | ${dut1-vhost-${number}-if1} +| | | ... | 1.1.2.2 | ${dut1-vhost-${number}-if2_mac} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | VPP Add IP Neighbor | ${dut1} | ${dut1-vhost-${number}-if2} +| | | ... | 1.1.1.2 | ${dut1-vhost-${number}-if1_mac} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.2.2 +| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.1.2 | | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} | Initialize IPv4 forwarding with vhost in 3-node circular topology @@ -382,7 +398,7 @@ | | ... | \| IPv4 forwarding with Vhost-User initialized in a 3-node circular\ | | ... | topology \| 1 \| | | ... -| | [Arguments] | ${nf_nodes}=${1} +| | [Arguments] | ${nf_nodes}=${1} | ${testpmd_mac}=${FALSE} | | ... | | Set interfaces in path up | | ${fib_table_1}= | Set Variable | ${101} @@ -446,13 +462,41 @@ | | | ... | ${dut2} | ${dut2-vhost-${number}-if1} | 1.1.1.2 | 30 | | | VPP Interface Set IP Address | | | ... | ${dut2} | ${dut2-vhost-${number}-if2} | 1.1.2.2 | 30 -| | | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.1.1 +| | | Run Keyword Unless | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.1.1 +| | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Run Keyword Unless | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.2.1 +| | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Run Keyword Unless | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut2} | 20.0.0.0 | 8 | gateway=1.1.1.1 +| | | ... | interface=${dut2-vhost-${number}-if1} | vrf=${fib_table_1} +| | | Run Keyword Unless | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut2} | 10.0.0.0 | 8 | gateway=1.1.2.1 +| | | ... | interface=${dut2-vhost-${number}-if2} | vrf=${fib_table_2} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | VPP Add IP Neighbor | ${dut1} | ${dut1-vhost-${number}-if1} +| | | ... | 1.1.2.2 | ${dut1-vhost-${number}-if2_mac} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | VPP Add IP Neighbor | ${dut1} | ${dut1-vhost-${number}-if2} +| | | ... | 1.1.1.2 | ${dut1-vhost-${number}-if1_mac} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | VPP Add IP Neighbor | ${dut2} | ${dut2-vhost-${number}-if1} +| | | ... | 1.1.2.2 | ${dut2-vhost-${number}-if2_mac} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | VPP Add IP Neighbor | ${dut2} | ${dut2-vhost-${number}-if2} +| | | ... | 1.1.1.2 | ${dut2-vhost-${number}-if1_mac} +| | | Run Keyword If | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.2.2 | | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.2.1 +| | | Run Keyword If | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.1.2 | | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} -| | | Vpp Route Add | ${dut2} | 20.0.0.0 | 8 | gateway=1.1.1.1 +| | | Run Keyword If | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut2} | 20.0.0.0 | 8 | gateway=1.1.2.2 | | | ... | interface=${dut2-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Vpp Route Add | ${dut2} | 10.0.0.0 | 8 | gateway=1.1.2.1 +| | | Run Keyword If | ${testpmd_mac} +| | | ... | Vpp Route Add | ${dut2} | 10.0.0.0 | 8 | gateway=1.1.1.2 | | | ... | interface=${dut2-vhost-${number}-if2} | vrf=${fib_table_2} | Initialize IPv4 forwarding with VLAN dot1q sub-interfaces in circular topology diff --git a/resources/libraries/robot/shared/interfaces.robot b/resources/libraries/robot/shared/interfaces.robot index f3fb3decd5..514ed91a5b 100644 --- a/resources/libraries/robot/shared/interfaces.robot +++ b/resources/libraries/robot/shared/interfaces.robot @@ -444,7 +444,13 @@ | | ... | | ${vhost_1}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock1} | | ${vhost_2}= | Vpp Create Vhost User Interface | ${dut_node} | ${sock2} +| | ${vhost_1_key}= | Get Interface By SW Index | ${dut_node} | ${vhost_1} +| | ${vhost_2_key}= | Get Interface By SW Index | ${dut_node} | ${vhost_2} +| | ${vhost_1_mac}= | Get Interface MAC | ${dut_node} | ${vhost_1_key} +| | ${vhost_2_mac}= | Get Interface MAC | ${dut_node} | ${vhost_2_key} | | Set Interface State | ${dut_node} | ${vhost_1} | up | | Set Interface State | ${dut_node} | ${vhost_2} | up | | Set Test Variable | ${${vhost_if1}} | ${vhost_1} | | Set Test Variable | ${${vhost_if2}} | ${vhost_2} +| | Set Test Variable | ${${vhost_if1}_mac} | ${vhost_1_mac} +| | Set Test Variable | ${${vhost_if2}_mac} | ${vhost_2_mac} |