FIX: Remove old restart sequence - Honeycomb

[csit.git] / resources / libraries / robot / honeycomb / honeycomb.robot

diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot
index 0a1462c..d446b7c 100644 (file)
--- 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,7 +230,9 @@
 | | ... | \| Set Up Honeycomb Functional Test Suite \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${node}
-| | Setup DUT | ${node}
+| | Restart Vpp Service | ${node}
+| | Verify Vpp | ${node}
+| | VPP Enable Traces On DUT | ${node}
 | | Configure all TGs for traffic script
 | | Configure Honeycomb for functional testing | ${node}
 | | Configure ODL Client for functional testing | ${node}