Modify vlanmap and dataflow robot files for VTN Manager RESTCONF

[integration/test.git] / csit / suites / vtn / VTN_Mgr_OF13 / 010__vtn_vlanmap_dataflow.robot

diff --git a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot
index eec0281a14c52af63ea6ea5c861e9b21620a56bd..5f95d1e3402469bb3e5b03f40f7e061ea78f1a69 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot
@@ -7,7 +7,7 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 *** Test Cases ***
 Start topology
     [Documentation]    Add a vlan topology
-    Start vlan_topo
+    Start vlan_topo    OF13
 
 Check if switch1 detected
     [Documentation]    Check if openflow:1 is detected
@@ -23,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_vlan
     [Documentation]    Add a vBridge vBridge1_vlan in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge1_vlan    {}
+    Add a vBridge    Tenant1    vBridge1_vlan
 
 Add a vlanmap for vBridge1_vlan
     [Documentation]    Add a Vlanmap for vBridge1_vlan in vtn Tenant1
@@ -35,7 +35,7 @@ Add a vlanmap for vBridge1_vlan
 
 Add a vBridge vBridge2_vlan
     [Documentation]    Add a vBridge vBridge2_vlan in vtn Tenant1
-    Add a vBridge    Tenant1    vBridge2_vlan    {}
+    Add a vBridge    Tenant1    vBridge2_vlan
 
 Add a vlanmap for vBridge2_vlan
     [Documentation]    Add a Vlanmap for vBridge2_vlan in vtn Tenant1
@@ -43,11 +43,11 @@ Add a vlanmap for vBridge2_vlan
 
 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
 
 Verify data flow details for vlanmap vBridge1_vlan
     [Documentation]    Verify the data flows for the specified tenant and vBridge1_vlan
@@ -55,11 +55,11 @@ Verify data flow details for vlanmap vBridge1_vlan
 
 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
 
 Verify data flow details for vlanmap vBridge2_vlan
     [Documentation]    Verify the data flows for the specified tenant and vBridge2_vlan
@@ -67,7 +67,7 @@ Verify data flow details for vlanmap vBridge2_vlan
 
 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