Change from sleep to Read Until

- Speed up test case and better using Read Until than Sleep

Change-Id: I322d54854adb0fde7b88d030349b0d8d08d0e242
Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/300__dst_ip.txt b/test/csit/suites/karaf-all/070__Flows_OF13/300__dst_ip.txt
index 0cb793aef32ad74989f48ae2f1ff141805ee8360..6d49688e85e15a0b4dc09abc0c823220d3d50280 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/300__dst_ip.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/300__dst_ip.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/301__src_ip.txt b/test/csit/suites/karaf-all/070__Flows_OF13/301__src_ip.txt
index 6e6e8c85c2c6d04be1eda3bf2b90c3b977531731..16cd6d6af031b68c48e457a2f842d43415b295fd 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/301__src_ip.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/301__src_ip.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/302__dst_mac.txt b/test/csit/suites/karaf-all/070__Flows_OF13/302__dst_mac.txt
index 369952cb152ac0c9c631e6da3e5d5c1e4f846811..1b61f74b601aca1b35beaa5ed3c12a475cb65419 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/302__dst_mac.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/302__dst_mac.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/304__eth_ip_port.txt b/test/csit/suites/karaf-all/070__Flows_OF13/304__eth_ip_port.txt
index c10b26b646800c5f2b4a34a89457577fb649f44e..2177cecd50a695f1b5fd39844478d8a91563b8c0 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/304__eth_ip_port.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/304__eth_ip_port.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/306__eth_ip_qos.txt b/test/csit/suites/karaf-all/070__Flows_OF13/306__eth_ip_qos.txt
index d315d77ea418f0865c1a3bf2d8583535e7a72a81..0df55e402e8c2e5cf5dc347dbc9b7ab082cb5df6 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/306__eth_ip_qos.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/306__eth_ip_qos.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt b/test/csit/suites/karaf-all/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt
index e0b73b6e6230af070b0a65899c8e85706daebe87..6683e049330f043bf2f760c8983b72855813cba3 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/307__eth_ip_qos_port_tcpport.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt b/test/csit/suites/karaf-all/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt
index 272ec358d960ddae02adefc133be848f2c835183..1c0cc7dc770c9741df11bf15d3a07d7de27be14d 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/309__eth_ip_qos_sctp.txt b/test/csit/suites/karaf-all/070__Flows_OF13/309__eth_ip_qos_sctp.txt
index 5ccff7690898b75dcd09c07373865f45bf814d83..c2504eef1c883af95e0b16eac6c2de171d9c4349 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/309__eth_ip_qos_sctp.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/309__eth_ip_qos_sctp.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/310__eth_ip_qos_icmp.txt b/test/csit/suites/karaf-all/070__Flows_OF13/310__eth_ip_qos_icmp.txt
index 820fd99d9bdd4d472db65f9cbdbe5edd308ac1d4..25a9e410e0efb8b67a7d5d385a7b1b491435b893 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/310__eth_ip_qos_icmp.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/310__eth_ip_qos_icmp.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/311__eth_arp.txt b/test/csit/suites/karaf-all/070__Flows_OF13/311__eth_arp.txt
index 49f15dcfc367a221874006bb9a83214f79e4e89c..104277ec99c6bf342e92c4b537a5acb1baf8fc46 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/311__eth_arp.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/311__eth_arp.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/312__eth_arp_transport.txt b/test/csit/suites/karaf-all/070__Flows_OF13/312__eth_arp_transport.txt
index 9e4faefb314bd2cb7c7ba2ce62bf9e33f5659819..410538c05d3368d65db4356a7b7056f3a956879c 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/312__eth_arp_transport.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/312__eth_arp_transport.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/313__eth_arp_transport_hardware.txt b/test/csit/suites/karaf-all/070__Flows_OF13/313__eth_arp_transport_hardware.txt
index ee7bdb8e6dd8f6a02d9c2cdf09d25c7ca45c6aae..ca10e535a952947875f664bb5e718dc57066b0b5 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/313__eth_arp_transport_hardware.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/313__eth_arp_transport_hardware.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/314__eth_vlan.txt b/test/csit/suites/karaf-all/070__Flows_OF13/314__eth_vlan.txt
index a2d65302c636a536d6d028879ce759c55638578c..4e7cddd9bb454b1f9670974c5c5800a66492ceb9 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/314__eth_vlan.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/314__eth_vlan.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/316__eth_mpls_tc_bos.txt b/test/csit/suites/karaf-all/070__Flows_OF13/316__eth_mpls_tc_bos.txt
index 2adc23884f231010688c5700ae0cd8da5fb5570f..8ace0905879a5e82137670e640928bb4e9fc0957 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/316__eth_mpls_tc_bos.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/316__eth_mpls_tc_bos.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/317__eth_ipv6.txt b/test/csit/suites/karaf-all/070__Flows_OF13/317__eth_ipv6.txt
index c8de82fb84135291e0af95f0b61e38c6b328bd79..fb31499040300e2c3a3493e7c89af55ae9666cd1 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/317__eth_ipv6.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/317__eth_ipv6.txt
@@ -36,11 +36,10 @@ 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
+    Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/318__metadata.txt b/test/csit/suites/karaf-all/070__Flows_OF13/318__metadata.txt
index ef5daefe0e02dacac16804de55c54d038b9c0701..84084bd9f69746265dfd4405fe74e929b9213887 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/318__metadata.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/318__metadata.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/319__metadata_mask.txt b/test/csit/suites/karaf-all/070__Flows_OF13/319__metadata_mask.txt
index 7958869e4d68d084a4b11be298e6d835c04b16fe..e0ebe04f21590e371b4b16ab0fb46da8b8f62056 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/319__metadata_mask.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/319__metadata_mask.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/320__ipv6_meta_qos_udp.txt b/test/csit/suites/karaf-all/070__Flows_OF13/320__ipv6_meta_qos_udp.txt
index f76fc6f1855185112b36e729786c5554f4df65d1..460bb8f5e1ff0336e3c88b3c55a5dc76c6c7de0c 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/320__ipv6_meta_qos_udp.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/320__ipv6_meta_qos_udp.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt b/test/csit/suites/karaf-all/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt
index 8bf00b56602da815682471bc130bfd0acfc29176..887e5858f04954515f8bb7d93b43298237abb6e6 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/321__ipv6_meta_qos_tcp.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/322__ipv6_flow.txt b/test/csit/suites/karaf-all/070__Flows_OF13/322__ipv6_flow.txt
index e681048e4394f84d4f48a280842e975e02374068..a633e285cccca31505efc01b760ed43c447a3d80 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/322__ipv6_flow.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/322__ipv6_flow.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/323__tunnel.txt b/test/csit/suites/karaf-all/070__Flows_OF13/323__tunnel.txt
index 0c9dddb2cbfd871f15eae3960ab1b08a6ea2b05b..702e999a5de1b713a2d60c2c0b8e3e831a45030b 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/323__tunnel.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/323__tunnel.txt
@@ -39,8 +39,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -62,7 +61,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}

diff --git a/test/csit/suites/karaf-all/070__Flows_OF13/324__ipv6_flow_label.txt b/test/csit/suites/karaf-all/070__Flows_OF13/324__ipv6_flow_label.txt
index d2bf2f91db606804f209bc0dd23adc8ca5e8ca82..ac1fa4b743c829c3dd2b3676705189a37f5bd6f4 100644 (file)
--- a/test/csit/suites/karaf-all/070__Flows_OF13/324__ipv6_flow_label.txt
+++ b/test/csit/suites/karaf-all/070__Flows_OF13/324__ipv6_flow_label.txt
@@ -40,8 +40,7 @@ Verify flows after adding flow config on OVS
     sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Contain    ${switchouput}    ${flowElement}
 
@@ -63,7 +62,6 @@ Verify flows after deleting flow config on OVS
     Sleep    1
     write    dpctl dump-flows -O OpenFlow13
     ${body}    OperatingSystem.Get File    ${FILE}
-    Sleep    1
-    ${switchouput}    Read
+    ${switchouput}    Read Until    >
     : FOR    ${flowElement}    IN    @{FLOWELMENTS}
     \    should Not Contain    ${switchouput}    ${flowElement}