Modify vlanmap and dataflow robot files for VTN Manager RESTCONF

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

diff --git a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap.robot
index e15104d751c6b264701a4c173d3e0c5e2cf426c9..ffc2af0cdbed5a677bed40584257e5cb97fdb5e5 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap.robot
@@ -2,7 +2,6 @@
 Documentation     Test suite for VTN Manager using OF13
 Suite Setup       Start SuiteVtnMaTest
 Suite Teardown    Stop SuiteVtnMaTest
 Documentation     Test suite for VTN Manager using OF13
 Suite Setup       Start SuiteVtnMaTest
 Suite Teardown    Stop SuiteVtnMaTest

-Force Tags        exclude 

 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** Test Cases ***
 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
     [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 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
 
 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 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 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
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1