X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fhoneycomb.robot;h=cf89229dfdc8d59dad4c39b7ec61acbc8f7ac08e;hp=0a1462c0cf4e1575cc4b6994de7fc5bbc380e48b;hb=67d683ebfc222d63d79b883fe7cf94027dbde00c;hpb=9a7dde749199b2a78c246bc741d384785ea9b946

diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index 0a1462c0cf..cf89229dfd 100644
--- a/resources/libraries/robot/honeycomb/honeycomb.robot
+++ b/resources/libraries/robot/honeycomb/honeycomb.robot
@@ -94,8 +94,9 @@
 | | [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
@@ -111,8 +112,9 @@
 | | ...
 | | [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
@@ -128,9 +130,9 @@
 | | ...
 | | [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
 
@@ -166,8 +168,8 @@
 | | [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
@@ -228,8 +230,10 @@
 | | ... | \| 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}
 
@@ -257,7 +261,7 @@
 | | ... | 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.
@@ -318,7 +322,7 @@
 | | 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\
@@ -368,4 +372,4 @@
 | | 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}