| | [Arguments] | ${node}
| | Stop Honeycomb service on DUTs | ${node}
| | Clear persisted Honeycomb configuration | ${node}
-| | Setup DUT | ${node}
-| | Sleep | 10s | Wait 10sec so VPP is up for sure.
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
| | Configure Honeycomb service on DUTs | ${node}
| Restart Honeycomb and VPP
| | ...
| | [Arguments] | ${node}
| | Stop Honeycomb service on DUTs | ${node}
-| | Setup DUT | ${node}
-| | Sleep | 10s | Wait 10sec so VPP is up for sure.
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
| | Configure Honeycomb service on DUTs | ${node}
| Restart Honeycomb and VPP in performance test
| | ...
| | [Arguments] | ${node}
| | Stop Honeycomb service on DUTs | ${node}
-| | Stop VPP service on DUT | ${node}
-| | Setup DUT | ${node}
-| | Sleep | 10s | Wait 10sec so VPP is up for sure.
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
| | Configure Honeycomb service on DUTs | ${node}
| | Check honeycomb startup state | ${node} | timeout=120
| | ...
| | ... | *Example:*
| | ...
-| | ... | \| Archive Honeycomb log file \| ${nudes['DUT1']} \|
+| | ... | \| Archive Honeycomb logs \| ${nudes['DUT1']} \|
| | ...
| | [Arguments] | ${node} | ${perf}=${False}
| | Archive Honeycomb log | ${node} | ${perf}
| | [Arguments] | ${node} | ${odl_name}
| | Copy ODL Client | ${node} | ${odl_name} | /mnt/common | /tmp
| | Setup ODL Client | ${node} | /tmp
-| | Wait until keyword succeeds | 2min | 30sec
-| | ... | Install ODL Features | ${node} | ${odl_name} | /tmp
+| | Wait until keyword succeeds | 3min | 30sec
+| | ... | Install ODL Features | ${node} | /tmp
| | Wait until keyword succeeds | 4min | 15sec
| | ... | Mount Honeycomb on ODL | ${node}
| | Wait until keyword succeeds | 2min | 15sec
| | ... | \| Set Up Honeycomb Functional Test Suite \| ${nodes['DUT1']} \|
| | ...
| | [Arguments] | ${node}
-| | Setup DUT | ${node}
-| | Configure all TGs for traffic script
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
+| | All TGs Set Interface Default Driver | ${nodes}
| | Configure Honeycomb for functional testing | ${node}
| | Configure ODL Client for functional testing | ${node}
| | ... | Set Global Variable | ${use_odl_client} | ${NONE}
| | Stop Honeycomb service on DUTs | ${node}
| | Clear Honeycomb Log | ${node}
-| | Stop VPP Service on DUT | ${node}
+| | Stop VPP Service | ${node}
| Enable Honeycomb Feature
| | [Documentation] | Enable the specified feature in Honeycomb configuration.
| | Append suite to Honeycomb log file | ${node}
| | Stop Honeycomb service on DUTs | ${node}
| | Clear Honeycomb Log | ${node}
-| | Stop VPP Service on DUT | ${node}
+| | Stop VPP Service | ${node}
| Append suite to Honeycomb log file
| | [Documentation] | Add the contents of honeycomb.log for the current suite\
| | Run Keyword | HC_config.Set SSH Security provider
| | Run Keyword | HC_config.Set Memory Size | ${32}
| | Run Keyword | HC_config.Set Metaspace Size | ${32}
-| | Run Keyword | HC_config.Apply config | ${node}
\ No newline at end of file
+| | Run Keyword | HC_config.Apply config | ${node}