X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FSxpBindingOriginsLib.robot;h=8d8d837727ef28d33ea9214245fa10406aa4198f;hb=744758a2a996c3921faed61dfcbcf2589b3e150b;hp=558d3bf90ba15aca0ff2c6b1910920a708659616;hpb=ff3688d31959c081dc25fd7a0db4176e50646072;p=integration%2Ftest.git

diff --git a/csit/libraries/SxpBindingOriginsLib.robot b/csit/libraries/SxpBindingOriginsLib.robot
index 558d3bf90b..8d8d837727 100644
--- a/csit/libraries/SxpBindingOriginsLib.robot
+++ b/csit/libraries/SxpBindingOriginsLib.robot
@@ -4,14 +4,15 @@ Library           ./Sxp.py
 Resource          ./SxpLib.robot
 
 *** Variables ***
-${REST_CONTEXT}    /restconf/operations/sxp-config-controller
+${CONFIG_REST_CONTEXT}    /restconf/operations/sxp-config-controller
 
 *** Keywords ***
 Revert To Default Binding Origins Configuration
+    [Arguments]    ${session}=session
     [Documentation]    Remove CLUSTER binding origin and set default priorities to default origins
-    BuiltIn.Run Keyword And Ignore Error    SxpBindingOriginsLib.Delete Binding Origin    CLUSTER
-    BuiltIn.Run Keyword And Ignore Error    SxpBindingOriginsLib.Update Binding Origin    LOCAL    1
-    BuiltIn.Run Keyword And Ignore Error    SxpBindingOriginsLib.Update Binding Origin    NETWORK    2
+    BuiltIn.Run Keyword And Ignore Error    SxpBindingOriginsLib.Delete Binding Origin    CLUSTER    session=${session}
+    BuiltIn.Run Keyword And Ignore Error    SxpBindingOriginsLib.Update Binding Origin    LOCAL    1    session=${session}
+    BuiltIn.Run Keyword And Ignore Error    SxpBindingOriginsLib.Update Binding Origin    NETWORK    2    session=${session}
 
 Get Binding Origins
     [Arguments]    ${session}=session
@@ -24,35 +25,37 @@ Add Binding Origin
     [Arguments]    ${origin}    ${priority}    ${session}=session
     [Documentation]    Add custom binding origin to configuration
     ${data} =    Sxp.Add Binding Origin Xml    ${origin}    ${priority}
-    SxpLib.Post To Controller    ${session}    add-binding-origin    ${data}    ${REST_CONTEXT}
+    SxpLib.Post To Controller    ${session}    path=add-binding-origin    data=${data}    rest_context=${CONFIG_REST_CONTEXT}
 
 Update Binding Origin
     [Arguments]    ${origin}    ${priority}    ${session}=session
     [Documentation]    Update binding origin in configuration
     ${data} =    Sxp.Update Binding Origin Xml    ${origin}    ${priority}
-    SxpLib.Post To Controller    ${session}    update-binding-origin    ${data}    ${REST_CONTEXT}
+    SxpLib.Post To Controller    ${session}    path=update-binding-origin    data=${data}    rest_context=${CONFIG_REST_CONTEXT}
 
 Delete Binding Origin
     [Arguments]    ${origin}    ${session}=session
     [Documentation]    Delete custom binding origin from configuration
     ${data} =    Sxp.Delete Binding Origin Xml    ${origin}
-    SxpLib.Post To Controller    ${session}    delete-binding-origin    ${data}    ${REST_CONTEXT}
+    SxpLib.Post To Controller    ${session}    path=delete-binding-origin    data=${data}    rest_context=${CONFIG_REST_CONTEXT}
 
 Should Contain Binding Origins
     [Arguments]    @{origins}
     [Documentation]    Test if data contain specified binding origins
     ${resp} =    SxpBindingOriginsLib.Get Binding Origins
-    : FOR    ${origin}    IN    @{origins}
-    \    ${out} =    Sxp.Find Binding Origin    ${resp.json()}    ${origin}
-    \    BuiltIn.Should Be True    ${out}    Missing origin: ${origin} in ${resp}
+    FOR    ${origin}    IN    @{origins}
+        ${out} =    Sxp.Find Binding Origin    ${resp.json()}    ${origin}
+        BuiltIn.Should Be True    ${out}    Missing origin: ${origin} in ${resp}
+    END
 
 Should Not Contain Binding Origins
     [Arguments]    @{origins}
     [Documentation]    Test if data DONT contain specified binding origins
     ${resp} =    SxpBindingOriginsLib.Get Binding Origins
-    : FOR    ${origin}    IN    @{origins}
-    \    ${out} =    Sxp.Find Binding Origin    ${resp.json()}    ${origin}
-    \    BuiltIn.Should Be Equal As Strings    False    ${out}    Not expected origin: ${origin} in ${resp}
+    FOR    ${origin}    IN    @{origins}
+        ${out} =    Sxp.Find Binding Origin    ${resp.json()}    ${origin}
+        BuiltIn.Should Be Equal As Strings    False    ${out}    Not expected origin: ${origin} in ${resp}
+    END
 
 Should Contain Binding Origin With Priority
     [Arguments]    ${origin}    ${priority}