*** Variables ***
# Interface to run tests on.
| ${interface}= | ${node['interfaces']['port1']['name']}
-| ${interface2}= | ${node['interfaces']['port3']['name']}
+| ${interface2}= | ${node['interfaces']['port2']['name']}
+| ${interface3}= | ${node['interfaces']['port3']['name']}
*** Settings ***
| Resource | resources/libraries/robot/shared/default.robot
| | 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.
| | ... | ${node} | ${interface} | ${ethernet}
| | Then Interface ethernet Operational Data From Honeycomb Should Be
| | ... | ${node} | ${interface} | ${ethernet}
+| | ${mtu}= | Create List | ${ethernet['mtu']} | ${0} | ${0} | ${0}
| | And Interface ethernet Operational Data From VAT Should Be
-| | ... | ${node} | ${interface} | ${ethernet['mtu']}
+| | ... | ${node} | ${interface} | ${mtu}
| TC09: Honeycomb modifies interface configuration - vrf
| | [Documentation] | Check if Honeycomb API can configure interface\
| | Then IPv4 address from Honeycomb should be
| | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address} | ${ipv4_prefix}
| | And IPv4 address from VAT should be
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv4_address}
+| | ... | ${dut_node} | ${interface2} | ${ipv4_address}
| | ... | ${ipv4_prefix} | ${ipv4_mask}
| | 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} | ${dut_to_tg_if1} | ${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}
| | ... | ${tg_to_dut_if1} | ${tg_to_dut_if1_mac}
| | ... | ${tg_to_dut_if1} | ${dut_to_tg_if1_mac}
-| TC11: Honeycomb can configure unnumbered interface
+| 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}
+| | ... | ${interface}
+| | ...
+| | When Honeycomb sets interface IPv4 address with prefix
+| | ... | ${node} | ${interface} | 192.168.0.1 | ${9}
+| | Then Honeycomb fails to add interface IPv4 address
+| | ... | ${node} | ${interface} | 192.168.0.2 | ${9}
+| | 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
+| | [Documentation] | Check if Honeycomb can configure two IPv6 addresses in\
+| | ... | the same subnet onto a single interface. It should not be possible.
+| | ...
+| | [Teardown] | Honeycomb removes interface IPv6 addresses | ${node}
+| | ... | ${interface}
+| | When Honeycomb sets interface IPv6 address
+| | ... | ${node} | ${interface} | 10::FF10 | ${64}
+| | Then Honeycomb fails to add interface IPv6 address
+| | ... | ${node} | ${interface} | 10::FF11 | ${64}
+| | 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 another physical\
| | ... | interface.
| | [Tags] | EXPECTED_FAILING
| | ...
| | Given Honeycomb sets interface IPv4 address | ${node}
-| | ... | ${interface2} | ${ipv4_address} | ${ipv4_prefix}
+| | ... | ${interface3} | ${ipv4_address} | ${ipv4_prefix}
| | When Honeycomb adds unnumbered configuration to interface
-| | ... | ${node} | ${interface} | ${interface2}
+| | ... | ${node} | ${interface} | ${interface3}
| | Then Wait until Keyword succeeds | 10s | 2s
| | ... | IPv4 address from Honeycomb should be
-| | ... | ${node} | ${interface2} | ${ipv4_address} | ${ipv4_prefix}
+| | ... | ${node} | ${interface3} | ${ipv4_address} | ${ipv4_prefix}
| | And IPv4 address from VAT should be
-| | ... | ${node} | ${interface2} | ${ipv4_address}
+| | ... | ${node} | ${interface3} | ${ipv4_address}
| | ... | ${ipv4_prefix} | ${ipv4_mask}
| | And IPv4 address from Honeycomb should be
| | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix}
| | ... | ${node} | ${interface} | ${ipv4_address}
| | ... | ${ipv4_prefix} | ${ipv4_mask}
-| TC12: Honeycomb removes interface unnumbered configuration
+| TC14: Honeycomb removes interface unnumbered configuration
| | [Documentation] | Check if Honeycomb can remove unnumbered configuration\
| | ... | from an interface.
| | ...
| | [Tags] | EXPECTED_FAILING
| | ...
| | Given IPv4 address from Honeycomb should be
-| | ... | ${node} | ${interface2} | ${ipv4_address} | ${ipv4_prefix}
+| | ... | ${node} | ${interface3} | ${ipv4_address} | ${ipv4_prefix}
| | And IPv4 address from VAT should be
-| | ... | ${node} | ${interface2} | ${ipv4_address}
+| | ... | ${node} | ${interface3} | ${ipv4_address}
| | ... | ${ipv4_prefix} | ${ipv4_mask}
| | And IPv4 address from Honeycomb should be
| | ... | ${node} | ${interface} | ${ipv4_address} | ${ipv4_prefix}
| | ... | ${node} | ${interface}
| | Then Wait until Keyword succeeds | 10s | 2s
| | ... | IPv4 address from Honeycomb should be
-| | ... | ${node} | ${interface2} | ${ipv4_address} | ${ipv4_prefix}
+| | ... | ${node} | ${interface3} | ${ipv4_address} | ${ipv4_prefix}
| | And IPv4 address from VAT should be
-| | ... | ${node} | ${interface2} | ${ipv4_address}
+| | ... | ${node} | ${interface3} | ${ipv4_address}
| | ... | ${ipv4_prefix} | ${ipv4_mask}
| | And IPv4 address from Honeycomb should be empty | ${node} | ${interface}
| | And ipv4 address from VAT should be empty | ${node} | ${interface}
-| TC13: 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}
-| | ... | ${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
-| | ... | ${node} | ${interface} | 192.168.0.1 | ${9}
-| | Then Honeycomb fails to add interface IPv4 address
-| | ... | ${node} | ${interface} | 192.168.0.2 | ${9}
-| | And Honeycomb fails to add interface IPv4 address
-| | ... | ${node} | ${interface} | 192.232.0.2 | ${9}
-
-| TC14: Honeycomb fails to configure two IPv6 addresses from the same subnet
-| | [Documentation] | Check if Honeycomb can configure two IPv6 addresses in\
-| | ... | 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}
-| | ... | ${interface}
-| | When Honeycomb sets interface IPv6 address
-| | ... | ${node} | ${interface} | 10::FF10 | ${64}
-| | Then Honeycomb fails to add interface IPv6 address
-| | ... | ${node} | ${interface} | 10::FF11 | ${64}
-| | And Honeycomb fails to add interface IPv6 address
-| | ... | ${node} | ${interface} | 10::FFFF | ${64}
-
*** Keywords ***
| Multiple IP Address Test Teardown
| | [Arguments] | ${node} | ${interface}