X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fcsit%2Fsuites%2Fopenflowplugin%2FAD_SAL_NSF_OF10%2F040__flow_programmer.robot;fp=test%2Fcsit%2Fsuites%2Fopenflowplugin%2FAD_SAL_NSF_OF10%2F040__flow_programmer.robot;h=9d0bc242f107898e3012ac6c0947c0c9d20b7211;hb=8e0ab6442b34b051b8626b5274b8d52eec0fd8ba;hp=b7b45079e21e451989e7359bf4cce4aa46ab9b0c;hpb=ec154c22cfcb10e50b74a79554ce57ec7a0686a0;p=integration%2Ftest.git

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot
index b7b45079e2..9d0bc242f1 100644
--- a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot
+++ b/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot
@@ -3,14 +3,13 @@ Documentation     Test suite for Flow Programmer
 Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
-Library           ../../../libraries/RequestsLibrary.py
+Library           RequestsLibrary
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
 ${name}           flow1
-${key}            flowConfig
 ${node_id}        00:00:00:00:00:00:00:02
 ${REST_CONTEXT}    /controller/nb/v2/flowprogrammer
 ${REST_CONTEXT_ST}    /controller/nb/v2/statistics
@@ -19,17 +18,15 @@ ${REST_CONTEXT_ST}    /controller/nb/v2/statistics
 Add a flow
     [Documentation]    Add a flow, list to validate the result.
     [Tags]    adsal
-    ${node}    Create Dictionary    type=OF    id=${node_id}
-    ${actions}    Create List    OUTPUT=1
-    ${body}    Create Dictionary    name=${name}    installInHw=true    node=${node}
-    ...    priority=1    etherType=0x800    nwDst=10.0.0.1/32    actions=${actions}
+    ${body}    Set Variable    {"installInHw":"true","name":"flow1","node":{"id":"00:00:00:00:00:00:00:02","type":"OF"},"priority":"1","etherType":"0x800","nwDst":"10.0.0.1/32","actions":["OUTPUT=1"]}
+    ${expected_content}    To JSON    ${body}
     ${resp}    RequestsLibrary.Put    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    201
     ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/${CONTAINER}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Contain Value    ${content}    ${body}
+    ${resp_content}    Get From Dictionary    ${result}    flowConfig
+    List Should Contain Value    ${resp_content}    ${expected_content}
 
 Check flow in flow stats
     [Documentation]    Show flow stats and validate result
@@ -42,15 +39,15 @@ Remove a flow
     [Tags]    adsal
     ${node}    Create Dictionary    type=OF    id=${node_id}
     ${actions}    Create List    OUTPUT=1
-    ${body}    Create Dictionary    name=${name}    installInHw=true    node=${node}
-    ...    priority=1    etherType=0x800    nwDst=10.0.0.1/32    actions=${actions}
+    ${expected_content}    Create Dictionary    name=${name}    installInHw=true    node=${node}    priority=1    etherType=0x800
+    ...    nwDst=10.0.0.1/32    actions=${actions}
     ${resp}    RequestsLibrary.Delete    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
     ${resp}    RequestsLibrary.Get    session    ${REST_CONTEXT}/${CONTAINER}
     Should Be Equal As Strings    ${resp.status_code}    200
     ${result}    To JSON    ${resp.content}
-    ${content}    Get From Dictionary    ${result}    ${key}
-    List Should Not Contain Value    ${content}    ${body}
+    ${resp_content}    Get From Dictionary    ${result}    flowConfig
+    List Should Not Contain Value    ${resp_content}    ${expected_content}
 
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result