X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fhoneycomb%2Fhoneycomb.robot;h=6cb57d3996f6e039b2f03283d955ac3ee28906f6;hp=1b08e3955f06cb77e77a9e0d64c07daed0eb7f39;hb=8c581968098ff88db8cba412349cab5938aa3d76;hpb=835cb6439afb359dc2ebef02355314c4bebde75e diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index 1b08e3955f..6cb57d3996 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -17,6 +17,7 @@ | Library | resources.libraries.python.honeycomb.HcPersistence | Library | resources.libraries.python.DUTSetup | Library | resources.libraries.python.InterfaceUtil +| Resource | resources/libraries/robot/shared/default.robot *** Keywords *** | Configure Honeycomb service on DUTs @@ -39,9 +40,9 @@ | | ... | | [Arguments] | @{duts} | | Start honeycomb on DUTs | @{duts} -| | Wait until keyword succeeds | 4min | 16sec -| | ... | Check honeycomb startup state | @{duts} -| | Sleep | 5s | Make sure all modules are loaded and ready. +| | :FOR | ${dut} | IN | @{duts} +| | | Check honeycomb startup state | @{duts} +| | | Sleep | 5s | Make sure all modules are loaded and ready. | Stop Honeycomb service on DUTs | | [Documentation] | *Cleanup environment after honeycomb testing.* @@ -62,8 +63,9 @@ | | ... | | [Arguments] | @{duts} | | Stop honeycomb on DUTs | @{duts} -| | Wait until keyword succeeds | 60sec | 16sec -| | ... | Check honeycomb shutdown state | @{duts} +| | :FOR | ${dut} | IN | @{duts} +| | | Wait until keyword succeeds | 60sec | 15sec +| | | ... | Check honeycomb shutdown state | @{duts} | Clear persisted Honeycomb configuration | | [Documentation] | *Delete saved configuration.* @@ -130,11 +132,10 @@ | | Setup DUT | ${node} | | Sleep | 10s | Wait 10sec so VPP is up for sure. | | Configure Honeycomb service on DUTs | ${node} -| | Wait until keyword succeeds | 2min | 16sec -| | ... | Check honeycomb startup state | ${node} +| | Check honeycomb startup state | ${node} | timeout=120 -| Archive Honeycomb log file -| | [Documentation] | Copy honeycomb.log file from Honeycomb node\ +| Archive Honeycomb logs +| | [Documentation] | Copies log files from Honeycomb node\ | | ... | to test executor. | | ... | | ... | *Arguments:* @@ -143,10 +144,11 @@ | | ... | | ... | *Example:* | | ... -| | ... | \| Archive Honeycomb log file \| ${nudes['DUT1']} \| +| | ... | \| Archive Honeycomb logs \| ${nudes['DUT1']} \| | | ... | | [Arguments] | ${node} | ${perf}=${False} | | Archive Honeycomb log | ${node} | ${perf} +| | Archive ODL log | ${node} | Configure ODL Client Service On DUT | | [Documentation] | Configure and start ODL client, then repeatedly check if @@ -164,14 +166,13 @@ | | [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} | /tmp -| | Wait until keyword succeeds | 4min | 16sec +| | Wait until keyword succeeds | 3min | 30sec +| | ... | Install ODL Features | ${node} | ${odl_name} | /tmp +| | Wait until keyword succeeds | 4min | 15sec | | ... | Mount Honeycomb on ODL | ${node} -| | Wait until keyword succeeds | 2min | 16sec +| | Wait until keyword succeeds | 2min | 15sec | | ... | Check ODL startup state | ${node} -| | Wait until keyword succeeds | 2min | 16sec -| | ... | Check honeycomb startup state | ${node} +| | Check honeycomb startup state | ${node} | timeout=120 | Configure Honeycomb for functional testing | | [Documentation] | Configure Honeycomb with parameters for functional @@ -188,7 +189,8 @@ | | Configure Restconf binding address | ${node} | | Configure Log Level | ${node} | TRACE | | Configure Persistence | ${node} | disable -| | Configure jVPP timeout | ${node} | ${14} +| | Configure jVPP timeout | ${node} | ${10} +| | Generate Honeycomb startup configuration for ODL test | ${node} | | Clear Persisted Honeycomb Configuration | ${node} | | Configure Honeycomb service on DUTs | ${node} @@ -244,14 +246,17 @@ | | ... | \| Tear Down Honeycomb Functional Test Suite \| ${nodes['DUT1']} \| | | ... | | [Arguments] | ${node} +| | Append suite to Honeycomb log file | ${node} | | ${use_odl_client}= | Get Variable Value | ${HC_ODL} | | Run Keyword If | '${use_odl_client}' != '${NONE}' | | ... | Run Keywords +| | ... | Append suite to ODL log file | ${node} | ${use_odl_client} | AND | | ... | Stop ODL Client | ${node} | /tmp | AND -| | ... | Wait until keyword succeeds | 2min | 15sec +| | ... | Wait until keyword succeeds | 3min | 15sec | | ... | Check ODL shutdown state | ${node} | AND | | ... | Set Global Variable | ${use_odl_client} | ${NONE} | | Stop Honeycomb service on DUTs | ${node} +| | Clear Honeycomb Log | ${node} | | Stop VPP Service on DUT | ${node} | Enable Honeycomb Feature @@ -282,19 +287,6 @@ | | [arguments] | ${node} | ${feature} | | Manage Honeycomb Features | ${node} | ${feature} | disable=${True} -| Stop VPP Service on DUT -| | [Documentation] | Stop the VPP service on the specified node. -| | ... -| | ... | *Arguments:* -| | ... | - node - information about a DUT node. Type: dictionary -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Stop VPP Service on DUT \| ${nodes['DUT1']} \| -| | ... -| | [Arguments] | ${node} -| | Stop VPP Service | ${node} - | Honeycomb Performance Suite Setup Generic | | [Documentation] | Generic test suite setup for Honeycomb performance tests. | | ... | Performs multiple attempts to start Honeycomb+VPP stack. @@ -323,5 +315,57 @@ | | ... | | [Arguments] | ${node} | | Log Honeycomb and VPP process distribution on cores | ${node} +| | Append suite to Honeycomb log file | ${node} | | Stop Honeycomb service on DUTs | ${node} +| | Clear Honeycomb Log | ${node} | | Stop VPP Service on DUT | ${node} + +| Append suite to Honeycomb log file +| | [Documentation] | Add the contents of honeycomb.log for the current suite\ +| | ... | to the full log which will be archived. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Append suite to Honeycomb log file \| ${nodes['DUT1']} \| +| | ... +| | [Arguments] | ${node} +| | Append Honeycomb log | ${node} | ${SUITE_NAME} + +| Append suite to ODL log file +| | [Documentation] | Add the contents of ODL karaf.log for the current suite\ +| | ... | to the full log which will be archived. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... | - odl_name - name of ODL client version. Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Append suite to ODL karaf log file \| ${nodes['DUT1']} \ +| | ... | \| Oxygen \| +| | ... +| | [Arguments] | ${node} | ${odl_name} +| | Append ODL log | ${node} | ${odl_name} | ${SUITE_NAME} + +| Generate Honeycomb startup configuration for ODL test +| | [Documentation] | Create HC startup configuration and apply to config +| | ... | file on DUT. Requires Honeycomb restart to take effect. +| | ... +| | ... | *Arguments:* +| | ... | - node - Honeycomb node. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Generate Honeycomb startup configuration for ODL test \ +| | ... | \| ${nodes[DUT1]} \| +| | ... +| | [Arguments] | ${node} +| | Import Library | resources.libraries.python.honeycomb.HoneycombSetup.HoneycombStartupConfig +| | ... | WITH NAME | HC_config +| | 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