Merge "removing failing tests"

[integration/test.git] / test / csit / suites / karaf-compatible / 040__AD_SAL_NSF_OF13 / 040__flow_programmer.txt

diff --git a/test/csit/suites/karaf-compatible/040__AD_SAL_NSF_OF13/040__flow_programmer.txt b/test/csit/suites/karaf-compatible/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
index 95c43a715708a9c31e2541d798c59df4b7f1f627..000d24db519f83e29a4d33d05ae8545b7313a836 100644 (file)
--- a/test/csit/suites/karaf-compatible/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
+++ b/test/csit/suites/karaf-compatible/040__AD_SAL_NSF_OF13/040__flow_programmer.txt
@@ -1,12 +1,12 @@
 *** Settings ***
 Documentation     Test suite for Flow Programmer
-Suite Setup       Create Session   session   http://${CONTROLLER}:${RESTPORT}  auth=${AUTH}   headers=${HEADERS}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTPORT}    auth=${AUTH}    headers=${HEADERS}
 Suite Teardown    Delete All Sessions
 Library           Collections
 Library           ../../../libraries/RequestsLibrary.py
 Library           ../../../libraries/Common.py
 Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.txt      
+Resource          ../../../libraries/Utils.txt
 
 *** Variables ***
 ${name}           flow1
@@ -18,41 +18,44 @@ ${REST_CONTEXT_ST}    /controller/nb/v2/statistics
 *** Test Cases ***
 Add a flow
     [Documentation]    Add a flow, list to validate the result.
-    [Tags]    adsal 
+    [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}
-    ${resp}    Put    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}    data=${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}    Get    session    ${REST_CONTEXT}/${CONTAINER}
+    ${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}
+
 Check flow in flow stats
     [Documentation]    Show flow stats and validate result
-    [Tags]    adsal 
+    [Tags]    adsal
     ${elements}=    Create List    10.0.0.1
     Wait Until Keyword Succeeds    90s    2s    Check For Elements At URI    ${REST_CONTEXT_ST}/${CONTAINER}/flow    ${elements}
+
 Remove a flow
     [Documentation]    Remove a flow, list to validate the result.
-    [Tags]    adsal 
+    [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}
-    ${resp}    Delete    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}
+    ${resp}    RequestsLibrary.Delete    session    ${REST_CONTEXT}/${CONTAINER}/node/OF/${node_id}/staticFlow/${name}
     Should Be Equal As Strings    ${resp.status_code}    204
-    ${resp}    Get    session    ${REST_CONTEXT}/${CONTAINER}
+    ${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}
+
 Check flow is not in flow stats
     [Documentation]    Show flow stats and validate result
-    [Tags]    adsal 
+    [Tags]    adsal
     ${elements}=    Create List    10.0.0.1
     Wait Until Keyword Succeeds    60s    2s    Check For Elements Not At URI    ${REST_CONTEXT_ST}/${CONTAINER}/flow    ${elements}