X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fsxp%2Ftopology%2F020_Scalability.robot;h=2df1a776c734bd30c242e679762235a3d83b0e60;hb=8fe350d350587875068759b9749c41177f65bb93;hp=dffd0334840b41ef29d4de83a00e39bcb281fa50;hpb=0fd8ad6a5a336f0446f5e92af21f1b2d28c8ccb6;p=integration%2Ftest.git

diff --git a/csit/suites/sxp/topology/020_Scalability.robot b/csit/suites/sxp/topology/020_Scalability.robot
index dffd033484..2df1a776c7 100644
--- a/csit/suites/sxp/topology/020_Scalability.robot
+++ b/csit/suites/sxp/topology/020_Scalability.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     Test suite to test scalability of SXP
-Suite Setup       Setup SXP Environment    32
-Suite Teardown    Clean SXP Environment    32
+Suite Setup       Setup SXP Environment    31
+Suite Teardown    Clean SXP Environment    31
 Test Setup        Clean Nodes
 Library           RequestsLibrary
 Library           SSHLibrary
@@ -15,34 +15,34 @@ Test Mega Topology
     [Documentation]    Stress test that contains of connecting 20 Nodes and exporting their bindings
     [Tags]    SXP    Scalability
     Setup Mega Topology
-    Wait Until Keyword Succeeds    10    1    Check Binding Range    2    22
+    BuiltIn.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
-    Wait Until Keyword Succeeds    10    1    Check Binding Range    22    32
+    BuiltIn.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 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
-    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
+    \    ${ip} =    Sxp.Get Ip From Number    ${num}
+    \    SxpLib.Add Bindings    ${num}    ${ip}/32    127.0.0.2
+    SxpLib.Add Connection    version4    listener    127.0.0.2    64999    127.0.0.1
+    SxpLib.Add Connection    version4    speaker    127.0.0.1    64999    127.0.0.2
+    BuiltIn.Wait Until Keyword Succeeds    15    1    Verify Connection    version4    listener    127.0.0.2
+    BuiltIn.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 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
+    \    ${ip} =    Sxp.Get Ip From Number    ${num}
+    \    SxpLib.Add Bindings    ${num}    ${ip}/32    ${ip}
+    \    SxpLib.Add Connection    ${version}    listener    ${ip}    64999    127.0.0.1
+    \    SxpLib.Add Connection    ${version}    speaker    127.0.0.1    64999    ${ip}
+    \    BuiltIn.Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener
     \    ...    ${ip}
 
 Setup Complex Mega Topology
@@ -50,30 +50,30 @@ Setup Complex Mega Topology
     Setup Mega Topology    ${version}
     ${second_num}    Convert To Integer    2
     : 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 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
+    \    ${ip} =    Sxp.Get Ip From Number    ${num}
+    \    ${second_ip} =    Sxp.Get Ip From Number    ${second_num}
+    \    SxpLib.Add Bindings    ${num}    ${ip}/32    ${ip}
+    \    SxpLib.Add Connection    ${version}    listener    ${ip}    64999    ${second_ip}
+    \    SxpLib.Add Connection    ${version}    speaker    ${second_ip}    64999    ${ip}
+    \    BuiltIn.Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener
     \    ...    ${ip}    64999    ${second_ip}
-    \    ${second_num}    Set Variable    ${second_num + 1}
-    \    ${second_ip}    Get Ip From Number    ${second_num}
-    \    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
+    \    ${second_num} =    Set Variable    ${second_num + 1}
+    \    ${second_ip} =    Sxp.Get Ip From Number    ${second_num}
+    \    SxpLib.Add Connection    ${version}    listener    ${ip}    64999    ${second_ip}
+    \    SxpLib.Add Connection    ${version}    speaker    ${second_ip}    64999    ${ip}
+    \    BuiltIn.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}
+    ${resp} =    SxpLib.Get Bindings    ${node}
     : FOR    ${num}    IN RANGE    ${start}    ${end}
-    \    ${ip}    Get Ip From Number    ${num}
-    \    Should Contain Binding    ${resp}    ${num}    ${ip}/32    sxp
+    \    ${ip} =    Sxp.Get Ip From Number    ${num}
+    \    Should Contain Binding    ${resp}    ${num}    ${ip}/32
 
 Clean Nodes
     : FOR    ${num}    IN RANGE    1    32
-    \    ${ip}    Get Ip From Number    ${num}
-    \    Clean Bindings    ${ip}
-    \    Clean Connections    ${ip}
+    \    ${ip} =    Sxp.Get Ip From Number    ${num}
+    \    SxpLib.Clean Bindings    ${ip}
+    \    SxpLib.Clean Connections    ${ip}