Modify vlanmap and dataflow robot files for VTN Manager RESTCONF

[integration/test.git] / csit / suites / vtn / VTN_Mgr_OF10 / 010__vtn_vlanmap.robot

diff --git a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot
index c0196a7ac7c46d60425956451e6a3d0ad4679818..9651f75ebf64168eb9b1943a46e53904da1535ad 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot
@@ -2,7 +2,6 @@
 Documentation     Test suite for VTN Manager using OF10
 Suite Setup       Start SuiteVtnMaTest
 Suite Teardown    Stop SuiteVtnMaTest
-Force Tags        exclude
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Test Cases ***
@@ -24,11 +23,11 @@ Check if switch3 detected
 
 Add a vtn Tenant1
     [Documentation]    Add a vtn Tenant1
-    Add a vtn    Tenant1    {}
+    Add a vtn    Tenant1
 
 Add a vBridge vBridge1
     [Documentation]    Add a vBridge vBridge1 in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge1    {}
+    Add a vBridge    Tenant1    vBridge1
 
 Add a vlanmap for bridge1
     [Documentation]    Add a Vlanmap for bridge1 in vtn Tenant1
@@ -36,7 +35,7 @@ Add a vlanmap for bridge1
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge2    {}
+    Add a vBridge    Tenant1    vBridge2
 
 Add a vlanmap for bridge2
     [Documentation]    Add a Vlanmap for bridge1 in vtn Tenant1
@@ -44,23 +43,23 @@ Add a vlanmap for bridge2
 
 Get vlanflow h1 h3
     [Documentation]    ping h1 to h3
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Get vlanflow h1 h5
     [Documentation]    ping h1 to h5
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h1    h5
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h5
 
 Get vlanflow h2 h4
     [Documentation]    ping h2 to h4
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h2    h4
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Get vlanflow h2 h6
     [Documentation]    ping h2 to h6
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h2    h6
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h6
 
 Get vlanflow h2 h5
     [Documentation]    ping h2 to h5
-    Mininet Ping Should Not Succeed    h2    h5
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Not Succeed    h2    h5
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1