| Resource | resources/libraries/robot/shared/default.robot
| Resource | resources/libraries/robot/honeycomb/interfaces.robot
| Resource | resources/libraries/robot/honeycomb/honeycomb.robot
+| Resource | resources/libraries/robot/honeycomb/fib.robot
| Resource | resources/libraries/robot/shared/testing_path.robot
| Resource | resources/libraries/robot/ip/ip6.robot
| Variables | resources/test_data/honeycomb/interface_ip.py
| | [Documentation] | Check if Honeycomb API can configure interface\
| | ... | vrf ID.
| | ...
-| | [Teardown] | Honeycomb sets interface VRF ID
-| | ... | ${node} | ${interface} | ${0} | ipv4
+| | [Teardown] | Honeycomb interface VRF Test Teardown | ${node} | ${interface}
| | ...
+| | Honeycomb configures FIB table | ${node} | ipv4 | ${1}
| | When Honeycomb sets interface VRF ID
| | ... | ${node} | ${interface} | ${1} | ipv4
| | Then Interface VRF ID from Honeycomb should be
| | ... | on a physical interface, borrowing the IP address of another physical\
| | ... | interface.
| | ...
-# HC2VPP-330: Honeycomb fails to configure interface as unnumbered
+# CSIT-1210: Adapt HC unnumbered interface tests to VPP 18.07 api changes
| | [Tags] | EXPECTED_FAILING
| | ...
| | Given Honeycomb sets interface IPv4 address | ${node}
| | [Documentation] | Check if Honeycomb can remove unnumbered configuration\
| | ... | from an interface.
| | ...
-# HC2VPP-330: Honeycomb fails to configure interface as unnumbered
+# CSIT-1210: Adapt HC unnumbered interface tests to VPP 18.07 api changes
| | [Tags] | EXPECTED_FAILING
| | ...
| | Given IPv4 address from Honeycomb should be
| | Honeycomb removes interface IPv4 addresses | ${node} | ${interface}
| | Honeycomb removes interface IPv6 addresses | ${node} | ${interface}
| | Honeycomb clears all interface IPv4 neighbors | ${node} | ${interface}
-| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${interface}
\ No newline at end of file
+| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${interface}
+
+| Honeycomb interface VRF Test Teardown
+| | [Arguments] | ${node} | ${interface}
+| | Honeycomb sets interface VRF ID | ${node} | ${interface} | ${0} | ipv4
+| | Honeycomb removes FIB configuration | ${node} | ipv4 | ${1}