Code Review / integration / test.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "removing failing tests"
[integration/test.git] / test / csit / suites / karaf-compatible / 020__MD_SAL_NSF_OF13 / 040__restconf_frm.txt
diff --git a/test/csit/suites/karaf-compatible/020__MD_SAL_NSF_OF13/040__restconf_frm.txt b/test/csit/suites/karaf-compatible/020__MD_SAL_NSF_OF13/040__restconf_frm.txt
index 6f847fa48e71cffc8e006fa1f2085ad1b0edb1d8..cb6914f70a07abeed9bec109c285ec5d7ded2add 100644 (file)
--- a/test/csit/suites/karaf-compatible/020__MD_SAL_NSF_OF13/040__restconf_frm.txt
+++ b/test/csit/suites/karaf-compatible/020__MD_SAL_NSF_OF13/040__restconf_frm.txt
@@ -12,7 +12,7 @@ Resource          ../../../libraries/Utils.txt
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
 ${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${BODY1}          <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.10.1/32</ipv4-destination></match><id>139</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><dec-nw-ttl/></action></apply-actions></instruction></instructions></flow>
-${BODY2}          <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>152</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>1</output-node-connector><max-length>60</max-length></output-action></action></apply-actions></instruction></instructions></flow>
+${BODY2}          <flow xmlns="urn:opendaylight:flow:inventory"><priority>2</priority><flow-name>Foo</flow-name><match><ethernet-match><ethernet-type><type>2048</type></ethernet-type></ethernet-match><ipv4-destination>10.0.20.1/32</ipv4-destination></match><id>139</id><table_id>2</table_id><instructions><instruction><order>0</order><apply-actions><action><order>0</order><output-action><output-node-connector>1</output-node-connector><max-length>60</max-length></output-action></action></apply-actions></instruction></instructions></flow>
 
 *** Test Cases ***
 Add a flow - Sending IPv4 Dest Address and Eth type
@@ -24,7 +24,7 @@ Add a flow - Sending IPv4 Dest Address and Eth type
 Verify after adding flow config - Sending IPv4 Dest Address and Eth type
     [Documentation]    Verify the flow
     [Tags]    Get
-    ${resp}    Get    session    ${REST_CON}/node/openflow:1/table/2
+    ${resp}    RequestsLibrary.Get    session    ${REST_CON}/node/openflow:1/table/2
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    139
 
@@ -32,62 +32,42 @@ Verify after adding flow operational - Sending IPv4 Dest Address and Eth type
     [Documentation]    Verify the flow
     [Tags]    Get
     ${elements}=    Create List    10.0.10.1
-    Wait Until Keyword Succeeds    30s    2s    Check For Elements At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
+    Wait Until Keyword Succeeds    60s    2s    Check For Elements At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
 
-Remove a flow - - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Remove a flow
-    [Tags]    remove
-    ${resp}    Delete    session    ${REST_CON}/node/openflow:1/table/2/flow/139
-    Should Be Equal As Strings    ${resp.status_code}    200
-
-Verify after deleting flow config - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Verify the flow
-    [Tags]    Get
-    ${resp}    Get    session    ${REST_CON}/node/openflow:1/table/2
-    Should Be Equal As Strings    ${resp.status_code}    200
-    Should Not Contain    ${resp.content}    139
-    # Reason in using high time is, I used STOPWATCH to check the timer after deleting the flow config
-
-Verify after deleting flow operational - Sending IPv4 Dest Address and Eth type
-    [Documentation]    Verify the flow
-    [Tags]    Get
-    ${elements}=    Create List    10.0.10.1
-    Wait Until Keyword Succeeds    40s    2s    Check For Elements Not At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
-
-Add a flow - Output to physical port#
+Modify a flow - Output to physical port#
     [Documentation]    Push a flow through REST-API
     [Tags]    Push
-    ${resp}    Putxml    session    ${REST_CON}/node/openflow:1/table/2/flow/152    data=${BODY2}
+    ${resp}    Putxml    session    ${REST_CON}/node/openflow:1/table/2/flow/139    data=${BODY2}
     Should Be Equal As Strings    ${resp.status_code}    200
 
-Verify after adding flow config - Output to physical port#
+Verify after modifying flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]    Get
-    ${resp}    Get    session    ${REST_CON}/node/openflow:1/table/2
+    ${resp}    RequestsLibrary.Get    session    ${REST_CON}/node/openflow:1/table/2
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Contain    ${resp.content}    152
+    Should Contain    ${resp.content}    10.0.20.1
 
-Verify after adding flow operational - Output to physical port#
+Verify after modifying flow operational - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]    Get
     ${elements}=    Create List    10.0.20.1
-    Wait Until Keyword Succeeds    30s    2s    Check For Elements At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
+    Wait Until Keyword Succeeds    90s    2s    Check For Elements At URI    ${REST_OPR}/node/openflow:1/table/2/flow/139    ${elements}
 
 Remove a flow - Output to physical port#
     [Documentation]    Remove a flow
     [Tags]    remove
-    ${resp}    Delete    session    ${REST_CON}/node/openflow:1/table/2/flow/152
+    ${resp}    RequestsLibrary.Delete    session    ${REST_CON}/node/openflow:1/table/2/flow/139
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting flow config - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]    Get
-    ${resp}    Get    session    ${REST_CON}/node/openflow:1/table/2
+    ${resp}    RequestsLibrary.Get    session    ${REST_CON}/node/openflow:1/table/2
     Should Be Equal As Strings    ${resp.status_code}    200
-    Should Not Contain    ${resp.content}    152
+    Should Not Contain    ${resp.content}    139
 
 Verify after deleting flow operational - Output to physical port#
     [Documentation]    Verify the flow
     [Tags]    Get
     ${elements}=    Create List    10.0.20.1
-    Wait Until Keyword Succeeds    40s    2s    Check For Elements Not At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
+    Wait Until Keyword Succeeds    60s    2s    Check For Elements Not At URI    ${REST_OPR}/node/openflow:1/table/2    ${elements}
Integration test