X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fl2switch%2FLoop_Removal_OF13%2F010__loop_of_3.robot;h=56a070a619a0f61b0bf7b4ef09b0253366fa410c;hb=982a24d0191c1ae6118b8d168cf4ec99164ced19;hp=06e890016c4fcd80364be0699c2bec1acffe8357;hpb=607634d1d3fbf0d47b1bbfe234f4fbe70b3eb37e;p=integration%2Ftest.git

diff --git a/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot b/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
index 06e890016c..56a070a619 100644
--- a/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
+++ b/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
@@ -36,32 +36,25 @@ Check Ports STP status
 
 Ping Test
     [Documentation]    Ping h1 to h2, verify no packet loss or duplicates
-    Write    h1 ping -w 1 h2
-    ${result}    Read Until    mininet>
-    Should Contain    ${result}    1 received, 0% packet loss
-    Should Not Contain    ${result}    duplicates
+    Wait Until Keyword Succeeds    10s    2s    Ping Works Good
 
 Link Down
     [Documentation]    Take link s1-s2 down and verify ping works
+    [Tags]    exclude
     Write    link s1 s2 down
     Read Until    mininet>
     @{list}    Create List    ${DISCARD}
     Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}    ${list}
-    Write    h1 ping -w 1 h2
-    ${result}    Read Until    mininet>
-    Should Contain    ${result}    received, 0% packet loss
-    Should Not Contain    ${result}    duplicates
+    Wait Until Keyword Succeeds    10s    2s    Ping Works Good
 
 Link Up
     [Documentation]    Take link s1-s2 up and verify ping works
+    [Tags]    exclude
     Write    link s1 s2 up
     Read Until    mininet>
     Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${OPERATIONAL_NODES_API}    ${FORWARD}    4
     Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${OPERATIONAL_NODES_API}    ${DISCARD}    2
-    Write    h1 ping -w 1 h2
-    ${result}    Read Until    mininet>
-    Should Contain    ${result}    received, 0% packet loss
-    Should Not Contain    ${result}    duplicates
+    Wait Until Keyword Succeeds    10s    2s    Ping Works Good
 
 Remove Port
     [Documentation]    Remove port s1-eth2 and verify ping works
@@ -69,10 +62,7 @@ Remove Port
     Read Until    mininet>
     @{list}    Create List    ${DISCARD}
     Wait Until Keyword Succeeds    10s    2s    Check For Elements Not At URI    ${OPERATIONAL_NODES_API}    ${list}
-    Write    h1 ping -w 1 h2
-    ${result}    Read Until    mininet>
-    Should Contain    ${result}    received, 0% packet loss
-    Should Not Contain    ${result}    duplicates
+    Wait Until Keyword Succeeds    10s    2s    Ping Works Good
 
 Add Port
     [Documentation]    Add port s1-eth2 and verify ping works
@@ -80,22 +70,24 @@ Add Port
     Read Until    mininet>
     Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${OPERATIONAL_NODES_API}    ${FORWARD}    4
     Wait Until Keyword Succeeds    10s    2s    Check For Specific Number Of Elements At URI    ${OPERATIONAL_NODES_API}    ${DISCARD}    2
-    Sleep    1
-    Write    h1 ping -w 1 h2
-    ${result}    Read Until    mininet>
-    Should Contain    ${result}    received, 0% packet loss
-    Should Not Contain    ${result}    duplicates
+    Wait Until Keyword Succeeds    10s    2s    Ping Works Good
 
 *** Keywords ***
 Start Suite
     [Documentation]    Open controller session & mininet connection and start mininet custom topo
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
     ${start}=    Set Variable    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom customtopo.py --topo ring --switch ovsk,protocols=OpenFlow13
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
+    ${mininet_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../topologies/customtopo.py
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
+
+Ping Works Good
+    Write    h1 ping -w 1 h2
+    ${result}    Read Until    mininet>
+    Should Contain    ${result}    received, 0% packet loss
+    Should Not Contain    ${result}    duplicates