X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Fhoneycomb%2Fmgmt-cfg-routing-apihc-apivat-func.robot;h=93c842010bf197cb8d0e55401b81c4ca1680a059;hp=6651cd7fa292519581a0b056c201dad03e0bc8b8;hb=8c1bb6ac0c8253ee203d120c1a8f035c47293d9e;hpb=0b4ceb8d40f0b667eb6083298a4f133b8ae9adaa

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 6651cd7fa2..93c842010b 100644
--- a/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-routing-apihc-apivat-func.robot
@@ -21,14 +21,12 @@
 | Resource | resources/libraries/robot/honeycomb/honeycomb.robot
 | Resource | resources/libraries/robot/honeycomb/interfaces.robot
 | Resource | resources/libraries/robot/honeycomb/routing.robot
-| Suite Setup | Vpp nodes ra suppress link layer | ${nodes}
 | Test Setup | Clear Packet Trace on All DUTs | ${nodes}
-| Suite Teardown | Run Keyword If Any Tests Failed
-| ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
+| Suite Teardown | Restart Honeycomb And VPP | ${node}
 | Test Teardown | Honeycomb routing test teardown
 | ... | ${node} | ${table}
 | Documentation | *Honeycomb routing test suite.*
-| Force Tags | Honeycomb_sanity
+| Force Tags | Honeycomb_sanity | honeycomb_odl
 
 *** Test Cases ***
 | TC01: Single hop IPv4 route
@@ -169,10 +167,8 @@
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | Import Variables | resources/test_data/honeycomb/routing.py
 | | ... | ${nodes['DUT1']} | ipv4 | ${dut_to_tg_if2}
-| | Honeycomb sets interface vrf ID
-| | ... | ${dut_node} | ${dut_to_tg_if1} | ${1} | ipv4
-| | Honeycomb sets interface vrf ID
-| | ... | ${dut_node} | ${dut_to_tg_if2} | ${1} | ipv4
+| | 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}
@@ -203,9 +199,17 @@
 | | ... | ${src_ip} | ${tg_to_dut_if1_mac}
 | | 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}
 
 | Honeycomb routing test teardown
 | | [arguments] | ${node} | ${routing_table}
 | | Show Packet Trace on All DUTs | ${nodes}
 | | Log routing configuration from VAT | ${node}
 | | Honeycomb removes routing configuration | ${node} | ${routing_table}
+
+| Setup vrf IDs
+| | [Arguments] | ${node} | ${interface} | ${vrf}
+| | Honeycomb sets interface vrf ID
+| | ... | ${node} | ${interface} | ${vrf} | ipv4
+| | Honeycomb sets interface vrf ID
+| | ... | ${node} | ${interface} | ${vrf} | ipv6
\ No newline at end of file