From 4f4eaa1d52f3bdbe3caecdc1d6a024c369a2834a Mon Sep 17 00:00:00 2001 From: selias Date: Tue, 7 Mar 2017 15:42:02 +0100 Subject: CSIT-536 HC Test: support testing with ODL client Reuses existing restconf test cases to test Honeycomb's netconf interface. When seding the requests to ODL's Honeycomb mountpoint, ODL translates these requests to netconf RPCs. Add new tag "honeycomb_odl" that excludes incompatible test cases. Change-Id: Ie293449da0129b02db85e30aa4f3266928d7d9f6 Signed-off-by: selias --- .../robot/honeycomb/access_control_lists.robot | 2 +- .../libraries/robot/honeycomb/honeycomb.robot | 36 ++++++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) (limited to 'resources/libraries/robot/honeycomb') diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot index d45c1f8948..a62ea0f2e8 100644 --- a/resources/libraries/robot/honeycomb/access_control_lists.robot +++ b/resources/libraries/robot/honeycomb/access_control_lists.robot @@ -155,7 +155,7 @@ | | ... | \| ACL table from Honeycomb should not exist \| ${nodes['DUT1']} \ | | ... | \| table0 \| | | [Arguments] | ${node} | ${table_name} -| | Run keyword and expect error | ValueError: No JSON object could be decoded +| | Run keyword and expect error | * | | ... | Get classify table oper data | ${node} | ${table_name} | ACL table from VAT should not exist diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index 7d807f8df9..919c6f5e2a 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -37,7 +37,7 @@ | | ... | | [Arguments] | @{duts} | | Start honeycomb on DUTs | @{duts} -| | Wait until keyword succeeds | 4min | 15sec +| | Wait until keyword succeeds | 4min | 20sec | | ... | Check honeycomb startup state | @{duts} | Stop honeycomb service on DUTs @@ -59,7 +59,7 @@ | | ... | | [Arguments] | @{duts} | | Stop honeycomb on DUTs | @{duts} -| | Wait until keyword succeeds | 30sec | 5sec +| | Wait until keyword succeeds | 60sec | 10sec | | ... | Check honeycomb shutdown state | @{duts} | Clear persisted Honeycomb configuration @@ -91,6 +91,21 @@ | | Setup DUT | ${node} | | Setup Honeycomb service on DUTs | ${node} +| Restart Honeycomb and VPP +| | [Documentation] | Restarts Honeycomb service and wait until it starts up. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Restart Honeycomb and VPP \| ${nodes['DUT1']} \| +| | [Arguments] | ${node} +| | Log | Performing clean restart of Honeycomb and VPP. | console=True +| | Restart Honeycomb and VPP on DUTs | ${node} +| | Wait until keyword succeeds | 4min | 20sec +| | ... | Check honeycomb startup state | ${node} + | Archive Honeycomb log file | | [Documentation] | Copy honeycomb.log file from Honeycomb node\ | | ... | to test executor. @@ -101,4 +116,19 @@ | | ... | | ... | \| Archive Honeycomb log file \| ${nudes['DUT1']} \| | | [Arguments] | ${node} -| | Archive Honeycomb log | ${node} \ No newline at end of file +| | Archive Honeycomb log | ${node} + +| Find ODL client on node +| | [Arguments] | ${node} +| | ${odl_present}= | Find ODL Client | ${node} +| | Return from keyword | ${odl_present} + +| Start ODL client on node +| | [Arguments] | ${node} +| | Start ODL client | ${node} +| | Wait until keyword succeeds | 4min | 20sec +| | ... | Mount Honeycomb on ODL | ${node} +| | Wait until keyword succeeds | 2min | 10sec +| | ... | Check ODL startup state | ${node} +| | Wait until keyword succeeds | 2min | 10sec +| | ... | Check honeycomb startup state | ${node} -- cgit 1.2.3-korg