aboutsummaryrefslogtreecommitdiffstats
path: root/tests/honeycomb/func
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2019-05-30 16:13:25 +0200
committerJan Gelety <jgelety@cisco.com>2019-06-18 21:07:12 +0200
commit0e28406b43bf4ce145f1530f15dbb00957edf945 (patch)
treeb9f76fe6f1b92165962a82cb4bf850f0cf4c491d /tests/honeycomb/func
parent92fbe3b8d880f9a3dd63e1309d76772b1685a037 (diff)
CSIT-1459: Migrate IP libraries from VAT to PAPI
Change-Id: Id84cf9c3afd53260b5bbf658a6a3870aa0c91333 Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'tests/honeycomb/func')
-rw-r--r--tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot18
-rw-r--r--tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot6
-rw-r--r--tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot22
3 files changed, 21 insertions, 25 deletions
diff --git a/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot
index 10b59ca002..50055f7d96 100644
--- a/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-dhcp-apihc-apivat-func.robot
@@ -19,10 +19,8 @@
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Resource | resources/libraries/robot/honeycomb/dhcp.robot
| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.IPv4Setup
-| Library | resources.libraries.python.IPv6Setup
+| Library | resources.libraries.python.IPUtil
| Library | resources.libraries.python.IPv6Util
-| Library | resources.libraries.python.Routing
| Variables | resources/test_data/honeycomb/dhcp_relay.py
| ...
| ...
@@ -108,12 +106,11 @@
| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length}
| | Honeycomb sets interface IPv4 address with prefix | ${dut_node}
| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length}
-| | Add ARP on DUT | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server1_ip}
+| | VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server1_ip}
| | ... | ${tg_to_dut_if2_mac}
-| | Add ARP on DUT | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server2_ip}
+| | VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server2_ip}
| | ... | ${tg_to_dut_if2_mac}
-| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | gateway=${NONE}
-| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE}
+| | And VPP Route Add | ${dut_node} | 255.255.255.255 | 32 | local=${True}
| DHCP relay test setup IPv6
| | Configure path in 2-node circular topology
@@ -125,7 +122,6 @@
| | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip6} | ${prefix_length_v6}
| | Honeycomb sets interface IPv6 address | ${dut_node}
| | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip6} | ${prefix_length_v6}
-| | And Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2} | ${dhcp_server_ip6}
-| | ... | ${tg_to_dut_if2_mac}
-| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | gateway=${NONE}
-| | ... | interface=local | use_sw_index=${FALSE} | resolve_attempts=${NONE}
+| | And VPP Add IP Neighbor | ${dut_node} | ${dut_to_tg_if2}
+| | ... | ${dhcp_server_ip6} | ${tg_to_dut_if2_mac}
+| | And VPP Route Add | ${dut_node} | ff02::1:2 | 128 | local=${True}
diff --git a/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
index 28137fd6f4..144f83482e 100644
--- a/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
@@ -123,7 +123,8 @@
| | Then IPv6 address from Honeycomb should contain
| | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix}
| | And IPv6 address from VAT should contain
-| | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix}
+| | ... | ${node} | ${interface} | ${ipv6_address}
+| | ... | ${ipv6_prefix} | ${ipv6_mask}
| TC07: Honeycomb modifies IPv6 neighbor table
| | [Documentation] | Check if Honeycomb API can add and remove ARP entries.
@@ -193,7 +194,8 @@
| | And IPv6 address from Honeycomb should contain
| | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix}
| | And IPv6 address from VAT should contain
-| | ... | ${dut_node} | ${interface2} | ${ipv6_address} | ${ipv6_prefix}
+| | ... | ${dut_node} | ${interface2} | ${ipv6_address}
+| | ... | ${ipv6_prefix} | ${ipv6_mask}
| | And Honeycomb configures interface state
| | ... | ${dut_node} | ${dut_to_tg_if1} | up
| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1}
diff --git a/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
index 3e7e8aecbe..ca717ae42f 100644
--- a/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
@@ -38,10 +38,8 @@
| Resource | resources/libraries/robot/shared/traffic.robot
| Library | resources.libraries.python.honeycomb.HcAPIKwACL.ACLKeywords
| Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.IPv4Setup
-| Library | resources.libraries.python.IPv4Util
+| Library | resources.libraries.python.IPUtil
| Library | resources.libraries.python.IPv6Util
-| Library | resources.libraries.python.Routing
| ...
| Test Setup | Clear Packet Trace on All DUTs | ${nodes}
| ...
@@ -450,9 +448,9 @@
| | And Honeycomb adds interface IPv6 neighbor
| | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac}
| | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length}
-| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
| | And VPP Route Add | ${node} | ${classify_dst_net} | ${prefix_length}
-| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
| | When Honeycomb Creates ACL Chain Through ACL plugin
| | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings}
| | And Honeycomb Assigns plugin-acl Chain To Interface
@@ -627,9 +625,9 @@
| | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac}
| | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2}
| | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length}
-| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
| | And VPP Route Add | ${node} | ${classify_dst_net} | ${prefix_length}
-| | ... | gateway=${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
| | When Honeycomb Creates ACL Chain Through ACL plugin
| | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings}
| | And Honeycomb Assigns plugin-acl Chain To Interface
@@ -674,14 +672,14 @@
| | ...
| | Given Setup Interface IPs And Routes For IPv4 plugin-acl Test
| | ... | reflex | ${acl_name_reflex}
-| | And Add ARP on DUT
+| | And VPP Add IP Neighbor
| | ... | ${node} | ${dut_to_tg_if1} | ${gateway2} | ${tg_to_dut_if1_mac}
| | And VPP Route Add
| | ... | ${node} | ${src_net} | ${prefix_length} | gateway=${gateway2}
-| | ... | interface=${dut_to_tg_if1} | use_sw_index=False
+| | ... | interface=${dut_to_tg_if1}
| | And VPP Route Add
| | ... | ${node} | ${classify_src_net} | ${prefix_length}
-| | ... | gateway=${gateway2} | interface=${dut_to_tg_if1} | use_sw_index=False
+| | ... | gateway=${gateway2} | interface=${dut_to_tg_if1}
| | When Honeycomb Creates ACL Chain Through ACL plugin
| | ... | ${dut_node} | ${acl_name_reflex} | ${acl_settings}
| | And Honeycomb Assigns plugin-acl Chain To Interface
@@ -730,10 +728,10 @@
| | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac}
| | VPP Route Add
| | ... | ${node} | ${dst_net} | ${prefix_length} | gateway=${gateway}
-| | ... | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | interface=${dut_to_tg_if2}
| | VPP Route Add
| | ... | ${node} | ${classify_dst_net} | ${prefix_length} | gateway=${gateway}
-| | ... | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | interface=${dut_to_tg_if2}
| Setup interfaces and bridge domain for plugin-acl test
| | [Documentation] | Import test variables, set interfaces up and bridge them.