From: Luis Gomez <luis.gomez@ericsson.com>
Date: Sat, 7 Dec 2013 00:28:33 +0000 (-0800)
Subject: Some cleaning here as delete flows is not supported by mn 2.0.0
X-Git-Tag: release/helium~113^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d37608d90318359602cb72f088bbdee2af27f123;p=integration%2Ftest.git

Some cleaning here as delete flows is not supported by mn 2.0.0

Change-Id: Ib96b85e0c4b6d886c364aab959edebfb35b7be98
Signed-off-by: Luis Gomez <luis.gomez@ericsson.com>
---

diff --git a/test/csit/suites/base/030__arp_handler.txt b/test/csit/suites/base/030__arp_handler.txt
index db4797f7fa..8366967197 100644
--- a/test/csit/suites/base/030__arp_handler.txt
+++ b/test/csit/suites/base/030__arp_handler.txt
@@ -60,10 +60,4 @@ Remove a subnet
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Not Contain Value    ${content}    ${body}
-Remove flows
-    [Documentation]    Remove flows generated by simple fwd
-    [Tags]   Get
-    Write   dpctl del-flows
-    Sleep   1
-    Read
 
diff --git a/test/csit/suites/base/035__forwarding_manager.txt b/test/csit/suites/base/035__forwarding_manager.txt
index fba7b4541c..8c78cf389a 100644
--- a/test/csit/suites/base/035__forwarding_manager.txt
+++ b/test/csit/suites/base/035__forwarding_manager.txt
@@ -39,10 +39,4 @@ Remove a static route
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Not Contain Value    ${content}    ${body}
-Remove flows
-    [Documentation]    Remove flows generated by simple fwd
-    [Tags]   Get
-    Write   dpctl del-flows
-    Sleep   1
-    Read
 
diff --git a/test/csit/suites/base/050__OVSDB_plugin.txt b/test/csit/suites/base/050__OVSDB_plugin.txt
index c2995b6141..30015e555b 100644
--- a/test/csit/suites/base/050__OVSDB_plugin.txt
+++ b/test/csit/suites/base/050__OVSDB_plugin.txt
@@ -72,9 +72,9 @@ Add s4 ports
 Ping h1 to h4
     [Documentation]    Ping h1 to h4, verify no packet loss
     [Tags]   Get
-    Sleep   40
-    Write   h1 ping -c 3 h4
-    Sleep   6
+    Sleep   5
+    Write   h1 ping -c 30 h4
+    Sleep   35
     ${result}    Read
     Should Contain   ${result}   64 bytes
 Delete s4 ports
@@ -119,10 +119,3 @@ Disconnect mininet
     ${result}    To JSON    ${resp.content}
     ${content}    Get From Dictionary    ${result}    ${key}
     List Should Not Contain Value    ${content}    ${body}
-Remove flows
-    [Documentation]    Remove flows generated by simple fwd
-    [Tags]   Get
-    Write   dpctl del-flows
-    Sleep   1
-    Read
-
diff --git a/test/csit/suites/base/__init__.txt b/test/csit/suites/base/__init__.txt
index fdc9606881..23da38c885 100644
--- a/test/csit/suites/base/__init__.txt
+++ b/test/csit/suites/base/__init__.txt
@@ -17,11 +17,10 @@ Start Suite
     Sleep    2
     Write    ${start}
     Sleep    65
-    Write   dpctl del-flows
-    Sleep   1
     Read
 Stop Suite
     Log    Stop the test on the base edition
+    Read
     Write    exit 
     Sleep    2
     Read