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 /tests | |
| 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 'tests')
4 files changed, 16 insertions, 4 deletions
diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-func.robot index ce49b4ba72..a2d1da3e52 100644 --- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-func.robot +++ b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lisp-ip4base-func.robot @@ -65,13 +65,16 @@ | | 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 Configure IP addresses on interfaces +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4} | ${prefix4} +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_tg} | | ... | ${dut1_to_tg_ip4} | ${prefix4} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_dut1} | | ... | ${dut2_to_dut1_ip4} | ${prefix4} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_tg} | | ... | ${dut2_to_tg_ip4} | ${prefix4} | | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4} diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-func.robot index 37a8515e04..adde88ab4f 100644 --- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-func.robot +++ b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip4base-func.robot @@ -68,10 +68,13 @@ | | 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 Configure IP addresses on interfaces +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_dut2} | ${dut1_to_dut2_ip4} | ${prefix4} +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_tg} | ${dut1_to_tg_ip4} | ${prefix4} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_dut1} | ${dut2_to_dut1_ip4} | ${prefix4} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_tg} | ${dut2_to_tg_ip4} | ${prefix4} | | And Add IP Neighbors | | When Configure LISP GPE topology in 3-node circular topology diff --git a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-func.robot b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-func.robot index 85fa7546e6..ce8b910854 100644 --- a/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-func.robot +++ b/tests/vpp/func/ip4_tunnels/lisp/eth2p-ethip4lispgpe-ip6base-func.robot @@ -67,13 +67,16 @@ | | 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 Configure IP addresses on interfaces +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip6o4} | ${dut_prefix6o4} +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_tg} | | ... | ${dut1_to_tg_ip6o4} | ${tg_prefix6o4} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_dut1} | | ... | ${dut2_to_dut1_ip6o4} | ${dut_prefix6o4} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_tg} | | ... | ${dut2_to_tg_ip6o4} | ${tg_prefix6o4} | | And Add IP Neighbors diff --git a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-func.robot b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-func.robot index d6cc233444..06aec5f09a 100644 --- a/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-func.robot +++ b/tests/vpp/func/ip6_tunnels/lisp/eth2p-ethip6lispgpe-ip4base-func.robot @@ -65,13 +65,16 @@ | | 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 Configure IP addresses on interfaces +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_dut2} | | ... | ${dut1_to_dut2_ip4o6} | ${dut_prefix4o6} +| | And VPP Interface Set IP Address | | ... | ${dut1_node} | ${dut1_to_tg} | | ... | ${dut1_to_tg_ip4o6} | ${tg_prefix4o6} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_dut1} | | ... | ${dut2_to_dut1_ip4o6} | ${dut_prefix4o6} +| | And VPP Interface Set IP Address | | ... | ${dut2_node} | ${dut2_to_tg} | | ... | ${dut2_to_tg_ip4o6} | ${tg_prefix4o6} | | And VPP IP Probe | ${dut1_node} | ${dut1_to_dut2} | ${dut2_to_dut1_ip4o6} |