From 430afafb4cadf503ccee99c09f6de7402f5404c7 Mon Sep 17 00:00:00 2001 From: Tibor Frank Date: Thu, 1 Jun 2017 07:00:50 +0200 Subject: CSIT-662: KWI - KW renaming - plus: CSIT-656: Script to rename robot keywords. Change-Id: Ia69917e406a1b346b80e5ea742f6200c1c9e9d21 Signed-off-by: Tibor Frank --- .../honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot | 12 +- .../mgmt-cfg-dhcp-apihc-apivat-func.robot | 22 ++-- .../func/honeycomb/mgmt-cfg-int-apihcnc-func.robot | 8 +- .../mgmt-cfg-int-subint-apihc-apivat-func.robot | 16 +-- .../mgmt-cfg-intip4-intip6-apihc-apivat-func.robot | 72 +++++------ .../mgmt-cfg-l2fib-apihc-apivat-func.robot | 4 +- .../mgmt-cfg-lisp-apihc-apivat-func.robot | 96 +++++++-------- .../mgmt-cfg-pluginacl-apihc-apivat-func.robot | 136 ++++++++++----------- .../honeycomb/mgmt-cfg-policer-apihc-func.robot | 20 +-- .../honeycomb/mgmt-cfg-proxyarp-apihc-func.robot | 10 +- .../honeycomb/mgmt-cfg-proxynd6-apihc-func.robot | 20 +-- .../mgmt-cfg-routing-apihc-apivat-func.robot | 52 ++++---- .../func/honeycomb/mgmt-cfg-slaac-apihc-func.robot | 18 +-- .../mgmt-cfg-spanrx-apihc-apivat-func.robot | 38 +++--- .../mgmt-cfg-vxlan-apihc-apivat-func.robot | 2 +- tests/func/honeycomb/mgmt-notif-apihcnc-func.robot | 10 +- .../honeycomb/mgmt-statepersist-apihc-func.robot | 20 +-- 17 files changed, 278 insertions(+), 278 deletions(-) (limited to 'tests/func/honeycomb') diff --git a/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot index 7792fb3fdd..9d94d3d024 100644 --- a/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-acl-apihc-apivat-func.robot @@ -119,21 +119,21 @@ | | ... | ${node} | ${table_index} | ${session_index} | ${vat_acl_session} | | When Honeycomb enables ACL on interface | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | Then Interface ACL settings from Honeycomb should be +| | Then Interface ACL configuration from Honeycomb should be | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | And Interface ACL settings from VAT should be +| | And Interface ACL configuration from VAT should be | | ... | ${node} | ${interface} | ${table_index} | TC08: Honeycomb disables ACL on interface | | [Documentation] | Check if Honeycomb API can disable ACL on an interface. -| | Given Interface ACL settings from Honeycomb should be +| | Given Interface ACL configuration from Honeycomb should be | | ... | ${node} | ${interface} | ${hc_acl_table['name']} -| | And Interface ACL settings from VAT should be +| | And Interface ACL configuration from VAT should be | | ... | ${node} | ${interface} | ${table_index} | | When Honeycomb disables ACL on interface | ${node} | ${interface} -| | Then Interface ACL settings from Honeycomb should be empty +| | Then Interface ACL configuration from Honeycomb should be empty | | ... | ${node} | ${interface} -| | And Interface ACL settings from VAT should be empty +| | And Interface ACL configuration from VAT should be empty | | ... | ${node} | ${interface} | TC09: Honeycomb can remove one out of multiple ACL tables diff --git a/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot index ba39c02402..5b6656958d 100644 --- a/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-dhcp-apihc-apivat-func.robot @@ -45,7 +45,7 @@ | | Then DHCP relay configuration from Honeycomb should contain | | ... | ${node} | ${relay1_oper} | | When DHCP relay test setup -| | Then Send DHCP Messages | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} +| | Then Send DHCP messages and check answer | ${tg_node} | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${dhcp_server1_ip} | ${tg_to_dut_if2_mac} | ${client_ip} | | ... | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_ip} @@ -88,13 +88,13 @@ *** Keywords *** | DHCP relay test setup -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | 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} | ${tg_to_dut_if2_mac} @@ -104,14 +104,14 @@ | | ... | ${FALSE} | ${NONE} | DHCP relay test setup IPv6 -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up | | And Vpp All Ra Suppress Link Layer | ${nodes} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip6} | ${prefix_length_v6} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | 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} diff --git a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot index 4fe9dde40c..c6ae380f9b 100644 --- a/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-int-apihcnc-func.robot @@ -34,7 +34,7 @@ | TC01: Honeycomb can create and delete interfaces | | [Documentation] | Repeatedly create and delete an interface through Netconf\ | | ... | and check the reply for any errors. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | And Honeycomb creates first L2 bridge domain | | ... | ${node} | bd_netconf | ${bd_settings} | | :FOR | ${index} | IN RANGE | 20 @@ -44,7 +44,7 @@ | TC02: Transaction revert test case 1 | | [Documentation] | Configure two conflicting VxLAN tunnels, then verify\ | | ... | that neither tunnel exists. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | ${if_data}= | And InterfaceAPI.Get all interfaces oper data | ${node} | | When Error trigger is sent | ${trigger_revert1} | | ${if_data_new}= | And InterfaceAPI.Get all interfaces oper data | ${node} @@ -53,7 +53,7 @@ | TC03: Transaction revert test case 2 | | [Documentation] | Configure two conflicting TAP interfaces, then verify\ | | ... | that neither interface exists. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | ${if_data}= | And InterfaceAPI.Get all interfaces oper data | ${node} | | When Error trigger is sent | ${trigger_revert1} | | ${if_data_new}= | And InterfaceAPI.Get all interfaces oper data | ${node} @@ -61,7 +61,7 @@ | TC04: Vlan subinterface creation | | [Documentation] | Configure a Vlan sub-interface under a physical interface. -| | Given Netconf session is established | ${node} +| | Given Netconf session should be established | ${node} | | When Error Trigger Is Sent | | ... | ${trigger_vlan} | interface=${interface} | | Then Replies should not contain RPC errors diff --git a/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot index c7e0737a6b..803cfa0932 100644 --- a/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot @@ -36,7 +36,7 @@ | TC01: Honeycomb creates sub-interface | | [Documentation] | Check if Honeycomb creates a sub-interface. | | ... -| | Given Honeycomb sets interface state | ${node} | ${super_if} | down +| | Given Honeycomb configures interface state | ${node} | ${super_if} | down | | And sub-interface Operational Data From Honeycomb Should Be empty | | ... | ${node} | ${super_if} | ${sub_if_id} | | And interface Operational Data From VAT Should Be empty @@ -62,7 +62,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | down | down | | Sub-interface state from VAT should be | | ... | ${node} | ${sub_if_name} | down | down -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${super_if} | up | | Then interface state from Honeycomb should be | | ... | ${node} | ${super_if} | up @@ -112,7 +112,7 @@ | | ... | ${node} | ${super_if} | up | | And interface state from VAT should be | | ... | ${node} | ${super_if} | up -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${super_if} | down | | Then interface state from Honeycomb should be | | ... | ${node} | ${super_if} | down @@ -387,7 +387,7 @@ | TC18: Honeycomb modifies sub-interface exact tag match | | [Documentation] | Check if Honeycomb can modify a sub-interface with exact\ | | ... | tag match. -| | Given Honeycomb sets interface state | ${node} | ${super_if2} | down +| | Given Honeycomb configures interface state | ${node} | ${super_if2} | down | | And sub-interface Operational Data From Honeycomb Should Be empty | | ... | ${node} | ${super_if2} | ${sub_if_id} | | And interface Operational Data From VAT Should Be empty @@ -466,7 +466,7 @@ | | ... | ${node} | ${super_if} | ${sub_if_id} | | And sub-interface ipv4 address from VAT should be empty | | ... | ${node} | ${sub_if_name} -| | And Honeycomb sets interface ipv4 address | ${node} +| | And Honeycomb sets interface IPv4 address | ${node} | | ... | local0 | ${ipv4['address']} | ${ipv4['prefix-length']} | | When Honeycomb adds unnumbered configuration to interface | | ... | ${node} | ${super_if}.${sub_if_id} | local0 @@ -485,7 +485,7 @@ | TC23: Honeycomb removes sub-interface unnumbered configuration | | [Documentation] | Check if Honeycomb can remove unnumbered configuration\ | | ... | from a sub-interface. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | local0 | | Given IPv4 address from Honeycomb should be | | ... | ${node} | local0 | ${ipv4['address']} | ${ipv4['prefix-length']} @@ -552,7 +552,7 @@ | | ... | | [Arguments] | ${node} | ${super_interface} | ${identifier} | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${super_interface} | up | | Honeycomb sets the sub-interface up | | ... | ${node} | ${super_interface} | ${identifier} @@ -572,7 +572,7 @@ | | ... | | [Arguments] | ${node} | ${super_interface} | ${identifier} | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${super_interface} | down | | Honeycomb sets the sub-interface down | | ... | ${node} | ${super_interface} | ${identifier} diff --git a/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot index edc1713824..dd619efbe7 100644 --- a/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot @@ -34,11 +34,11 @@ | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down -| | When Honeycomb sets interface state | ${node} | ${interface} | up +| | When Honeycomb configures interface state | ${node} | ${interface} | up | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | up | | And Interface state from VAT should be | ${node} | ${interface} | up -| | When Honeycomb sets interface state | ${node} | ${interface} | down +| | When Honeycomb configures interface state | ${node} | ${interface} | down | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down @@ -48,7 +48,7 @@ | | ... | with address and netmask provided. | | Given IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} -| | When Honeycomb sets interface ipv4 address | ${node} | ${interface} +| | When Honeycomb sets interface IPv4 address | ${node} | ${interface} | | ... | ${ipv4_address} | ${ipv4_mask} | | Then IPv4 address from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix} @@ -64,18 +64,18 @@ | | And IPv4 address from VAT should be | | ... | ${node} | ${interface} | ${ipv4_address} | | ... | ${ipv4_prefix} | ${ipv4_mask} -| | When Honeycomb removes interface ipv4 addresses | ${node} | ${interface} +| | When Honeycomb removes interface IPv4 addresses | ${node} | ${interface} | | Then IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} | TC04: Honeycomb modifies interface IPv4 address with prefix | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv4\ | | ... | with address and prefix provided. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | ${interface} | | Given IPv4 address from Honeycomb should be empty | ${node} | ${interface} | | And ipv4 address from VAT should be empty | ${node} | ${interface} -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} | | Then IPv4 address from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_address2} | ${ipv4_prefix} @@ -85,24 +85,24 @@ | TC05: Honeycomb modifies IPv4 neighbor table | | [Documentation] | Check if Honeycomb API can add and remove ARP entries. -| | [Teardown] | Honeycomb clears all interface ipv4 neighbors +| | [Teardown] | Honeycomb clears all interface IPv4 neighbors | | ... | ${node} | ${interface} | | Given IPv4 neighbor from Honeycomb should be empty | | ... | ${node} | ${interface} -| | When Honeycomb adds interface ipv4 neighbor +| | When Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac} | | Then IPv4 neighbor from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv4_neighbor} | ${neighbor_mac} | TC06: Honeycomb modifies interface configuration - IPv6 | | [Documentation] | Check if Honeycomb API can configure interfaces for ipv6. -| | [Teardown] | Honeycomb removes interface ipv6 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv6 addresses | ${node} | | ... | ${interface} | | Given IPv6 address from Honeycomb should be empty | | ... | ${node} | ${interface} | | And IPv6 address from VAT should be empty | | ... | ${node} | ${interface} -| | When Honeycomb sets interface ipv6 address +| | When Honeycomb sets interface IPv6 address | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix} | | Then IPv6 address from Honeycomb should contain | | ... | ${node} | ${interface} | ${ipv6_address} | ${ipv6_prefix} @@ -111,11 +111,11 @@ | TC07: Honeycomb modifies IPv6 neighbor table | | [Documentation] | Check if Honeycomb API can add and remove ARP entries. -| | [Teardown] | Honeycomb clears all interface ipv6 neighbors +| | [Teardown] | Honeycomb clears all interface IPv6 neighbors | | ... | ${node} | ${interface} | | Given IPv6 neighbor from Honeycomb should be empty | | ... | ${node} | ${interface} -| | When Honeycomb adds interface ipv6 neighbor +| | When Honeycomb adds interface IPv6 neighbor | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac} | | Then IPv6 neighbor from Honeycomb should be | | ... | ${node} | ${interface} | ${ipv6_neighbor} | ${neighbor_mac} @@ -133,13 +133,13 @@ | TC09: Honeycomb modifies interface configuration - vrf | | [Documentation] | Check if Honeycomb API can configure interface\ | | ... | vrf ID. -| | [Teardown] | Honeycomb sets interface vrf ID +| | [Teardown] | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${0} | ipv4 -| | When Honeycomb sets interface vrf ID +| | When Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${1} | ipv4 -| | Then Interface vrf ID from Honeycomb should be +| | Then Interface VRF ID from Honeycomb should be | | ... | ${node} | ${interface} | ${1} | ipv4 -| | And Interface vrf ID from VAT should be +| | And Interface VRF ID from VAT should be | | ... | ${node} | ${interface} | ${1} | TC10: Honeycomb can configure multiple IP addresses on one interface @@ -152,15 +152,15 @@ | | ... | of source and destination IP addresses. Receive an ICMP reply\ | | ... | for every packet sent. | | ... -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address} | ${ipv4_prefix} -| | And Honeycomb adds interface ipv4 address +| | And Honeycomb adds interface IPv4 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address2} | ${ipv4_prefix} -| | And Honeycomb sets interface ipv6 address +| | And Honeycomb sets interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} -| | And Honeycomb adds interface ipv6 address +| | And Honeycomb adds interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address2} | ${ipv6_prefix} | | Then IPv4 address from Honeycomb should be | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address} | ${ipv4_prefix} @@ -171,16 +171,16 @@ | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} | | And IPv6 address from VAT should contain | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv4_neighbor} | ${neighbor_mac} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv4_neighbor2} | ${neighbor_mac2} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv6_neighbor} | ${neighbor_mac} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${ipv6_neighbor2} | ${neighbor_mac2} -| | And Vpp nodes ra suppress link layer | ${nodes} +| | And Suppress ICMPv6 router advertisement message | ${nodes} | | Then Ping and Verify IP address | ${nodes['TG']} | | ... | ${ipv4_neighbor} | ${ipv4_address} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} @@ -201,15 +201,15 @@ | TC11: Honeycomb fails to configure two IPv4 addresses from the same subnet | | [Documentation] | Check if Honeycomb can configure two IPv4 addresses in\ | | ... | the same subnet onto a single interface. It should not be possible. -| | [Teardown] | Honeycomb removes interface ipv4 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node} | | ... | ${interface} | | [Tags] | EXPECTED_FAILING # VPP API does not configure the second address, but returns success. VPP-649 -| | When Honeycomb sets interface ipv4 address with prefix +| | When Honeycomb sets interface IPv4 address with prefix | | ... | ${node} | ${interface} | 192.168.0.1 | ${9} -| | Then Honeycomb fails to add interface ipv4 address +| | Then Honeycomb fails to add interface IPv4 address | | ... | ${node} | ${interface} | 192.168.0.2 | ${9} -| | And Honeycomb fails to add interface ipv4 address +| | And Honeycomb fails to add interface IPv4 address | | ... | ${node} | ${interface} | 192.232.0.2 | ${9} | TC12: Honeycomb fails to configure two IPv6 addresses from the same subnet @@ -217,19 +217,19 @@ | | ... | the same subnet onto a single interface. It should not be possible. | | [Tags] | EXPECTED_FAILING # VPP API does not configure the second address, but returns success. VPP-649 -| | [Teardown] | Honeycomb removes interface ipv6 addresses | ${node} +| | [Teardown] | Honeycomb removes interface IPv6 addresses | ${node} | | ... | ${interface} -| | When Honeycomb sets interface ipv6 address +| | When Honeycomb sets interface IPv6 address | | ... | ${node} | ${interface} | 10::FF10 | ${64} -| | Then Honeycomb fails to add interface ipv6 address +| | Then Honeycomb fails to add interface IPv6 address | | ... | ${node} | ${interface} | 10::FF11 | ${64} -| | And Honeycomb fails to add interface ipv6 address +| | And Honeycomb fails to add interface IPv6 address | | ... | ${node} | ${interface} | 10::FFFF | ${64} | TC13: Honeycomb can configure unnumbered interface | | [Documentation] | Check if Honeycomb can configure an unnumbered interface\ | | ... | on a physical interface, borrowing the IP address of 'local0'. -| | Given Honeycomb sets interface ipv4 address | ${node} +| | Given Honeycomb sets interface IPv4 address | ${node} | | ... | local0 | ${ipv4_address} | ${ipv4_prefix} | | When Honeycomb adds unnumbered configuration to interface | | ... | ${node} | ${interface} | local0 diff --git a/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot index 76683a70db..48527b98df 100644 --- a/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot @@ -46,7 +46,7 @@ | | ... | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down -| | When Honeycomb sets interface state +| | When Honeycomb configures interface state | | ... | ${node} | ${interface} | up | | Then Interface state from Honeycomb should be | | ... | ${node} | ${interface} | up @@ -230,5 +230,5 @@ | Set test interface down | | [Documentation] | Set the interface used in tests down. | | ... -| | Honeycomb sets interface state +| | Honeycomb configures interface state | | ... | ${node} | ${interface} | down diff --git a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot index 174a145a52..9f4a328258 100644 --- a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot @@ -33,16 +33,16 @@ | Force Tags | HC_FUNC *** Test Cases *** -| TC01: Honeycomb enables Lisp feature +| TC01: Honeycomb enables LISP feature | | [Documentation] | Check if Honeycomb can enable the Lisp feature. | | Given Lisp Should Not Be Configured | ${node} -| | When Honeycomb Enables Lisp | ${node} -| | Then Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | When Honeycomb enables LISP | ${node} +| | Then LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | TC02: Honeycomb adds locator set and locator | | [Documentation] | Check if Honeycomb can configure a locator set. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} | | When Honeycomb adds locator set | ${node} | ${interface} | ${locator_set} | | Then Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} @@ -50,39 +50,39 @@ | TC03: Honeycomb configures Lisp - remote mapping - Bridge Domain | | [Documentation] | Check if Honeycomb can configure a remote Lisp mapping\ | | ... | with a bridge domain. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd_name} | ${bd_settings} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_remote_bd} -| | Then Lisp mapping From Honeycomb Should Be +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_remote_bd} +| | Then LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_bd_subtable} -| | And Lisp mapping From VAT Should Be +| | And LISP mapping from VAT should be | | ... | ${node} | ${vat_remote_bd} | TC04: Honeycomb can remove Lisp mapping | | [Documentation] | Check if Honeycomb can remove a configured Lisp mapping. -| | Given Lisp mapping From Honeycomb Should Be +| | Given LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_bd_subtable} -| | And Lisp mapping From VAT Should Be +| | And LISP mapping from VAT should be | | ... | ${node} | ${vat_remote_bd} | | When Honeycomb removes all lisp mappings | ${node} -| | Then Lisp mappings from Honeycomb should not exist +| | Then LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} | TC05: Honeycomb configures Lisp - remote mapping - VRF | | [Documentation] | Check if Honeycomb can configure a remote Lisp mapping\ | | ... | with VRF. | | [Teardown] | Honeycomb removes all lisp mappings | ${node} -| | Given Lisp mappings from Honeycomb should not exist +| | Given LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_remote_vrf} -| | Then Lisp mapping From Honeycomb Should Be +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_remote_vrf} +| | Then LISP mapping from Honeycomb should be | | ... | ${node} | ${remote_vrf_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_remote_vrf} +| | And LISP mapping from VAT should be | ${node} | ${vat_remote_vrf} | TC06: Honeycomb configures Lisp - local mapping - Bridge Domain | | [Documentation] | Check if Honeycomb can configure a local Lisp mapping\ @@ -90,15 +90,15 @@ | | [Teardown] | Honeycomb removes all lisp mappings | ${node} | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd2_name} | ${bd_settings} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_local_bd} -| | Then Lisp mapping From Honeycomb Should Be | ${node} | ${local_bd_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_local_bd} +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_local_bd} +| | Then LISP mapping from Honeycomb should be | ${node} | ${local_bd_subtable} +| | And LISP mapping from VAT should be | ${node} | ${vat_local_bd} | TC07: Honeycomb configures Lisp - local mapping - VRF | | [Documentation] | Check if Honeycomb can configure a local Lisp mapping\ @@ -106,13 +106,13 @@ | | [Teardown] | Honeycomb removes all lisp mappings | ${node} | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_local_vrf} -| | Then Lisp mapping From Honeycomb Should Be | ${node} | ${local_vrf_subtable} -| | And Lisp mapping From VAT Should Be | ${node} | ${vat_local_vrf} +| | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_local_vrf} +| | Then LISP mapping from Honeycomb should be | ${node} | ${local_vrf_subtable} +| | And LISP mapping from VAT should be | ${node} | ${vat_local_vrf} | TC08: Honeycomb configures Lisp mapping with adjacency | | [Documentation] | Check if Honeycomb can configure local and remote Lisp\ @@ -122,28 +122,28 @@ | | ... | ${node} | ${interface} | ${locator_set} | | And Honeycomb creates first l2 bridge domain | | ... | ${node} | ${bd2_name} | ${bd_settings} -| | And Lisp mappings from Honeycomb should not exist +| | And LISP mappings from Honeycomb should not exist | | ... | ${node} -| | And Lisp mappings from VAT should not exist +| | And LISP mappings from VAT should not exist | | ... | ${node} -| | And Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_both_vrf} -| | When Honeycomb adds Lisp adjacency | ${node} | ${7} | remote_map_vrf +| | And Honeycomb adds LISP mapping | ${node} | ${lisp_settings_both_vrf} +| | When Honeycomb adds LISP adjacency | ${node} | ${7} | remote_map_vrf | | ... | adj01 | ${vrf_adjacency} | | Then Lisp mapping from Honeycomb should be | | ... | ${node} | ${adj_subtable} | TC09: Honeycomb configures Lisp Map Resolver | | [Documentation] | Check if Honeycomb can configure a Lisp Map Resolver. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Resolver | ${node} | ${ip_address} | | Then Map Resolver from Honeycomb should be | ${node} | ${ip_address} | | And Map Resolver from VAT should be | ${node} | ${ip_address} | TC10: Honeycomb configures Lisp Map Server | | [Documentation] | Check if Honeycomb can configure a Lisp Map Server. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Server | ${node} | @{ip_addresses} | | Then Map Server from Honeycomb should be | ${node} | @{ip_addresses} | | And Map Server from VAT should be | ${node} | @{ip_addresses} @@ -151,24 +151,24 @@ | TC11: Honeycomb configures Lisp PETR configuration | | [Documentation] | Check if Honeycomb can configure Lisp | | ... | PETR configuration. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} -| | When Honeycomb enables Lisp PETR feature | ${node} | ${ip_address} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} +| | When Honeycomb enables LISP PETR feature | ${node} | ${ip_address} | | Then PETR configuration from Honeycomb should be | ${node} | ${ip_address} | | And PETR configuration from VAT should be | ${node} | enabled | TC12: Honeycomb configures Lisp RLOC Probing | | [Documentation] | Check if Honeycomb can configure Lisp RLOC Probing. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} -| | When Honeycomb enables Lisp RLOC feature | ${node} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} +| | When Honeycomb enables LISP RLOC feature | ${node} | | Then RLOC Probing from Honeycomb should be | ${node} | ${True} | | And RLOC Probing from VAT should be | ${node} | enabled | TC13: Honeycomb configures Lisp Map Register | | [Documentation] | Check if Honeycomb can configure a Lisp Map Register. -| | Given Lisp state From Honeycomb Should Be | ${node} | ${state} -| | And Lisp state From VAT Should Be | ${node} | ${state} +| | Given LISP state from Honeycomb should be | ${node} | ${state} +| | And LISP state from VAT should be | ${node} | ${state} | | When Honeycomb adds Lisp Map Register | ${node} | ${True} | | Then Map Register from Honeycomb should be | ${node} | ${True} | | And Map Register from VAT should be | ${node} | enabled @@ -177,7 +177,7 @@ | | [Documentation] | Check if Honeycomb can configure the Lisp PITR feature. | | Given Locator Set From Honeycomb Should Be | | ... | ${node} | ${interface} | ${locator_set} -| | When Honeycomb enables Lisp PITR feature | ${node} | ${locator_set} +| | When Honeycomb enables LISP PITR feature | ${node} | ${locator_set} | | Then PITR config from Honeycomb should be | ${node} | ${locator_set} | | And PITR config from VAT should be | ${node} | ${locator_set} @@ -185,14 +185,14 @@ | | [Documentation] | Check if Honeycomb can disable all Lisp features. | | Given Map resolver from Honeycomb should be | ${node} | ${ip_address} | | And PITR config from Honeycomb should be | ${node} | ${locator_set} -| | When Honeycomb disables all Lisp features | ${node} +| | When Honeycomb disables all LISP features | ${node} | | Then Lisp Should Not Be Configured | ${node} | TC16: Honeycomb configures Lisp Map Request Mode | | [Documentation] | Check if Honeycomb can configure Lisp Map Request mode. | | ... | Note: Map Request Mode cannot be removed once configured. -| | [Teardown] | Honeycomb disables Lisp | ${node} -| | Given Honeycomb Enables Lisp | ${node} +| | [Teardown] | Honeycomb disables LISP | ${node} +| | Given Honeycomb enables LISP | ${node} | | When Honeycomb sets Lisp Map Request Mode | ${node} | ${True} | | Then Map Request Mode from Honeycomb should be | | ... | ${node} | source-destination diff --git a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot index abdd94ceb3..7f96472474 100644 --- a/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-pluginacl-apihc-apivat-func.robot @@ -66,17 +66,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_macip} | | ... | ingress | macip=${True} -| | When Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | When Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${classify_src2} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} @@ -98,18 +98,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -132,18 +132,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip6} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -166,19 +166,19 @@ | | ... | ${dut_node} | ${acl_name_l4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${classify_src} | ${classify_dst} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -201,17 +201,17 @@ | | ... | ${dut_node} | ${acl_name_mixed} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_mixed} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -233,18 +233,18 @@ | | ... | ${dut_node} | ${acl_name_icmp} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmp} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -266,18 +266,18 @@ | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmpv6} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -308,17 +308,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | block_all | ingress | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_dst} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if2_mac} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if2_mac} | | ... | TCP | ${dst_port} | ${src_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -344,18 +344,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -372,18 +372,18 @@ | | ... | to the other, using different IPv6 IPs. Receive all packets except\ | | ... | those with IPs in the filtered ranges and UDP protocol payload. | | [Teardown] | Routed ACL test teardown - ipv6 -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | L3_IP6 | ${acl_name_l3_ip6} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2} -| | And Honeycomb adds interface ipv6 neighbor +| | 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} | interface=${dut_to_tg_if2} | use_sw_index=False @@ -393,18 +393,18 @@ | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l3_ip6} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | UDP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -427,19 +427,19 @@ | | ... | ${dut_node} | ${acl_name_l4} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_l4} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${classify_src} | ${classify_dst} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -462,17 +462,17 @@ | | ... | ${dut_node} | ${acl_name_mixed} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_mixed} | ingress -| | Then Send TCP Or UDP Packet | ${tg_node} | ${src_ip} | ${dst_ip} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | Then Send TCP Or UDP Packet | ${tg_node} +| | Then Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src_ip} | ${classify_dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dst_mac} @@ -495,18 +495,18 @@ | | ... | ${dut_node} | ${acl_name_icmp} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmp} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -523,17 +523,17 @@ | | ... | to the other, using different codes and types. Receive all packets\ | | ... | except those with the filtered type and code. | | [Teardown] | Routed ACL test teardown - ipv6 -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | icmpv6 | ${acl_name_icmpv6} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv6 address | ${dut_node} +| | And Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv6 neighbor +| | And Honeycomb adds interface IPv6 neighbor | | ... | ${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} @@ -544,18 +544,18 @@ | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings} | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_name_icmpv6} | ingress -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${icmp_type} | ${icmp_code} -| | Then Send ICMP packet with type and code | ${tg_node} +| | Then Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | ${classify_type} | ${icmp_code} | | And Run Keyword And Expect Error | ICMP echo Rx timeout -| | ... | Send ICMP packet with type and code | ${tg_node} +| | ... | Send ICMP packet with type and code and verify received packet | ${tg_node} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -595,17 +595,17 @@ | | And Honeycomb Assigns plugin-acl Chain To Interface | | ... | ${dut_node} | ${dut_to_tg_if1} | block_all | ingress | | And Run Keyword And Expect Error | TCP/UDP Rx timeout -| | ... | Send TCP Or UDP Packet | ${tg_node} +| | ... | Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} | | ... | TCP | ${src_port} | ${dst_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_dst} | ${classify_src} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if2_mac} | | ... | ${tg_to_dut_if1} | ${dut_to_tg_if2_mac} | | ... | TCP | ${dst_port} | ${src_port} -| | And Send TCP Or UDP Packet | ${tg_node} +| | And Send TCP or UDP packet and verify received packet | ${tg_node} | | ... | ${classify_src} | ${classify_dst} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -616,17 +616,17 @@ | | [Documentation] | Import test variables, set interfaces up, | | ... | configure IPv4 addresses, add neighbor entry and routes. | | [Arguments] | ${test_data_id} | ${acl_name} -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | ${test_data_id} | ${acl_name} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv4 neighbor +| | And Honeycomb adds interface IPv4 neighbor | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac} | | VPP Route Add | | ... | ${node} | ${dst_net} | ${prefix_length} | ${gateway} @@ -638,7 +638,7 @@ | Setup interfaces and bridge domain for plugin-acl test | | [Documentation] | Import test variables, set interfaces up and bridge them. | | [Arguments] | ${test_data_id} | ${acl_name} -| | Path For 2-node Testing Is Set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/plugin_acl.py | | ... | ${test_data_id} | ${acl_name} @@ -665,8 +665,8 @@ | | Show Packet Trace on All DUTs | ${nodes} | | Read plugin-ACL configuration from VAT | ${node} | | Clear plugin-acl Settings | ${node} | ${dut_to_tg_if1} -| | Honeycomb removes interface ipv4 addresses | ${node} | ${dut_to_tg_if1} -| | Honeycomb clears all interface ipv4 neighbors | ${node} | ${dut_to_tg_if1} +| | Honeycomb removes interface IPv4 addresses | ${node} | ${dut_to_tg_if1} +| | Honeycomb clears all interface IPv4 neighbors | ${node} | ${dut_to_tg_if1} | Routed ACL test teardown - ipv6 | | [Documentation] | Log packet trace and ACL settings, @@ -674,5 +674,5 @@ | | Show Packet Trace on All DUTs | ${nodes} | | Clear plugin-acl Settings | ${node} | ${dut_to_tg_if1} | | Read plugin-ACL configuration from VAT | ${node} -| | Honeycomb removes interface ipv6 addresses | ${node} | ${dut_to_tg_if1} -| | Honeycomb clears all interface ipv6 neighbors | ${node} | ${dut_to_tg_if1} +| | Honeycomb removes interface IPv6 addresses | ${node} | ${dut_to_tg_if1} +| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${dut_to_tg_if1} diff --git a/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot index 2884f7c628..d9b6aaaa9c 100644 --- a/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-policer-apihc-func.robot @@ -53,7 +53,7 @@ | TC03: Honeycomb can configure Policer with increased values of CIR (900kbps) | | [Documentation] | Checks if Honeycomb can configure Policer\ | | ... | with increased values of CIR. -| | [Teardown] | Policer test teardown | ${node} +| | [Teardown] | Tear down policer test | ${node} | | Given Policer Operational Data From Honeycomb Should Be empty | ${node} | | When Honeycomb configures Policer | ${node} | ${policer_data_2} | | Then Policer Operational Data From Honeycomb Should Be | ${node} @@ -62,7 +62,7 @@ | TC04: Honeycomb can configure Packets-Per-Second Based Policer | | [Documentation] | Checks if Honeycomb can configure Policer\ | | ... | based on rate-type measured in pps. -| | [Teardown] | Policer test teardown | ${node} +| | [Teardown] | Tear down policer test | ${node} | | Given Policer Operational Data From Honeycomb Should Be empty | ${node} | | When Honeycomb configures Policer | ${node} | ${policer_data_3} | | Then Policer Operational Data From Honeycomb Should Be | ${node} @@ -78,7 +78,7 @@ | | ... | ${acl_tables['hc_acl_session']['match']} | AND | | ... | Honeycomb removes ACL table | ${node} | | ... | ${acl_tables['hc_acl_table']['name']} | AND -| | ... | Policer test teardown | ${node} +| | ... | Tear down policer test | ${node} | | Given Honeycomb configures Policer | ${node} | ${policer_data} | | And ACL table from Honeycomb should not exist | | ... | ${node} | ${acl_tables['hc_acl_table']['name']} @@ -100,7 +100,7 @@ | | ... | Packet on DUT1 is marked with DSCP tag. Verifies if DUT1 sends\ | | ... | correct IPv4 TCP packet with correct DSCP on the second link to TG. | | [Teardown] | Show Packet Trace on All DUTs | ${nodes} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Honeycomb configures Policer | ${dut_node} | ${policer_data_3} | | And ACL table from Honeycomb should not exist @@ -112,17 +112,17 @@ | | ... | ${acl_tables['hc_acl_session']} | | And Honeycomb enables policer on interface | | ... | ${dut_node} | ${dut_to_tg_if1} | ${acl_tables['hc_acl_table']['name']} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} -| | And Honeycomb adds interface ipv4 neighbor +| | And Honeycomb adds interface IPv4 neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | ${tg_to_dut_if2_ip} | | ... | ${tg_to_dut_if2_mac} | | And interfaceCLI.VPP Node Interfaces Ready Wait | ${dut_node} -| | Then Honeycomb Send Packet and Verify Marking | ${tg_node} +| | Then Honeycomb Send packet and verify marking | ${tg_node} | | ... | ${tg_to_dut_if1} | | ... | ${tg_to_dut_if2} | ${tg_to_dut_if1_mac} | ${dut_to_tg_if1_mac} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if2_ip} | ${dscp_number} diff --git a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot index 23ece5ed5e..056771512f 100644 --- a/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-proxyarp-apihc-func.robot @@ -62,16 +62,16 @@ | | [Teardown] | Run Keywords | | ... | Show Packet Trace on all DUTs | ${nodes} | | ... | AND | Honeycomb removes proxyARP configuration | ${node} -| | ... | AND | Honeycomb sets interface state +| | ... | AND | Honeycomb configures interface state | | ... | ${dut_node} | ${dut_to_tg_if1} | down -| | ... | AND | Honeycomb removes interface ipv4 addresses +| | ... | AND | Honeycomb removes interface IPv4 addresses | | ... | ${node} | ${interface} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | ${dut_to_tg_name}= | Get interface name | ${dut_node} | ${dut_to_tg_if1} | | ${tg_to_dut_name}= | Get interface name | ${tg_node} | ${tg_to_dut_if1} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_ip} | ${prefix_length} | | When Honeycomb configures proxyARP | ${dut_node} | ${proxyarp_settings_ipv4} | | And Honeycomb enables proxyARP on interface | ${node} | ${dut_to_tg_name} diff --git a/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot index c934b06a84..abc03c04f4 100644 --- a/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-proxynd6-apihc-func.robot @@ -44,7 +44,7 @@ | | [Documentation] | Check if Honeycomb can configure the IPv6 ND proxy\ | | ... | feature on an interface. | | Given IPv6 ND proxy from Honeycomb should be empty | ${node} | ${interface} -| | And Honeycomb sets interface state | ${node} | ${interface} | up +| | And Honeycomb configures interface state | ${node} | ${interface} | up | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${node} | ${interface} | ${test_dst_ip} | | Then IPv6 ND proxy from Honeycomb should be @@ -64,7 +64,7 @@ | | [Teardown] | Honeycomb disables IPv6 ND proxy on interface | | ... | ${node} | ${interface} | | Given IPv6 ND proxy from Honeycomb should be empty | ${node} | ${interface} -| | And Honeycomb sets interface state | ${node} | ${interface} | up +| | And Honeycomb configures interface state | ${node} | ${interface} | up | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${node} | ${interface} | ${test_dst_ip} | ${test_dst_ip2} | | Then IPv6 ND proxy from Honeycomb should be @@ -85,23 +85,23 @@ | | ... | Show Packet Trace on All DUTs | ${nodes} | AND | | ... | Honeycomb disables IPv6 ND proxy on interface | | ... | ${dut_node} | ${dut_to_tg_if2} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_length} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_length} | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if1} | | And Vpp Ra Suppress Link Layer | ${dut_node} | ${dut_to_tg_if2} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${test_src_ip} | ${tg_to_dut_if1_mac} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${test_dst_ip} | ${tg_to_dut_if2_mac} | | When Honeycomb configures IPv6 ND proxy on interface | | ... | ${dut_node} | ${dut_to_tg_if2} | ${test_dst_ip} -| | Then Verify IPv6ND Proxy | ${tg_node} +| | Then Verify IPv6ND proxy | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if2} | | ... | ${test_src_ip} | ${test_dst_ip} | | ... | ${tg_to_dut_if1_mac} | ${tg_to_dut_if2_mac} diff --git a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot index a722adaa7b..e0544f71bb 100644 --- a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot @@ -43,7 +43,7 @@ | | ... | ${node} | table1 | ipv4 | ${table1} | ${1} | | Then Routing data from Honeycomb should contain | | ... | ${node} | table1 | ipv4 | ${table1_oper} -| | And Verify Route IPv4 | ${nodes['TG']} +| | And Verify route IPv4 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -60,9 +60,9 @@ | | ... | Receive packet on the second TG interface. | | ${table}= | Set Variable | table2 | | Given Setup interfaces and neighbors for IPv4 routing test -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop1} | ${next_hop_mac1} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop2} | ${next_hop_mac2} | | When Honeycomb configures routing table | | ... | ${node} | table2 | ipv4 | ${table2} | ${1} @@ -90,7 +90,7 @@ | | Then Routing data from Honeycomb should contain | | ... | ${node} | table3 | ipv4 | ${table3_oper} | | And Run keyword and Expect Error | ICMP echo Rx timeout -| | ... | Verify Route IPv4 | ${nodes['TG']} +| | ... | Verify route IPv4 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -109,7 +109,7 @@ | | ... | ${node} | table4 | ipv6 | ${table4} | ${1} | | Then Routing data from Honeycomb should contain | | ... | ${node} | table4 | ipv6 | ${table4_oper} -| | And Verify Route IPv6 | ${nodes['TG']} +| | And Verify route IPv6 | ${nodes['TG']} | | ... | ${src_ip} | ${next_hop} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} @@ -126,9 +126,9 @@ | | ... | Receive packet on the second TG interface. | | ${table}= | Set Variable | table5 | | Given Setup interfaces and neighbors for IPv6 routing test -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop1} | ${next_hop_mac1} -| | And Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | And Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop2} | ${next_hop_mac2} | | When Honeycomb configures routing table | | ... | ${node} | table5 | ipv6 | ${table5} | ${1} @@ -156,48 +156,48 @@ | | Then Routing data from Honeycomb should contain | | ... | ${node} | table6 | ipv6 | ${table6_oper} | | And Run keyword and Expect Error | ICMP echo Rx timeout -| | ... | Verify Route IPv6 | ${nodes['TG']} +| | ... | Verify route IPv6 | ${nodes['TG']} | | ... | ${src_ip} | ${dst_ip} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} | | ... | ${tg_to_dut_if2} | ${dut_to_tg_if1_mac} *** Keywords *** | Setup interfaces and neighbors for IPv4 routing test -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv4 | ${dut_to_tg_if2} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if1} | ${1} | | Setup vrf IDs | ${dut_node} | ${dut_to_tg_if2} | ${1} -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} -| | Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len} -| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${src_ip} | ${tg_to_dut_if1_mac} -| | Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop} | ${tg_to_dut_if2_mac} | Setup interfaces and neighbors for IPv6 routing test -| | Path for 2-node testing is set +| | Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | Import Variables | resources/test_data/honeycomb/routing.py | | ... | ${nodes['DUT1']} | ipv6 | ${dut_to_tg_if2} -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} | ipv6 -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${dut_node} | ${dut_to_tg_if2} | ${1} | ipv6 -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix_len} -| | Honeycomb sets interface ipv6 address | ${dut_node} +| | Honeycomb sets interface IPv6 address | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix_len} -| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${src_ip} | ${tg_to_dut_if1_mac} -| | Honeycomb adds interface ipv6 neighbor | ${dut_node} | ${dut_to_tg_if2} +| | Honeycomb adds interface IPv6 neighbor | ${dut_node} | ${dut_to_tg_if2} | | ... | ${next_hop} | ${tg_to_dut_if2_mac} | | Vpp all ra suppress link layer | ${nodes} @@ -209,7 +209,7 @@ | Setup vrf IDs | | [Arguments] | ${node} | ${interface} | ${vrf} -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${vrf} | ipv4 -| | Honeycomb sets interface vrf ID +| | Honeycomb sets interface VRF ID | | ... | ${node} | ${interface} | ${vrf} | ipv6 \ No newline at end of file diff --git a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot index 3325a0f9bd..abcd86e95d 100644 --- a/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot @@ -35,7 +35,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} @@ -55,7 +55,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} @@ -68,7 +68,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_01} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -81,7 +81,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_02} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -94,7 +94,7 @@ | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} | | And InterfaceAPI.Set Interface State | ${node} | ${interface} | up -| | And Honeycomb sets interface ipv6 address | ${node} | ${interface} +| | And Honeycomb sets interface IPv6 address | ${node} | ${interface} | | ... | ${address} | ${prefix} | | When Honeycomb configures SLAAC | ${node} | ${interface} | ${slaac_data_03} | | Then SLAAC Operational Data From Honeycomb Should Be | ${node} | ${interface} @@ -107,13 +107,13 @@ | | ... | [Ver] Make TG wait for two IPv6 Router Advertisement packets\ | | ... | to be sent by DUT1 and verify the received RA packets are correct. | | [Teardown] | SLAAC test teardown | ${dut_node} | ${dut_to_tg_if1} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Honeycomb sets interface ipv6 address +| | And Honeycomb sets interface IPv6 address | | ... | ${dut_node} | ${dut_to_tg_if1} | ${address} | ${prefix} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up | | When Honeycomb configures SLAAC | ${dut_node} | ${dut_to_tg_if1} | | ... | ${slaac_data} | | :FOR | ${n} | IN RANGE | ${2} -| | | Then Receive And Check Router Advertisement Packet +| | | Then Receive and verify router advertisement packet | | | ... | ${tg_node} | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac} | ${20} diff --git a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot index 1cc385ca2b..b2adb871c5 100644 --- a/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot @@ -34,7 +34,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state receive. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_receive} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_receive} @@ -43,7 +43,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state transmit. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_transmit} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_transmit} @@ -52,7 +52,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state both. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_both} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_both} @@ -61,7 +61,7 @@ | | [Documentation] | Honeycomb configures SPAN on interface and verifies | | ... | against VPP SPAN dump in state both. | | ... -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_both} | ${settings_if2} @@ -86,9 +86,9 @@ | | ... | ${node} | ${interface1} | AND | | ... | Honeycomb removes interface SPAN configuration | | ... | ${node} | ${interface2} -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${interface1} | ${settings_if2} -| | And Honeycomb Configures SPAN on interface +| | And Honeycomb configures SPAN on interface | | ... | ${node} | ${interface2} | ${settings_if2} | | Then Interface SPAN Operational Data from Honeycomb should be | | ... | ${node} | ${interface1} | ${settings_if2} @@ -106,24 +106,24 @@ | | ... | | [Teardown] | Run Keywords | | ... | Show Packet Trace on All DUTs | ${nodes} | AND -| | ... | Honeycomb clears all interface ipv4 neighbors +| | ... | Honeycomb clears all interface IPv4 neighbors | | ... | ${dut_node} | ${dut_to_tg_if1} | AND -| | ... | Honeycomb removes interface ipv4 addresses +| | ... | Honeycomb removes interface IPv4 addresses | | ... | ${dut_node} | ${dut_to_tg_if1} | AND | | ... | Honeycomb removes interface SPAN configuration | | ... | ${node} | ${dut_to_tg_if2} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if1} | ${dut_to_tg_if1_ip} | ${prefix} -| | And Honeycomb adds interface ipv4 neighbor | ${dut_node} | ${dut_to_tg_if1} +| | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1} | | ... | ${tg_to_dut_if1_ip} | ${tg_to_dut_if1_mac} | | ${settings_5}= | create dictionary | state=both | | ... | iface-ref=${dut_to_tg_if1} | | And InterfaceCLI.All Vpp Interfaces Ready Wait | ${nodes} -| | When Honeycomb Configures SPAN on interface +| | When Honeycomb configures SPAN on interface | | ... | ${node} | ${dut_to_tg_if2} | ${settings_5} | | Then Send Packet And Check Received Copies | ${tg_node} | | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac} @@ -218,17 +218,17 @@ | | ... | on the sub-interface. | | ... | | [Teardown] | Show Packet Trace on All DUTs | ${nodes} -| | Given Path for 2-node testing is set +| | Given Configure path in 2-node circular topology | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']} | | And Sub-interface state from Honeycomb should be | | ... | ${dut_node} | ${interface1} | ${1} | down | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if1} | up -| | And Honeycomb sets interface state | ${dut_node} | ${dut_to_tg_if2} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up +| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2} | up | | And Honeycomb sets the sub-interface up | | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} -| | And Honeycomb sets interface ipv4 address with prefix | ${dut_node} +| | And Honeycomb sets interface IPv4 address with prefix | ${dut_node} | | ... | ${dut_to_tg_if2} | ${dut_to_tg_if2_ip} | ${prefix} -| | And And Honeycomb adds interface ipv4 neighbor +| | And And Honeycomb adds interface IPv4 neighbor | | ... | ${dut_node} | ${dut_to_tg_if2} | | ... | ${tg_to_dut_if2_ip} | ${tg_to_dut_if2_mac} | | ${settings_5}= | create dictionary | state=both diff --git a/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot index 339fdb8972..409eb13d21 100644 --- a/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot +++ b/tests/func/honeycomb/mgmt-cfg-vxlan-apihc-apivat-func.robot @@ -49,7 +49,7 @@ | | ... | ${node} | ${vx_interface} | ${vxlan_settings} | | And VxLAN Operational Data From VAT Should Be | | ... | ${node} | ${vxlan_settings} -| | ${vxlan_index}= | Get Interface index from oper data +| | ${vxlan_index}= | Get interface index from oper data | | ... | ${node} | ${vx_interface} | | Set Suite Variable | ${vxlan_index} diff --git a/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot index 3386e1fe60..7daa08bc85 100644 --- a/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot +++ b/tests/func/honeycomb/mgmt-notif-apihcnc-func.robot @@ -25,7 +25,7 @@ | Resource | resources/libraries/robot/honeycomb/tap.robot | Resource | resources/libraries/robot/honeycomb/notifications.robot | Suite Setup | Run keywords -| ... | Honeycomb sets interface state +| ... | Honeycomb configures interface state | ... | ${node} | ${interface} | down | AND | ... | Honeycomb creates TAP interface | ... | ${node} | ${tap_interface} | ${tap_settings} @@ -41,10 +41,10 @@ | | Given Interface state from Honeycomb should be | | ... | ${node} | ${interface} | down | | And Interface state from VAT should be | ${node} | ${interface} | down -| | And Notification listener is established | ${node} -| | When Honeycomb sets interface state | ${node} | ${interface} | up +| | And Notification listener should be established | ${node} +| | When Honeycomb configures interface state | ${node} | ${interface} | up | | Then Honeycomb should send interface state notification | ${interface} | up -| | When Honeycomb sets interface state | ${node} | ${interface} | down +| | When Honeycomb configures interface state | ${node} | ${interface} | down | | And Honeycomb should send interface state notification | ${interface} | down | TC02: Honeycomb sends notification on interface deletion @@ -54,6 +54,6 @@ | | ... | ${node} | ${tap_interface} | ${tap_settings} | | And TAP Operational Data From VAT Should Be | | ... | ${node} | ${tap_interface} | ${tap_settings} -| | And Notification listener is established | ${node} +| | And Notification listener should be established | ${node} | | When Honeycomb removes TAP interface | ${node} | ${tap_interface} | | Then Honeycomb should send interface deleted notification | ${tap_interface} diff --git a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot index 5dfa4b5aed..f5f9673230 100644 --- a/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot +++ b/tests/func/honeycomb/mgmt-statepersist-apihc-func.robot @@ -33,14 +33,14 @@ # =================== | TC01: Honeycomb persists configuration through restart of both Honeycomb and VPP | | [Documentation] | Checks if Honeycomb maintains configuration after both\ -| | ... | Honeycomb and VPP are restarted. +| | ... | Restart Honeycomb and VPP. | | [Tags] | HC_FUNC | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} | TC02: Honeycomb reverts to defaults if persistence files are invalid @@ -62,7 +62,7 @@ | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} | TC04: Honeycomb persists configuration through restart of VPP @@ -73,7 +73,7 @@ | | Given Multi-Feature Persistence test configuration | ${node} | ${interface} | | And Multi-Feature persistence Test Verification | ${node} | ${interface} | | And Log persisted configuration on node | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Multi-Feature persistence Test Verification | ${node} | ${interface} # single-feature cases @@ -86,7 +86,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Interface Persistence Check | ${node} | TC06: Persist configuration of IP addresses and neighbors - HC restart @@ -96,7 +96,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Interface Persistence Check | ${node} | TC07: Persist configuration of IP addresses and neighbors - VPP restart @@ -106,7 +106,7 @@ | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Interface Persistence Setup | ${node} | | And Interface Persistence Check | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Interface Persistence Check | ${node} | TC08: Honeycomb persists configuration of bridge domains - HC and VPP restart @@ -116,7 +116,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When Honeycomb and VPP are restarted | ${node} +| | When Restart Honeycomb and VPP | ${node} | | Then Bridge Domain Persistence Check | ${node} | TC09: Honeycomb persists configuration of bridge domains - HC restart @@ -126,7 +126,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When Honeycomb is restarted | ${node} +| | When Restart Honeycomb | ${node} | | Then Bridge Domain Persistence Check | ${node} | TC10: Honeycomb persists configuration of bridge domains - VPP restart @@ -136,7 +136,7 @@ | | [Teardown] | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node} | | Given Bridge Domain Persistence Setup | ${node} -| | When VPP is restarted | ${node} +| | When Restart VPP | ${node} | | Then Bridge Domain Persistence Check | ${node} #TODO: All other features -- cgit 1.2.3-korg