diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-08-14 12:22:58 -0700 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2017-10-09 05:48:29 -0700 |
| commit | e65ba17d162581fa8b803070a5e706f344c30f33 (patch) | |
| tree | 15807af6c27cafa8e4be17292bf1718558d3e552 /tests/vpp | |
| parent | df5ed0d9317e2a1d4a7248459cc6aec39f80a052 (diff) | |
FIB table add/delete
Change-Id: Icadb4884a1c08a2230fd4692df69310ce382ec94
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'tests/vpp')
17 files changed, 41 insertions, 12 deletions
diff --git a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index 11d7550563..15c10d40fc 100644 --- a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -241,8 +241,10 @@ | | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} +| | And Add Fib Table | ${dut2_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table} | | Set Interface Address | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} diff --git a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index e85ef57d1f..8c131181f3 100644 --- a/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/vpp/func/crypto/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -76,6 +76,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ip6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ip6=${TRUE} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot index 9ff3d2df75..2da3802480 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copblklistbase-func.robot @@ -81,8 +81,7 @@ | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} -| | And Add fib table | ${dut1_node} -| | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | drop +| | And Add fib table | ${dut1_node} | ${fib_table_number} | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot index 775cbae579..df37b7b609 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4base-copwhlistbase-func.robot @@ -81,8 +81,9 @@ | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_if2_ip_GW} | ${tg_to_dut2_mac} | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} -| | And Add fib table | ${dut1_node} -| | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | local +| | And Add fib table | ${dut1_node} | ${fib_table_number} +| | And Vpp Route Add | ${dut1_node} +| | ... | ${cop_dut_ip} | ${ip_prefix} | vrf=${fib_table_number} | local=${TRUE} | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip4 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot index b520d4df6c..46bcf757d2 100644 --- a/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot +++ b/tests/vpp/func/ip4/eth2p-ethip4-ip4basevrf-func.robot @@ -309,16 +309,20 @@ | | ... | ${dut2_node} | ${dut2_to_dut1_if1} | | ${dut2_if2_idx}= | Get Interface SW Index | | ... | ${dut2_node} | ${dut2_to_dut1_if2} -| | And Add fib table | ${dut1_node} +| | And Add fib table | ${dut1_node} | ${fib_table_1} +| | And Add fib table | ${dut1_node} | ${fib_table_2} +| | And Add fib table | ${dut2_node} | ${fib_table_1} +| | And Add fib table | ${dut2_node} | ${fib_table_2} +| | And Vpp Route Add | ${dut1_node} | | ... | ${tg_dut2_ip1} | ${ip_prefix} | ${fib_table_1} | | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut1_if1_idx} multipath -| | And Add fib table | ${dut1_node} +| | And Vpp Route Add | ${dut1_node} | | ... | ${tg_dut2_ip2} | ${ip_prefix} | ${fib_table_2} | | ... | via ${dut1_to_dut2_ip2} sw_if_index ${dut1_if2_idx} multipath -| | And Add fib table | ${dut2_node} +| | And Vpp Route Add | ${dut2_node} | | ... | ${tg_dut1_ip1} | ${ip_prefix} | ${fib_table_1} | | ... | via ${dut2_to_dut1_ip1} sw_if_index ${dut2_if1_idx} multipath -| | And Add fib table | ${dut2_node} +| | And Vpp Route Add | ${dut2_node} | | ... | ${tg_dut1_ip2} | ${ip_prefix} | ${fib_table_2} | | ... | via ${dut2_to_dut1_ip2} sw_if_index ${dut2_if2_idx} multipath diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 9346be1e5d..2aa4990564 100644 --- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -67,6 +67,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index 668e870ff0..2b13eae0dd 100644 --- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -66,6 +66,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ip6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot index f4314500e5..f93c5b7f71 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copblklistbase-func.robot @@ -90,8 +90,7 @@ | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | And Add fib table | ${dut1_node} -| | ... | ${cop_dut_ip} | ${ip_prefix} | ${fib_table_number} | drop +| | And Add fib table | ${dut1_node} | ${fib_table_number} | ipv6=${TRUE} | | When COP Add whitelist Entry | | ... | ${dut1_node} | ${dut1_to_tg} | ip6 | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot index a60aa7760c..22fc1517ba 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6base-copwhlistbase-func.robot @@ -90,8 +90,9 @@ | | And Vpp Route Add | ${dut1_node} | | ... | ${test_dst_ip} | ${ip_prefix} | ${dut1_if2_ip_GW} | ${dut1_to_dut2} | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | And Add fib table | ${dut1_node} | ${cop_dut_ip} | ${ip_prefix} | -| | ... | ${fib_table_number} | local +| | And Add fib table | ${dut1_node} | ${fib_table_number} | ipv6=${TRUE} +| | And Vpp Route Add | ${dut1_node} +| | ... | ${cop_dut_ip} | ${ip_prefix} | vrf=${fib_table_number} | local=${TRUE} | | When COP Add whitelist Entry | ${dut1_node} | ${dut1_to_tg} | ip6 | | | ... | ${fib_table_number} | | And COP interface enable or disable | ${dut1_node} | ${dut1_to_tg} | enable diff --git a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot b/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot index cf0ed43a4a..2fbfd88a7c 100644 --- a/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/vpp/func/ip6/eth2p-ethip6-ip6basevrf-func.robot @@ -338,6 +338,8 @@ | | ${dut2_if2_idx}= | Get Interface SW Index | | ... | ${dut2_node} | ${dut2_to_dut1_if2} +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ipv6=${TRUE} +| | And Add Fib Table | ${dut1_node} | ${fib_table_2} | ipv6=${TRUE} | | Assign Interface To Fib Table | | ... | ${dut1_node} | ${dut1_to_dut2_if1} | ${fib_table_1} | ipv6=${TRUE} | | Assign Interface To Fib Table @@ -347,6 +349,8 @@ | | Assign Interface To Fib Table | | ... | ${dut1_node} | ${dut1_to_tg_if2} | ${fib_table_2} | ipv6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ipv6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_2} | ipv6=${TRUE} | | Assign Interface To Fib Table | | ... | ${dut2_node} | ${dut2_to_dut1_if1} | ${fib_table_1} | ipv6=${TRUE} | | Assign Interface To Fib Table diff --git a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 198a14ce77..c89ab68414 100644 --- a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -66,6 +66,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ip6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index 2a426f5efd..fe61568ba9 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot @@ -70,6 +70,7 @@ | | ${vhost2}= | And Vpp Create Vhost User Interface | ${dut_node} | ${sock2} | | And Set Interface State | ${dut_node} | ${vhost1} | up | | And Set Interface State | ${dut_node} | ${vhost2} | up +| | And Add Fib Table | ${dut_node} | ${fib_table_2} | | And Assign Interface To Fib Table | ${dut_node} | | ... | ${vhost2} | ${fib_table_2} | | And Assign Interface To Fib Table | ${dut_node} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index f4ff9a37d2..a247919fa1 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -163,6 +163,8 @@ | | Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table} +| | And Add Fib Table | ${dut2_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table} | | Assign Interface To Fib Table | ${dut2_node} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot index 2bbafed6ee..c4c0c4a1d7 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -105,6 +105,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} diff --git a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index 0a6a5e4603..09bed1aea7 100644 --- a/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip4/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -67,6 +67,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} @@ -104,6 +106,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | | Set Interface Address | ${dut1_node} | ${vhost2} | ${vhost_ip} | ${prefix4} diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index 9ed970df7c..45b81d4f56 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -101,6 +101,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | ipv6={TRUE} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | ipv6=${TRUE} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} diff --git a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index a9d57c577f..16cded0f24 100644 --- a/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/vpp/func/vm_vhost/ip6/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -67,6 +67,8 @@ | | Given Configure path in 3-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['DUT2']} | ${nodes['TG']} | | And Set interfaces in 3-node circular topology up +| | And Add Fib Table | ${dut1_node} | ${fib_table_1} | ipv6=${TRUE} +| | And Add Fib Table | ${dut2_node} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut1_node} | | ... | ${dut1_to_tg} | ${fib_table_1} | ipv6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} @@ -108,6 +110,7 @@ | | ... | | ${vhost1}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock1} | | ${vhost2}= | Vpp Create Vhost User Interface | ${dut1_node} | ${sock2} +| | And Add Fib Table | ${dut1_node} | ${fib_table} | ipv6=${TRUE} | | Assign Interface To Fib Table | ${dut1_node} | | ... | ${vhost2} | ${fib_table} | ipv6=${TRUE} | | Vpp Set If IPv6 Addr | ${dut1_node} | ${vhost2} | ${vhost_ip} |