X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fsxp%2Ftopology%2F020_Scalability.robot;h=52a7f0fca5e8f74385076eb730863a901ca6a34c;hb=be469c08b67312a58822a01893874da38cc4ca0d;hp=a4acf25d1ba9753a3c84b4565aee486444fb2719;hpb=2b1be2ae215a794356a6e67fdd42460ef80e2c4a;p=integration%2Ftest.git

diff --git a/csit/suites/sxp/topology/020_Scalability.robot b/csit/suites/sxp/topology/020_Scalability.robot
index a4acf25d1b..52a7f0fca5 100644
--- a/csit/suites/sxp/topology/020_Scalability.robot
+++ b/csit/suites/sxp/topology/020_Scalability.robot
@@ -1,56 +1,45 @@
 *** Settings ***
 Documentation     Test suite to test scalability of SXP
-Suite Setup       Setup SXP Environment
-Suite Teardown    Clean SXP Environment
+Suite Setup       Setup SXP Environment    32
+Suite Teardown    Clean SXP Environment    32
 Test Setup        Clean Nodes
 Library           RequestsLibrary
 Library           SSHLibrary
 Library           ../../../libraries/Sxp.py
 Resource          ../../../libraries/SxpLib.robot
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../libraries/KarafKeywords.robot
-Resource          ../../../variables/Variables.py
 
 *** Variables ***
 
 *** Test Cases ***
 Test Mega Topology
     [Documentation]    Stress test that contains of connecting 20 Nodes and exporting their bindings
+    [Tags]    SXP    Scalability
     Setup Mega Topology
-    Sleep    5s
-    ${resp}    Get Bindings    127.0.0.1
-    : FOR    ${num}    IN RANGE    2    22
-    \    ${ip}    Get Ip From Number    ${num}
-    \    Should Contain Binding    ${resp}    ${num}    ${ip}/32    sxp
+    Wait Until Keyword Succeeds    10    1    Check Binding Range    2    22
 
 Test Complex Mega Topology
     [Documentation]    Stress test that contains of connecting 30 Nodes and exporting their bindings
+    [Tags]    SXP    Scalability
     Setup Complex Mega Topology
-    Sleep    5s
-    ${resp}    Get Bindings    127.0.0.1
-    : FOR    ${num}    IN RANGE    22    32
-    \    ${ip}    Get Ip From Number    ${num}
-    \    Should Contain Binding    ${resp}    ${num}    ${ip}/32    sxp
+    Wait Until Keyword Succeeds    10    1    Check Binding Range    22    32
 
 Text Bindings export
     [Documentation]    Stress test that consist of exporting 500 Bindings under 5s
+    [Tags]    SXP    Scalability
     : FOR    ${num}    IN RANGE    2    502
     \    ${ip}    Get Ip From Number    ${num}
-    \    Add Binding    ${num}    ${ip}/32    127.0.0.2
+    \    Add Bindings    ${num}    ${ip}/32    127.0.0.2
     Add Connection    version4    listener    127.0.0.2    64999    127.0.0.1
     Add Connection    version4    speaker    127.0.0.1    64999    127.0.0.2
-    Sleep    5s
-    ${resp}    Get Bindings    127.0.0.1
-    : FOR    ${num}    IN RANGE    2    102
-    \    ${ip}    Get Ip From Number    ${num}
-    \    Should Contain Binding    ${resp}    ${num}    ${ip}/32    sxp
+    Wait Until Keyword Succeeds    15    1    Verify Connection    version4    listener    127.0.0.2
+    Wait Until Keyword Succeeds    10    1    Check Binding Range    2    102
 
 *** Keywords ***
 Setup Mega Topology
     [Arguments]    ${version}=version4
     : FOR    ${num}    IN RANGE    2    22
     \    ${ip}    Get Ip From Number    ${num}
-    \    Add Binding    ${num}    ${ip}/32    ${ip}
+    \    Add Bindings    ${num}    ${ip}/32    ${ip}
     \    Add Connection    ${version}    listener    ${ip}    64999    127.0.0.1
     \    Add Connection    ${version}    speaker    127.0.0.1    64999    ${ip}
     \    Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener
@@ -63,7 +52,7 @@ Setup Complex Mega Topology
     : FOR    ${num}    IN RANGE    22    32
     \    ${ip}    Get Ip From Number    ${num}
     \    ${second_ip}    Get Ip From Number    ${second_num}
-    \    Add Binding    ${num}    ${ip}/32    ${ip}
+    \    Add Bindings    ${num}    ${ip}/32    ${ip}
     \    Add Connection    ${version}    listener    ${ip}    64999    ${second_ip}
     \    Add Connection    ${version}    speaker    ${second_ip}    64999    ${ip}
     \    Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener
@@ -75,8 +64,16 @@ Setup Complex Mega Topology
     \    Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener
     \    ...    ${ip}    64999    ${second_ip}
 
+Check Binding Range
+    [Arguments]    ${start}    ${end}    ${node}=127.0.0.1
+    [Documentation]    Check if binding range is contained by node
+    ${resp}    Get Bindings    ${node}
+    : FOR    ${num}    IN RANGE    ${start}    ${end}
+    \    ${ip}    Get Ip From Number    ${num}
+    \    Should Contain Binding    ${resp}    ${num}    ${ip}/32    sxp
+
 Clean Nodes
     : FOR    ${num}    IN RANGE    1    32
     \    ${ip}    Get Ip From Number    ${num}
-    \    Clean Connections    ${ip}
     \    Clean Bindings    ${ip}
+    \    Clean Connections    ${ip}