From b7f0c133f672b39b49e0480f71dd0629986bcf72 Mon Sep 17 00:00:00 2001 From: selias Date: Wed, 21 Jun 2017 18:52:10 +0200 Subject: HC Test: improve functional suite setup and teardown Restart the whole stack (VPP+Honeycomb+-ODL) in between test suites. Add generic suite setup and suite teardown keywords for all func suites Re-enable NSH_SFC suite, cleanup test failures Change-Id: I71025b4ed3a7c4912dcd7b62aedef6082357990c Signed-off-by: selias --- tests/func/honeycomb/__init__.robot | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) (limited to 'tests/func/honeycomb/__init__.robot') diff --git a/tests/func/honeycomb/__init__.robot b/tests/func/honeycomb/__init__.robot index 3f79a6a1f8..fff6097d08 100644 --- a/tests/func/honeycomb/__init__.robot +++ b/tests/func/honeycomb/__init__.robot @@ -21,29 +21,7 @@ | Resource | resources/libraries/robot/honeycomb/honeycomb.robot | ... | Suite Setup | Run Keywords | Configure all DUTs before test | AND -| ... | Configure Honeycomb for testing | ${node} | AND -| ... | Configure ODL Client for testing | ${node} | AND -| ... | Set Global Variable | ${node} +| ... | Set Global Variable | ${node} | AND +| ... | Stop Honeycomb service on DUTs | ${node} | ... | Suite Teardown | Archive Honeycomb log file | ${node} - -*** Keywords *** -| Configure Honeycomb for testing -| | [Arguments] | ${node} -| | Configure Restconf binding address | ${node} -| | Enable Module Features | ${node} -| | Configure Log Level | ${node} | TRACE -| | Configure Persistence | ${node} | disable -| | Configure jVPP timeout | ${node} | ${14} -| | Clear Persisted Honeycomb Configuration | ${node} -| | Configure Honeycomb service on DUTs | ${node} - -| Configure ODL Client for testing -| | [Arguments] | ${node} -| | ${use_odl_client}= | Get Variable Value | ${HC_ODL} -| | Run Keyword If | '${use_odl_client}' != '${NONE}' -| | ... | Run Keywords -| | ... | Set Global Variable | ${use_odl_client} | AND -| | ... | Configure ODL Client Service On DUT | ${node} | ${use_odl_client} -| | ... | ELSE | Log | Variable HC_ODL is not present. Not using ODL. -| | ... | level=INFO -- cgit 1.2.3-korg