Fix for VTN Manager CSIT test failures in VTN jenkins job

    * Reduce ping cycle from 10 to 1 in Mininet Ping Should Succeed and Mininet Ping Should Not Succeed function in VtnMaKeyword_li.robot file
    * Add Wait Until Keyword Succeeds(20s) in Verify flow test cases to get flowentries response from mininet
    * Add Wait Until Keyword Succeeds(20s) for Mininet Ping Should Succeed test cases.

Change-Id: Id99dcb8b7a5d1d99b664ddb93955ac4ce2f6d601
Signed-off-by: Karthik.S <siva-karthik@hcl.com>

diff --git a/csit/libraries/VtnMaKeywordsLi.robot b/csit/libraries/VtnMaKeywordsLi.robot
index 6eb581d035de6a62fd11ca6a241bb10bbc0e99c7..8ad03fbd612adf877cfcd0fcb09ac3fac90622a4 100644 (file)
--- a/csit/libraries/VtnMaKeywordsLi.robot
+++ b/csit/libraries/VtnMaKeywordsLi.robot
@@ -209,13 +209,15 @@ Add a vBridgeMacMapping
 
 Mininet Ping Should Succeed
     [Arguments]    ${host1}    ${host2}
-    Write    ${host1} ping -c 10 ${host2}
+    [Documentation]    Ping hosts to check connectivity
+    Write    ${host1} ping -c 1 ${host2}
     ${result}    Read Until    mininet>
     Should Contain    ${result}    64 bytes
 
 Mininet Ping Should Not Succeed
     [Arguments]    ${host1}    ${host2}
-    Write    ${host1} ping -c 10 ${host2}
+    [Documentation]    Ping hosts when there is no connectivity and check hosts is unreachable
+    Write    ${host1} ping -c 3 ${host2}
     ${result}    Read Until    mininet>
     Should Not Contain    ${result}    64 bytes
 

diff --git a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot
index a8c81e8fb480dbde51d94254d5f3e263e603a2fb..0eb967f29e0386e59c13ad4047d088b727ddaedd 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot
@@ -42,8 +42,8 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    openflow:3    s3-eth1
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
-    BuiltIn.Wait_Until_Keyword_Succeeds    20    1    Mininet Ping Should Succeed    h1    h3
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
@@ -66,8 +66,8 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge2    if4    openflow:3    s3-eth2
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
-    BuiltIn.Wait_Until_Keyword_Succeeds    20    1    Mininet Ping Should Succeed    h2    h4
+    [Documentation]    Verify Ping between hosts h1 and h3
+    Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Get flow
     [Documentation]    Get flow of a vtn Tenant1
@@ -76,7 +76,7 @@ Get flow
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    Verify FlowMacAddress    h2    h4    OF10
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify FlowMacAddress    h2    h4    OF10
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1

diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_macmap.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_macmap.robot
index 5946cb30764ca702da03153fd40816cce9ca3b8b..be99fab9a516e0e6696e1cb8b49d8b2afea52cd6 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_macmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_macmap.robot
@@ -36,8 +36,8 @@ Add a macmap for bridge1
     Add a vBridgeMacMapping    Tenant1    vBridge1    ${mac_map_data}
 
 Get macmapflow h3 h1
-    [Documentation]    ping h3 to h1
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h3    h1
+    [Documentation]    Verify Ping between hosts h3 and h1. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h3    h1
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1

diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot
index 902015e490e55c96d9663c88478e7a9c75c5e588..c5c37a88b9c1cf6f92108fb08d99af4a4b05994b 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot
@@ -48,8 +48,8 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    ${portmap_data}
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
-    Mininet Ping Should Succeed    h1    h3
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
@@ -78,8 +78,8 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge2    if4    ${portmap_data}
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
-    Mininet Ping Should Succeed    h2    h4
+    [Documentation]    Verify Ping between hosts h2 and h4. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s   Mininet Ping Should Succeed    h2    h4
 
 Get flow
     [Documentation]    Get flow of a vtn Tenant1
@@ -88,7 +88,7 @@ Get flow
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    Verify FlowMacAddress    h2    h4    OF10
+    Wait Until Keyword Succeeds    20s    1s   Verify FlowMacAddress    h2    h4    OF10
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1
@@ -99,7 +99,7 @@ Remove Portmap for If1
 
 Verify RemovedFlowMacAddress
     [Documentation]    flows will be deleted after the port map is removed
-    Verify RemovedFlowMacAddress    h1    h3    OF10
+    Wait Until Keyword Succeeds    20s    1s   Verify RemovedFlowMacAddress    h1    h3    OF10
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1

diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_dataflow.robot
index 8b81ae9de0ecac3e4b1caeb6f59bca9ef3361b42..5066153f1d88e9317d50e37a56d507c213349849 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_dataflow.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_dataflow.robot
@@ -48,8 +48,8 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    ${portmap_data}
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
-    Mininet Ping Should Succeed    h1    h3
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify data flow details For vBridge1
     [Documentation]    Verify the data flows for the specified tenant and bridge
@@ -82,17 +82,17 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge2    if4    ${portmap_data}
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
-    Mininet Ping Should Succeed    h2    h4
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Verify data flow details for vBridge2
     [Documentation]    Verify the data flows for the specified tenant and bridge
-    Verify Data Flows    Tenant1    vBridge2
+    Wait Until Keyword Succeeds    20s    1s    Verify Data Flows    Tenant1    vBridge2
 
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    Verify FlowMacAddress    h2    h4    OF10
+    Wait Until Keyword Succeeds    20s    1s    Verify FlowMacAddress    h2    h4    OF10
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1
@@ -103,7 +103,7 @@ Remove Portmap for If1
 
 Verify RemovedFlowMacAddress
     [Documentation]    flows will be deleted after the port map is removed
-    Verify RemovedFlowMacAddress    h1    h3    OF10
+    Wait Until Keyword Succeeds    20s    1s    Verify RemovedFlowMacAddress    h1    h3    OF10
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1

diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_flowfilter.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_flowfilter.robot
index eb808886521f86e0982e788a3f3afa29ce6d9a1c..c38d9eb388f52917face4d2bacccdeb08c37d9a7 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_flowfilter.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_flowfilter.robot
@@ -59,8 +59,8 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    ${portmap_data}
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
-    Mininet Ping Should Succeed    h1    h3
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
@@ -89,8 +89,8 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge1    if4    ${portmap_data}
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
-    Mininet Ping Should Succeed    h2    h4
+    [Documentation]    Verify Ping between hosts h2 and h4. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Add a macmap
     [Documentation]    Create a macmap on vBridge vBridge1
@@ -98,7 +98,7 @@ Add a macmap
 
 Get flow
     [Documentation]    Get flow of a vtn Tenant1
-    Get flow    Tenant1
+    Wait Until Keyword Succeeds    12s    1s    Get flow    Tenant1
 
 Add a flowcondition cond1
     [Documentation]    Create a flowcondition cond1
@@ -112,46 +112,46 @@ Add a flowcondition cond1
 Add a flowfilter with inet4src and inet4dst
     [Documentation]    Create a flowfilter with inet4 and Verify ping
     Add a flowfilter    Tenant1    vBridge1    if1    ${flowfilterInetdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with Icmp code
     [Documentation]    Create a flowfilter with icmp code and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfilterIcmpCodedata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with tpsrc and tpdst
     [Documentation]    Create a flowfilter with tpsrc and tpdst and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfilterTpsrcTpdstdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfilterDscpdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify Flow Entry for Inet Flowfilter
     [Documentation]    Verify Flow Entry for Inet Flowfilter
-    Verify Flow Entry for Inet Flowfilter
+    Wait Until Keyword Succeeds    20s    1s    Verify Flow Entry for Inet Flowfilter
 
 Add a flowfilter with vlanpcp
     [Documentation]    Create a flowfilter with vlanpcp and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfiltervlanpcp}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vtn with inet4src and inet4dst
     [Documentation]    Create a vtn_flowfilter with inet4 and Verify ping
     Add a flowfilter_vtn    Tenant1    ${vtn_flowfilterInetdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vbr with inet4src and inet4dst
     [Documentation]    Create a vbr_flowfilter with inet4 and Verify ping
     Add a flowfilter_vbr    Tenant1    vBridge1    ${vbr_flowfilterInetdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with inet4 for drop
     [Documentation]    Create a flowfilter with inet4 for drop action and Verify no pinging
     Add a flowfilter for drop    Tenant1    vBridge1    if1    ${flowfilterInetdropdata}    ${index}
-    Mininet Ping Should Not Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Not Succeed    h1    h3
 
 Delete a flowcondition
     [Documentation]    Delete a flowcondition

diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_pathpolicy.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_pathpolicy.robot
index c473ff4eb380935cbe9eaf9f15be4096946eb6ef..5bf3225a636cb1dbd4e2e7e53d0c5583cd88b106 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_pathpolicy.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager_pathpolicy.robot
@@ -56,13 +56,13 @@ Add a portmap for interface if2_path
     Add a portmap    Tenant_path    vBridge1    if2_path    ${portmap_data}
 
 Ping h1 to h2 before path policy
-    [Documentation]    Ping h1 to h2, verify no packet loss
-    Mininet Ping Should Succeed    h1    h2
+    [Documentation]    Verify Ping between hosts h1 and h2. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h2
 
 Verify flowEntryBeforePathPolicy
     [Documentation]    Checking Flows on switch s1 and s3
     [Tags]    exclude
-    Verify flowEntryPathPolicy    OF10    ${in_port}    ${out_before_pathpolicy}
+    Wait Until Keyword Succeeds    20s    1s    Verify flowEntryPathPolicy    OF10    ${in_port}    ${out_before_pathpolicy}
 
 Add a flowcondition flowcond_path
     [Documentation]    Create a flowcondition flowcond_path
@@ -91,13 +91,13 @@ Get a pathpolicy
     Get a pathpolicy
 
 Ping h1 to h2 after path policy
-    [Documentation]    Ping h1 to h2, verify no packet loss
-    Mininet Ping Should Succeed    h1    h2
+    [Documentation]    Verify Ping between hosts h1 and h2. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h2
 
 Verify flowEntryAfterPathPolicy
     [Documentation]    Checking Flows on switch s1 and s3
     [Tags]    exclude
-    Verify flowEntryPathPolicy    OF10    ${in_port}    ${out_after_pathpolicy}
+    Wait Until Keyword Succeeds    20s    1s    Verify flowEntryPathPolicy    OF10    ${in_port}    ${out_after_pathpolicy}
 
 Delete a pathmap
     [Documentation]    Delete a pathmap

diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_vlanmap.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_vlanmap.robot
index 483520565675d726c53e5e6c71717492998dca0a..c8f2f996c0309e96c3de7bb47e48808eafe990ee 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_vlanmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_vlanmap.robot
@@ -43,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

diff --git a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vbridge_portmapping_test.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vbridge_portmapping_test.robot
index 0a4723d0b7643afed7ee84bdbfd54ff4fce8115d..e346d7f21bb98bdeec765405bd9dda79b8300d3f 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vbridge_portmapping_test.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vbridge_portmapping_test.robot
@@ -42,7 +42,7 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    openflow:3    s3-eth1
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
     BuiltIn.Wait_Until_Keyword_Succeeds    20    1    Mininet Ping Should Succeed    h1    h3
 
 Add a vBridge vBridge2
@@ -66,7 +66,7 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge1    if4    openflow:3    s3-eth2
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
+    [Documentation]    Verify Ping between hosts h2 and h4. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
     BuiltIn.Wait_Until_Keyword_Succeeds    20    1    Mininet Ping Should Succeed    h2    h4
 
 Get flow
@@ -76,7 +76,7 @@ Get flow
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    Verify FlowMacAddress    h2    h4    OF13
+    BuiltIn.Wait_Until_Keyword_Succeeds    20    1    Verify FlowMacAddress    h2    h4    OF13
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1

diff --git a/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot b/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot
index 48f4a18085c1d175e3439d050fedfadc20bccf00..49c7030a7134bc1c451813c18171db4af8eb21b6 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot
@@ -50,12 +50,12 @@ Add a portmap for interface if2_path
     Add a portmap    Tenant_path    vBridge1    if2_path    openflow:3    s3-eth3
 
 Ping h1 to h2 before path policy
-    [Documentation]    Ping h1 to h2, verify no packet loss
+    [Documentation]    Verify Ping between hosts h1 and h2. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
     Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h2
 
 Verify flowEntryBeforePathPolicy
     [Documentation]    Checking Flows on switch s1 and s3
-    Verify flowEntryPathPolicy    OF13    ${in_port}    ${out_before_pathpolicy}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowEntryPathPolicy    OF13    ${in_port}    ${out_before_pathpolicy}
 
 Add a flowcondition flowcond_path
     [Documentation]    Create a flowcondition flowcond_path
@@ -74,12 +74,12 @@ Get a pathpolicy
     Get a pathpolicy    ${policy_id}
 
 Ping h1 to h2 after path policy
-    [Documentation]    Ping h1 to h2, verify no packet loss
+    [Documentation]    Verify Ping between hosts h1 and h2.
     Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h2
 
 Verify flowEntryAfterPathPolicy
     [Documentation]    Checking Flows on switch s1 and s3
-    Verify flowEntryPathPolicy    OF13    ${in_port}    ${out_after_pathpolicy}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowEntryPathPolicy    OF13    ${in_port}    ${out_after_pathpolicy}
 
 Delete a pathmap
     [Documentation]    Delete a pathmap

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_macmap.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_macmap.robot
index 5946cb30764ca702da03153fd40816cce9ca3b8b..5d2e9206ff1016c7ef80ee3b32fa2323514c1693 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_macmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_macmap.robot
@@ -36,8 +36,8 @@ Add a macmap for bridge1
     Add a vBridgeMacMapping    Tenant1    vBridge1    ${mac_map_data}
 
 Get macmapflow h3 h1
-    [Documentation]    ping h3 to h1
-    Wait Until Keyword Succeeds    10s    2s    Mininet Ping Should Succeed    h3    h1
+    [Documentation]    Verify ping h3 to h1
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h3    h1
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager.robot
index 41371d6072d9ac8b2ea635e71ea6efa1a5fc604c..56c04cddfcafbcbdade12cd4ae1952a82d8acccc 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager.robot
@@ -48,8 +48,8 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    ${portmap_data}
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
-    Mininet Ping Should Succeed    h1    h3
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
@@ -78,8 +78,8 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge1    if4    ${portmap_data}
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
-    Mininet Ping Should Succeed    h2    h4
+    [Documentation]    Verify Ping between hosts h2 and h4.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Get flow
     [Documentation]    Get flow of a vtn Tenant1
@@ -88,7 +88,7 @@ Get flow
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    Verify FlowMacAddress    h2    h4    OF13
+    Wait Until Keyword Succeeds    20s    1s    Verify FlowMacAddress    h2    h4    OF13
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1
@@ -99,7 +99,7 @@ Remove Portmap for If1
 
 Verify RemovedFlowMacAddress
     [Documentation]    flows will be deleted after the port map is removed
-    Verify RemovedFlowMacAddress    h1    h3    OF13
+    Wait Until Keyword Succeeds    20s    1s    Verify RemovedFlowMacAddress    h1    h3    OF13
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_dataflow.robot
index 12d7c8a0aba3d9fccfe4f0b92df77d1e188e5f4b..d60dc6970b6629cd6e742b5e62789f72edb9969b 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_dataflow.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_dataflow.robot
@@ -48,12 +48,12 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    ${portmap_data}
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
-    Mininet Ping Should Succeed    h1    h3
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify data flow details For vBridge1
     [Documentation]    Verify the data flows for the specified tenant and bridge
-    Verify Data Flows    Tenant1    vBridge1
+    Wait Until Keyword Succeeds    20s    1s    Verify Data Flows    Tenant1    vBridge1
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
@@ -82,17 +82,17 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge2    if4    ${portmap_data}
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
-    Mininet Ping Should Succeed    h2    h4
+    [Documentation]    Verify Ping between hosts h2 and h4.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Verify data flow details for vBridge2
     [Documentation]    Verify the data flows for the specified tenant and bridge
-    Verify Data Flows    Tenant1    vBridge2
+    Wait Until Keyword Succeeds    20s    1s    Verify Data Flows    Tenant1    vBridge2
 
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    Verify FlowMacAddress    h2    h4    OF13
+    Wait Until Keyword Succeeds    20s    1s    Verify FlowMacAddress    h2    h4    OF13
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1
@@ -103,7 +103,7 @@ Remove Portmap for If1
 
 Verify RemovedFlowMacAddress
     [Documentation]    flows will be deleted after the port map is removed
-    Verify RemovedFlowMacAddress    h1    h3    OF13
+    Wait Until Keyword Succeeds    20s    1s    Verify RemovedFlowMacAddress    h1    h3    OF13
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_flowfilter.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_flowfilter.robot
index 917fd2a3932d1e2a34c57d11cb0412cba3716c59..2cf91f9c572a300c1e759958fdecb6404499c80b 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_flowfilter.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_flowfilter.robot
@@ -59,8 +59,8 @@ Add a portmap for interface if2
     Add a portmap    Tenant1    vBridge1    if2    ${portmap_data}
 
 Ping h1 to h3
-    [Documentation]    Ping h1 to h3, verify no packet loss
-    Mininet Ping Should Succeed    h1    h3
+    [Documentation]    Verify Ping between hosts h1 and h3. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a vBridge vBridge2
     [Documentation]    Add a vBridge vBridge2 in vtn Tenant1
@@ -89,8 +89,8 @@ Add a portmap for interface if4
     Add a portmap    Tenant1    vBridge1    if4    ${portmap_data}
 
 Ping h2 to h4
-    [Documentation]    Ping h2 to h4, verify no packet loss
-    Mininet Ping Should Succeed    h2    h4
+    [Documentation]    Verify Ping between hosts h2 and h4.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Add a macmap
     [Documentation]    Create a macmap on vBridge vBridge1
@@ -98,7 +98,7 @@ Add a macmap
 
 Get flow
     [Documentation]    Get flow of a vtn Tenant1
-    Get flow    Tenant1
+    Wait Until Keyword Succeeds    12s    1s    Get flow    Tenant1
 
 Add a flowcondition cond1
     [Documentation]    Create a flowcondition cond1
@@ -112,50 +112,46 @@ Add a flowcondition cond1
 Add a flowfilter with inet4src and inet4dst
     [Documentation]    Create a flowfilter with inet4 and Verify ping
     Add a flowfilter    Tenant1    vBridge1    if1    ${flowfilterInetdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with Icmp code
     [Documentation]    Create a flowfilter with icmp code and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfilterIcmpCodedata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with tpsrc and tpdst
     [Documentation]    Create a flowfilter with tpsrc and tpdst and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfilterTpsrcTpdstdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfilterDscpdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify Flow Entry for Inet Flowfilter
     [Documentation]    Verify Flow Entry for Inet Flowfilter
-    Verify Flow Entry for Inet Flowfilter
+    Wait Until Keyword Succeeds    20s    1s    Verify Flow Entry for Inet Flowfilter
 
 Add a flowfilter with vlanpcp
     [Documentation]    Create a flowfilter with vlanpcp and Verify ping
     Update a flowfilter    Tenant1    vBridge1    if1    ${flowfiltervlanpcp}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vtn with inet4src and inet4dst
     [Documentation]    Create a vtn_flowfilter with inet4 and Verify ping
     Add a flowfilter_vtn    Tenant1    ${vtn_flowfilterInetdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter_vbr with inet4src and inet4dst
     [Documentation]    Create a vbr_flowfilter with inet4 and Verify ping
     Add a flowfilter_vbr    Tenant1    vBridge1    ${vbr_flowfilterInetdata}    ${index}
-    Mininet Ping Should Succeed    h1    h3
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Add a flowfilter with inet4 for drop
     [Documentation]    Create a flowfilter with inet4 for drop action and Verify no pinging
     Add a flowfilter for drop    Tenant1    vBridge1    if1    ${flowfilterInetdropdata}    ${index}
-    Mininet Ping Should Not Succeed    h1    h3
-
-Verify Removed Flow Entry For Inet After Drop Action
-    [Documentation]    Verify no flows between the hosts after drop
-    Verify Removed Flow Entry for Inet Drop Flowfilter
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Not Succeed    h1    h3
 
 Delete a flowcondition
     [Documentation]    Delete a flowcondition

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_pathpolicy.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_pathpolicy.robot
index 8046177d7e94b4f5ff555621f47efce49e3f2149..ccaa80720ade6482de1d482664e5d38af5e9f0c9 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_pathpolicy.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_manager_pathpolicy.robot
@@ -56,8 +56,8 @@ Add a portmap for interface if2_path
     Add a portmap    Tenant_path    vBridge1    if2_path    ${portmap_data}
 
 Ping h1 to h2 before path policy
-    [Documentation]    Ping h1 to h2, verify no packet loss
-    Mininet Ping Should Succeed    h1    h2
+    [Documentation]    Verify Ping between hosts h1 and h2. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h2
 
 Verify flowEntryBeforePathPolicy
     [Documentation]    Checking Flows on switch s1 and s3
@@ -91,8 +91,8 @@ Get a pathpolicy
     Get a pathpolicy
 
 Ping h1 to h2 after path policy
-    [Documentation]    Ping h1 to h2, verify no packet loss
-    Mininet Ping Should Succeed    h1    h2
+    [Documentation]    Verify Ping between hosts h1 and h2.
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h2
 
 Verify flowEntryAfterPathPolicy
     [Documentation]    Checking Flows on switch s1 and s3

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap.robot
index 28a973dec9f8918deff96d0a08f81e31673234a9..56cc896cdb9b6fa2af872d596f6c83262e8bb6c8 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap.robot
@@ -43,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

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot
index 71a042f1748d37cf47d7a77854d5e1c5ff785121..0753eda3929adf6b5dd9713bcbd3e6d2af5bca9f 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot
@@ -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,19 +55,19 @@ 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
-    Verify Data Flows    Tenant1    vBridge2_vlan
+    Wait Until Keyword Succeeds    20s    1s   Verify Data Flows    Tenant1    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