aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/robot/ip
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2019-01-24 12:31:25 +0100
committerJan Gelety <jgelety@cisco.com>2019-01-24 15:14:36 +0000
commit159d6db940f03a0b9abff24442a66888e21e18df (patch)
tree6e226be5f235cb72b6db97ba782236b47135f999 /resources/libraries/robot/ip
parent453528c437622e48799d0a061a1fead4ed573e9e (diff)
FIX: correct call of vpp_add_route
Change-Id: I63a2b5f484ac627c020e30c9f01a868c57aacf42 Signed-off-by: Jan Gelety <jgelety@cisco.com> (cherry picked from commit 552491e8bcff9745b04fbdd92609351ec9597cdc)
Diffstat (limited to 'resources/libraries/robot/ip')
-rw-r--r--resources/libraries/robot/ip/ip4.robot32
-rw-r--r--resources/libraries/robot/ip/ip6.robot32
2 files changed, 38 insertions, 26 deletions
diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot
index def7d3212c..d811d0deea 100644
--- a/resources/libraries/robot/ip/ip4.robot
+++ b/resources/libraries/robot/ip/ip4.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -55,13 +55,13 @@
| | :FOR | ${link} | IN | @{tg_dut1_links}
| | | ${net}= | Get Link Address | ${link} | ${nodes_addr}
| | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr}
-| | | Vpp Route Add | ${dut2} | ${net} | ${prefix} | ${dut1_if_addr}
-| | | ... | ${dut2_if}
+| | | Vpp Route Add | ${dut2} | ${net} | ${prefix}
+| | | ... | gateway=${dut1_if_addr} | interface=${dut2_if}
| | :FOR | ${link} | IN | @{tg_dut2_links}
| | | ${net}= | Get Link Address | ${link} | ${nodes_addr}
| | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr}
-| | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr}
-| | | ... | ${dut1_if}
+| | | Vpp Route Add | ${dut1} | ${net} | ${prefix}
+| | | ... | gateway=${dut2_if_addr} | interface=${dut1_if}
| Configure DUT nodes for IPv4 testing
| | Configure IPv4 addresses on all DUTs | ${nodes} | ${nodes_ipv4_addr}
@@ -285,10 +285,12 @@
| | ...
| | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}'
| | ... | Vpp Route Add | ${dut_node} | ${remote_host1_ip4}
-| | ... | ${remote_host_ip4_prefix} | ${tg_if1_ip4} | ${dut_to_tg_if1}
+| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if1_ip4}
+| | ... | interface=${dut_to_tg_if1}
| | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}'
| | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip4}
-| | ... | ${remote_host_ip4_prefix} | ${tg_if2_ip4} | ${dut_to_tg_if2}
+| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if2_ip4}
+| | ... | interface=${dut_to_tg_if2}
| Configure IPv4 forwarding in 3-node circular topology
| | [Documentation]
@@ -350,19 +352,23 @@
| | ... | ${dut2_if2_ip4} | ${dut_tg_ip4_prefix}
| | ...
| | Vpp Route Add | ${dut1_node} | ${tg_if2_ip4} | ${dut_tg_ip4_prefix}
-| | ... | ${dut2_if1_ip4} | ${dut1_to_dut2}
+| | ... | gateway=${dut2_if1_ip4} | interface=${dut1_to_dut2}
| | Vpp Route Add | ${dut2_node} | ${tg_if1_ip4} | ${dut_tg_ip4_prefix}
-| | ... | ${dut1_if2_ip4} | ${dut2_to_dut1}
+| | ... | gateway=${dut1_if2_ip4} | interface=${dut2_to_dut1}
| | ...
| | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}'
| | ... | Vpp Route Add | ${dut1_node} | ${remote_host1_ip4}
-| | ... | ${remote_host_ip4_prefix} | ${tg_if1_ip4} | ${dut1_to_tg}
+| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if1_ip4}
+| | ... | interface=${dut1_to_tg}
| | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}'
| | ... | Vpp Route Add | ${dut1_node} | ${remote_host2_ip4}
-| | ... | ${remote_host_ip4_prefix} | ${dut2_if1_ip4} | ${dut1_to_dut2}
+| | ... | ${remote_host_ip4_prefix} | gateway=${dut2_if1_ip4}
+| | ... | interface=${dut1_to_dut2}
| | Run Keyword Unless | '${remote_host1_ip4}' == '${NONE}'
| | ... | Vpp Route Add | ${dut2_node} | ${remote_host1_ip4}
-| | ... | ${remote_host_ip4_prefix} | ${dut1_if2_ip4} | ${dut2_to_dut1}
+| | ... | ${remote_host_ip4_prefix} | gateway=${dut1_if2_ip4}
+| | ... | interface=${dut2_to_dut1}
| | Run Keyword Unless | '${remote_host2_ip4}' == '${NONE}'
| | ... | Vpp Route Add | ${dut2_node} | ${remote_host2_ip4}
-| | ... | ${remote_host_ip4_prefix} | ${tg_if2_ip4} | ${dut2_to_tg}
+| | ... | ${remote_host_ip4_prefix} | gateway=${tg_if2_ip4}
+| | ... | interface=${dut2_to_tg}
diff --git a/resources/libraries/robot/ip/ip6.robot b/resources/libraries/robot/ip/ip6.robot
index b547e7d147..73d486ed8f 100644
--- a/resources/libraries/robot/ip/ip6.robot
+++ b/resources/libraries/robot/ip/ip6.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -201,13 +201,13 @@
| | :FOR | ${link} | IN | @{tg_dut1_links}
| | | ${net}= | Get Link Address | ${link} | ${nodes_addr}
| | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr}
-| | | Vpp Route Add | ${dut2} | ${net} | ${prefix} | ${dut1_if_addr}
-| | | ... | ${dut2_if}
+| | | Vpp Route Add | ${dut2} | ${net} | ${prefix} | gateway=${dut1_if_addr}
+| | | ... | interface=${dut2_if}
| | :FOR | ${link} | IN | @{tg_dut2_links}
| | | ${net}= | Get Link Address | ${link} | ${nodes_addr}
| | | ${prefix}= | Get Link Prefix | ${link} | ${nodes_addr}
-| | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | ${dut2_if_addr}
-| | | ... | ${dut1_if}
+| | | Vpp Route Add | ${dut1} | ${net} | ${prefix} | gateway=${dut2_if_addr}
+| | | ... | interface=${dut1_if}
| Configure IPv6 forwarding in circular topology
| | [Documentation]
@@ -321,10 +321,12 @@
| | ...
| | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}'
| | ... | Vpp Route Add | ${dut_node} | ${remote_host1_ip6}
-| | ... | ${remote_host_ip6_prefix} | ${tg_if1_ip6} | ${dut_to_tg_if1}
+| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if1_ip6}
+| | ... | interface=${dut_to_tg_if1}
| | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}'
| | ... | Vpp Route Add | ${dut_node} | ${remote_host2_ip6}
-| | ... | ${remote_host_ip6_prefix} | ${tg_if2_ip6} | ${dut_to_tg_if2}
+| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if2_ip6}
+| | ... | interface=${dut_to_tg_if2}
| Configure IPv6 forwarding in 3-node circular topology
| | [Documentation]
@@ -387,19 +389,23 @@
| | ... | ${dut_tg_ip6_prefix}
| | ...
| | Vpp Route Add | ${dut1_node} | ${tg_if2_ip6} | ${dut_tg_ip6_prefix}
-| | ... | ${dut2_if1_ip6} | ${dut1_to_dut2}
+| | ... | gateway=${dut2_if1_ip6} | interface=${dut1_to_dut2}
| | Vpp Route Add | ${dut2_node} | ${tg_if1_ip6} | ${dut_tg_ip6_prefix}
-| | ... | ${dut1_if2_ip6} | ${dut2_to_dut1}
+| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_to_dut1}
| | ...
| | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}'
| | ... | Vpp Route Add | ${dut1_node} | ${remote_host1_ip6}
-| | ... | ${remote_host_ip6_prefix} | ${tg_if1_ip6} | ${dut1_to_tg}
+| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if1_ip6}
+| | ... | interface=${dut1_to_tg}
| | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}'
| | ... | Vpp Route Add | ${dut1_node} | ${remote_host2_ip6}
-| | ... | ${remote_host_ip6_prefix} | ${dut2_if1_ip6} | ${dut1_to_dut2}
+| | ... | ${remote_host_ip6_prefix} | gateway=${dut2_if1_ip6}
+| | ... | interface=${dut1_to_dut2}
| | Run Keyword Unless | '${remote_host1_ip6}' == '${NONE}'
| | ... | Vpp Route Add | ${dut2_node} | ${remote_host1_ip6}
-| | ... | ${remote_host_ip6_prefix} | ${dut1_if2_ip6} | ${dut2_to_dut1}
+| | ... | ${remote_host_ip6_prefix} | gateway=${dut1_if2_ip6}
+| | ... | interface=${dut2_to_dut1}
| | Run Keyword Unless | '${remote_host2_ip6}' == '${NONE}'
| | ... | Vpp Route Add | ${dut2_node} | ${remote_host2_ip6}
-| | ... | ${remote_host_ip6_prefix} | ${tg_if2_ip6} | ${dut2_to_tg}
+| | ... | ${remote_host_ip6_prefix} | gateway=${tg_if2_ip6}
+| | ... | interface=${dut2_to_tg}