diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-02-25 14:23:37 +0000 |
|---|---|---|
| committer |   Jan Gelety <jgelety@cisco.com> | 2017-03-01 11:19:40 +0000 |
| commit | 933f6fd1af59ffede0f1e51ca67b6913fb9a27e8 (patch) | |
| tree | 39edf8e3607f58d3f2e793bb2d9355219be884bb /tests | |
| parent | 9b9a6e379bfb8a7b99a66fba1940e5d2c31df4e5 (diff) | |
Remove unused VRF paramter from IP neighbour Add/del
Change-Id: I4a348c696e4cacbf5aa0723f2b8070bbcce7666c
Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'tests')
17 files changed, 63 insertions, 85 deletions
diff --git a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot index b456c4f0a6..b7d25746d7 100644 --- a/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot +++ b/tests/func/ipv4/eth2p-ethip4-ip4base-eth-2vhost-1vm.robot @@ -89,7 +89,7 @@ | | ... | vrf=${fib_table_2} | | Add IP Neighbor | ${dut_node} | ${vhost1} | ${net2_ip2} | ${vhost2_mac} | | Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${net3_ip2} -| | ... | ${tg_to_dut_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_to_dut_if2_mac} | | When VM for Vhost L2BD forwarding is setup | | ... | ${dut_node} | ${sock1} | ${sock2} | | Then Send Packet And Check Headers diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot index d3a3cda788..e3f94250a2 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-eth-2vhost-1vm-func.robot @@ -183,14 +183,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot index 04067a6f0f..c6cd734fe6 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip4base-func.robot @@ -163,7 +163,7 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | When IPsec Generate Keys | ${encr_alg} | ${auth_alg} | | And Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} @@ -205,7 +205,7 @@ | | ${encr_alg}= | Crypto Alg AES CBC 128 | | ${auth_alg}= | Integ Alg SHA1 96 | | Given Setup 3-node Topology | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} @@ -260,14 +260,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot index 3d3b3ceb8e..d59d85897a 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -153,13 +153,13 @@ | | Vpp Set If IPv6 Addr | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | | ... | ${prefix6} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_table} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_table} +| | ... | ${tg_to_dut1_mac} | | Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot index df942c7888..484a5cdb9e 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6base-func.robot @@ -145,13 +145,13 @@ | | Vpp Set If IPv6 Addr | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | | ... | ${prefix6} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_table} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_table} +| | ... | ${tg_to_dut1_mac} | | Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} diff --git a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot index 4974224edd..a4089e03a9 100644 --- a/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4ipsectptlispgpe-ip6basevrf-func.robot @@ -118,13 +118,13 @@ | | Vpp Set If IPv6 Addr | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | | ... | ${prefix6} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_table} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} | | ... | ${dut1_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_table} +| | ... | ${tg_to_dut1_mac} | | Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot index cac15ce4a4..d095b79f97 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4base-func.robot @@ -95,14 +95,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot index d83dec66c3..7199cda821 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-eth-2vhost-1vm-func.robot @@ -76,7 +76,7 @@ | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And IP addresses are set on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} @@ -125,14 +125,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot index 83c15ec882..65c6e932ba 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip4basevrf-func.robot @@ -75,7 +75,7 @@ | | ... | ${dut1_to_tg} | ${fib_table_1} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And IP addresses are set on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} @@ -100,14 +100,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot index b959ff20d0..896dc43a60 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6base-func.robot @@ -103,14 +103,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6o4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6o4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} diff --git a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot index 7d88aa0016..7cc24ba11d 100644 --- a/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip4lispgpe-ip6basevrf-func.robot @@ -68,7 +68,7 @@ | | ... | ${dut1_to_tg} | ${fib_table_1} | ip6=${TRUE} | | And Assign Interface To Fib Table | ${dut2_node} | | ... | ${dut2_to_tg} | ${fib_table_1} | ip6=${TRUE} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | And IP addresses are set on interfaces | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip6o4} | | ... | ${dut_prefix6o4} @@ -95,14 +95,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6o4} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6o4} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6o4} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6o4} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot index 9d47158e18..4c8bf01bcc 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-eth-2vhost-1vm-func.robot @@ -122,14 +122,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot index 28316511cc..c82465c106 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6base-func.robot @@ -97,14 +97,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot index 52c37b3306..6b45cd09d9 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-eth-2vhost-1vm-func.robot @@ -84,7 +84,7 @@ | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | When Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} @@ -129,14 +129,12 @@ | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot index 500f138da6..662aba0c2e 100644 --- a/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot +++ b/tests/func/lisp/eth2p-ethip6lispgpe-ip6basevrf-func.robot @@ -82,7 +82,7 @@ | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip6} | ${prefix6} | | And Vpp Set If IPv6 Addr | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip6} | ${prefix6} -| | And Add IP Neighbors | ${fib_table_1} +| | And Add IP Neighbors | | When Set up LISP GPE topology | | ... | ${dut1_node} | ${dut1_to_dut2} | ${NONE} | | ... | ${dut2_node} | ${dut2_to_dut1} | ${NONE} @@ -102,14 +102,12 @@ *** Keywords *** | Add IP Neighbors | | [Documentation] -| | ... | Add IP neighbors to physical interfaces on DUTs.\ -| | ... | You can specify fib table ID for DUT-TG interfaces. Default is 0. +| | ... | Add IP neighbors to physical interfaces on DUTs. | | ... -| | [Arguments] | ${fib_id}=0 | | Add IP Neighbor | ${dut1_node} | ${dut1_to_tg} | ${tg1_ip6} -| | ... | ${tg_to_dut1_mac} | ${fib_id} +| | ... | ${tg_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_tg} | ${tg2_ip6} -| | ... | ${tg_to_dut2_mac} | ${fib_id} +| | ... | ${tg_to_dut2_mac} | | Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip6} | | ... | ${dut2_to_dut1_mac} | | Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1} | ${dut1_to_dut2_ip6} diff --git a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot index 7a76a1805c..f2413ff612 100644 --- a/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip4-ip4basevrf-func.robot @@ -363,22 +363,22 @@ | | ... | ${dut2_to_dut1_ip2} | ${ip_prefix} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg_if1} -| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_dut2_if1} -| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg_if1} -| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1_if1} -| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_tg_if2} -| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | | And Add Arp On Dut | ${dut1_node} | ${dut1_to_dut2_if2} -| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_tg_if2} -| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | | And Add Arp On Dut | ${dut2_node} | ${dut2_to_dut1_if2} -| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix} | | ... | ${dut2_to_dut1_ip1} | ${dut1_to_dut2_if1} | vrf=${fib_table_1} diff --git a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot index b88b6fd577..acbf7ea543 100644 --- a/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot +++ b/tests/func/vrf/eth2p-ethip6-ip6basevrf-func.robot @@ -379,22 +379,22 @@ | | ... | ${dut2_to_dut1_ip2} | ${ip_prefix} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if1} -| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut1_ip1} | ${tg_to_dut1_if1_mac} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if1} -| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut2_to_dut1_ip1} | ${dut2_to_dut1_if1_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if1} -| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${tg_dut2_ip1} | ${tg_to_dut2_if1_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if1} -| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | vrf=${fib_table_1} +| | ... | ${dut1_to_dut2_ip1} | ${dut1_to_dut2_if1_mac} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_tg_if2} -| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut1_ip2} | ${tg_to_dut1_if2_mac} | | And Add IP Neighbor | ${dut1_node} | ${dut1_to_dut2_if2} -| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut2_to_dut1_ip2} | ${dut2_to_dut1_if2_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_tg_if2} -| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${tg_dut2_ip2} | ${tg_to_dut2_if2_mac} | | And Add IP Neighbor | ${dut2_node} | ${dut2_to_dut1_if2} -| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | vrf=${fib_table_2} +| | ... | ${dut1_to_dut2_ip2} | ${dut1_to_dut2_if2_mac} | | And Vpp Route Add | ${dut1_node} | ${tg_dut2_ip1} | ${ip_prefix} | | ... | ${dut2_to_dut1_ip1} | ${dut1_to_dut2_if1} | vrf=${fib_table_1} |