X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Fcsit%2Flibraries%2FScalability.robot;fp=test%2Fcsit%2Flibraries%2FScalability.robot;h=5344fc5c9be355024c65146a15c30a62818c99cc;hb=6799ffb4cb9271a5433815527123f35aeb2d947f;hp=b655d7be407ce4bfa5919cd9282ddded0332bb2e;hpb=394ed0db5c099b579ea66a4743c6ded2a9868973;p=integration.git diff --git a/test/csit/libraries/Scalability.robot b/test/csit/libraries/Scalability.robot index b655d7be..5344fc5c 100644 --- a/test/csit/libraries/Scalability.robot +++ b/test/csit/libraries/Scalability.robot @@ -6,9 +6,6 @@ Library Collections Variables ../variables/Variables.py Library RequestsLibrary Library SwitchClasses/BaseSwitch.py -*** Variables *** -${linux_prompt} > - *** Keywords *** Find Max Switches @@ -119,7 +116,7 @@ Start Mininet With One Switch And ${hosts} hosts [Documentation] Start mininet with one switch and ${hosts} hosts Log Starting mininet with one switch and ${hosts} hosts Log To Console Starting mininet with one switch and ${hosts} hosts - ${mininet_conn_id}= Open Connection ${MININET} prompt=${linux_prompt} timeout=${hosts*3} + ${mininet_conn_id}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=${hosts*3} Set Suite Variable ${mininet_conn_id} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,1,${hosts} --switch ovsk,protocols=OpenFlow13 @@ -168,7 +165,7 @@ Start Mininet Linear [Arguments] ${switches} [Documentation] Start mininet linear topology with ${switches} nodes Log To Console Starting mininet linear ${switches} - ${mininet_conn_id}= Open Connection ${MININET} prompt=${linux_prompt} timeout=${switches*3} + ${mininet_conn_id}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=${switches*3} Set Suite Variable ${mininet_conn_id} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${switches} --switch ovsk,protocols=OpenFlow13 @@ -179,11 +176,11 @@ Start Mininet With Custom Topology [Arguments] ${topology_file} ${switches} ${base_mac}=00:00:00:00:00:00 ${base_ip}=1.1.1.1 ${hosts}=0 ${mininet_start_time}=100 [Documentation] Start a custom mininet topology. Log To Console Start a custom mininet topology with ${switches} nodes - ${mininet_conn_id}= Open Connection ${MININET} prompt=${linux_prompt} timeout=${mininet_start_time} + ${mininet_conn_id}= Open Connection ${MININET} prompt=${DEFAULT_LINUX_PROMPT} timeout=${mininet_start_time} Set Suite Variable ${mininet_conn_id} Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/${SSH_KEY} any Write python ${topology_file} ${switches} ${hosts} ${base_mac} ${base_ip} - Read Until ${linux_prompt} + Read Until ${DEFAULT_LINUX_PROMPT} Write sudo mn --controller=remote,ip=${CONTROLLER} --custom switch.py --topo demotopo --switch ovsk,protocols=OpenFlow13 Read Until mininet> Write sh ovs-vsctl show @@ -247,7 +244,7 @@ Stop Mininet Simulation Switch Connection ${mininet_conn_id} Read Write exit - Read Until ${linux_prompt} + Read Until ${DEFAULT_LINUX_PROMPT} Close Connection Scalability Suite Teardown