diff options
| author |   selias <samelias@cisco.com> | 2017-06-29 13:17:40 +0200 |
|---|---|---|
| committer |   Tibor Frank <tifrank@cisco.com> | 2017-06-30 08:44:38 +0000 |
| commit | 4a946c16a4935e52b3e9039e4661813c256a8934 (patch) | |
| tree | 7a3891c31c6ccccdfd92b4f46fb46fa30969939d /resources | |
| parent | a8c974af22940a86ca54069f7eedb65172bd9de2 (diff) | |
HC Test: bugfix for SLAAC and ODL tests
Change-Id: I0a09482e8dc9ef2f9e6cd54a26c8d8492409f68c
Signed-off-by: selias <samelias@cisco.com>
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/robot/honeycomb/honeycomb.robot | 5 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/slaac.robot | 2 | ||||
| -rw-r--r-- | resources/templates/honeycomb/config_slaac.url | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index 603fbfa72f..9017584f5a 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -213,9 +213,8 @@ | | ${use_odl_client}= | Get Variable Value | ${HC_ODL} | | Run Keyword If | '${use_odl_client}' != '${NONE}' | | ... | Run Keywords -| | ... | Stop ODL Client | ${node} | /tmp -| | ... | ${use_odl_client}= | Set Variable | ${NONE} -| | ... | Set Global Variable | ${use_odl_client} +| | ... | Stop ODL Client | ${node} | /tmp | AND +| | ... | Set Global Variable | ${use_odl_client} | ${NONE} | | Stop Honeycomb service on DUTs | ${node} | Enable Honeycomb Feature diff --git a/resources/libraries/robot/honeycomb/slaac.robot b/resources/libraries/robot/honeycomb/slaac.robot index 1304c2b8ec..036d4d06ce 100644 --- a/resources/libraries/robot/honeycomb/slaac.robot +++ b/resources/libraries/robot/honeycomb/slaac.robot @@ -68,7 +68,7 @@ | | ... | \| ${node} \| ${interface} \| | | ... | | [Arguments] | ${node} | ${interface} -| | Run keyword and expect error | HoneycombError*404* +| | Run keyword and expect error | HoneycombError*40* | | ... | Get interface SLAAC oper data | ${node} | ${interface} | Honeycomb removes SLAAC configuration diff --git a/resources/templates/honeycomb/config_slaac.url b/resources/templates/honeycomb/config_slaac.url index 568ec765e6..5b363ffa8b 100644 --- a/resources/templates/honeycomb/config_slaac.url +++ b/resources/templates/honeycomb/config_slaac.url @@ -1 +1 @@ -/restconf/config/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/interfaces/
\ No newline at end of file +/restconf/config{odl_url_part}/hc2vpp-ietf-routing:routing/routing-instance/vpp-routing-instance/interfaces/
\ No newline at end of file |