Fixing mininet reads so that we always clear mininet

[integration/test.git] / test / csit / suites / base-of13 / 070__Flows_OF13 / 315__timeout_vlan_pcp_vlan.txt

diff --git a/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt b/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt
index 1d18594e4282239f73d21966d31d355a94453821..d2c2990caa8f5e5b5c63bdf725bafc7db3c9fba2 100644 (file)
--- a/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt
+++ b/test/csit/suites/base-of13/070__Flows_OF13/315__timeout_vlan_pcp_vlan.txt
@@ -1,6 +1,6 @@
 *** Settings ***
 Documentation     Test suite for Time our values and Vlan and PCP Vlan
-Suite Setup       Create Session    session    http://${CONTROLLER}:8080    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
 Suite Teardown    Delete All Sessions
 Library           SSHLibrary
 Library           Collections
@@ -15,7 +15,7 @@ ${REST_OPR}       /restconf/operational/opendaylight-inventory:nodes
 ${FILE}           ${CURDIR}/../../../variables/xmls/f16.xml
 ${FLOW}           139
 ${TABLE}          2
-@{FLOWELMENTS}    table=2    idle_timeout=3400    hard_timeout=1200    priority=2    ip    dl_vlan=78    dl_vlan_pcp=3
+@{FLOWELMENTS}    table=2    idle_timeout=300    hard_timeout=600    priority=16    dl_vlan=78    dl_vlan_pcp=3
 ...               dl_src=00:00:00:11:23:ae    dl_dst=ff:ff:29:01:19:61    dec_ttl
 
 *** Test Cases ***
@@ -37,12 +37,11 @@ Verify after adding flow config - Output to physical port#
 Verify flows after adding flow config on OVS
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
+    sleep    1
     write    dpctl dump-flows -O OpenFlow13
-    ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchoutput}    Read Until     mininet>
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
-    \    should Contain    ${switchouput}    ${flowElement}
+    \    should Contain    ${switchoutput}    ${flowElement}
 
 Remove a flow - Output to physical port#
     [Documentation]    Remove a flow
@@ -59,9 +58,8 @@ Verify after deleting flow config - Output to physical port#
 Verify flows after deleting flow config on OVS
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    write    dpctl dump-flows -O OpenFlow13
-    ${body}    OperatingSystem.Get File    ${FILE}
     Sleep    1
-    ${switchouput}    Read
+    write    dpctl dump-flows -O OpenFlow13
+    ${switchoutput}    Read Until     mininet>
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
-    \    should Not Contain    ${switchouput}    ${flowElement}
+    \    should Not Contain    ${switchoutput}    ${flowElement}