diff options
4 files changed, 6 insertions, 7 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 diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot index 3b5f365758..7f229be65c 100644 --- a/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot +++ b/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot @@ -35,7 +35,7 @@ *** Test Cases *** | TC01: Honeycomb can configure SLAAC -| | [Documentation] | Checks if Honeycomb can congigure SLAAC. +| | [Documentation] | Checks if Honeycomb can configure SLAAC. | | ... | | Given SLAAC Operational Data From Honeycomb Should Be empty | ${node} | | ... | ${interface} @@ -56,7 +56,7 @@ | | ... | ${interface} | TC03: Honeycomb can configure SLAAC with suppress link layer disabled -| | [Documentation] | Checks if Honeycomb can congigure SLAAC. +| | [Documentation] | Checks if Honeycomb can configure SLAAC. | | ... | | [Teardown] | SLAAC test teardown | ${node} | ${interface} | | ... |