diff options
| -rw-r--r-- | resources/libraries/python/DUTSetup.py | 7 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/honeycomb.robot | 20 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/persistence.robot | 8 | ||||
| -rw-r--r-- | tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot | 2 | ||||
| -rw-r--r-- | tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot | 4 |
5 files changed, 25 insertions, 16 deletions
diff --git a/resources/libraries/python/DUTSetup.py b/resources/libraries/python/DUTSetup.py index bd6bb46a42..95b23018af 100644 --- a/resources/libraries/python/DUTSetup.py +++ b/resources/libraries/python/DUTSetup.py @@ -77,7 +77,7 @@ class DUTSetup(object): format(host=node['host'], name=service) exec_cmd_no_error( - node, command, timeout=120, sudo=True, message=message) + node, command, timeout=180, sudo=True, message=message) DUTSetup.get_service_logs(node, service) @@ -112,7 +112,7 @@ class DUTSetup(object): format(host=node['host'], name=service) exec_cmd_no_error( - node, command, timeout=120, sudo=True, message=message) + node, command, timeout=180, sudo=True, message=message) DUTSetup.get_service_logs(node, service) @@ -145,7 +145,8 @@ class DUTSetup(object): message = 'Node {host} failed to stop service {name}'.\ format(host=node['host'], name=service) - exec_cmd_no_error(node, command, timeout=30, sudo=True, message=message) + exec_cmd_no_error( + node, command, timeout=180, sudo=True, message=message) DUTSetup.get_service_logs(node, service) diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index 704f518573..d446b7ca16 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 @@ -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} diff --git a/resources/libraries/robot/honeycomb/persistence.robot b/resources/libraries/robot/honeycomb/persistence.robot index 969b333815..9bf8287abb 100644 --- a/resources/libraries/robot/honeycomb/persistence.robot +++ b/resources/libraries/robot/honeycomb/persistence.robot @@ -51,7 +51,9 @@ | | ... | \| Restart VPP \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} -| | Setup DUT | ${node} +| | Restart Vpp Service | ${node} +| | Verify Vpp | ${node} +| | VPP Enable Traces On DUT | ${node} | | Check VPP connection | ${node} | Check VPP connection @@ -83,7 +85,9 @@ | | [Arguments] | ${node} | | Stop Honeycomb service on DUTs | ${node} | | Log Persisted Configuration | ${node} -| | Setup DUT | ${node} +| | Restart Vpp Service | ${node} +| | Verify Vpp | ${node} +| | VPP Enable Traces On DUT | ${node} | | Configure Honeycomb service on DUTs | ${node} | Multi-Feature Persistence Test Configuration diff --git a/tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot b/tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot index e3b43cc4a9..ceefd3ce1e 100644 --- a/tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-apihcv6-func.robot @@ -170,7 +170,7 @@ | | Configure Control Interface Tunnel | | ... | ${tg_node} | ${dut_node['honeycomb']['netconf_port']} | | ... | ${dut_to_tg_if2_ip} | ${dut_node['honeycomb']['netconf_port']} -| | Start VPP service on DUT | ${dut_node} +| | Restart VPP service | ${dut_node} | | Configure Honeycomb service on DUTs | ${dut_node} | Unconfigure IPv6 Management Interface diff --git a/tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot b/tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot index 8cf7a7cf31..26a9de6f5a 100644 --- a/tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot +++ b/tests/honeycomb/func/mgmt-cfg-bgp-apihc-func.robot @@ -337,8 +337,8 @@ | | ... | ${bgp_port} | ${bgp_as_number} | | Configure BGP Module | ${dut2_node} | ${dut2_to_dut1_ip} | | ... | ${bgp_port} | ${bgp_as_number} -| | Start VPP service on DUT | ${dut1_node} -| | Start VPP service on DUT | ${dut2_node} +| | Restart VPP service | ${dut1_node} +| | Restart VPP service | ${dut2_node} | | Configure Honeycomb service on DUTs | ${dut1_node} | | Set Up Honeycomb Functional Test Suite | ${dut2_node} |