From 914713867fccab86dd47781081b199f245a7809f Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Mon, 27 Apr 2015 21:03:47 -0700 Subject: [PATCH] Adding verify controller log to scalability test. Fixing some libraries to use right default ${WORKSPACE} and ${BUNDLEFOLDER}. (We are passing these variables with the pybot command anyway) Change-Id: Idd2cbb493a51b67af340c5d69edc0ce27554d84b Signed-off-by: Luis Gomez --- test/csit/libraries/AAAKeywords.txt | 2 +- test/csit/libraries/KarafKeywords.txt | 2 ++ test/csit/libraries/Scalability.txt | 13 ++++++++----- test/csit/libraries/Utils.txt | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/test/csit/libraries/AAAKeywords.txt b/test/csit/libraries/AAAKeywords.txt index d44d5d18cd..acae6b129b 100644 --- a/test/csit/libraries/AAAKeywords.txt +++ b/test/csit/libraries/AAAKeywords.txt @@ -3,7 +3,7 @@ Library ./RequestsLibrary.py Variables ../variables/Variables.py *** Variables *** -${WORKSPACE} /opt/jenkins-integration/workspace/shared-controller +${WORKSPACE} /tmp ${BUNDLEFOLDER} distribution-karaf-0.3.0-SNAPSHOT ${AUTHN_CFG_FILE} ${WORKSPACE}/${BUNDLEFOLDER}/etc/org.opendaylight.aaa.authn.cfg ${CONTROLLER_USER} ${MININET_USER} diff --git a/test/csit/libraries/KarafKeywords.txt b/test/csit/libraries/KarafKeywords.txt index 3a4e95dd87..bb44ce400c 100644 --- a/test/csit/libraries/KarafKeywords.txt +++ b/test/csit/libraries/KarafKeywords.txt @@ -3,6 +3,8 @@ Library SSHLibrary Library OperatingSystem *** Variables *** +${WORKSPACE} /tmp +${BUNDLEFOLDER} distribution-karaf-0.3.0-SNAPSHOT ${karaf_shell_port} 8101 ${karaf_prompt} opendaylight-user ${karaf_user} karaf diff --git a/test/csit/libraries/Scalability.txt b/test/csit/libraries/Scalability.txt index da3f2315f7..066a2a70f1 100644 --- a/test/csit/libraries/Scalability.txt +++ b/test/csit/libraries/Scalability.txt @@ -1,5 +1,6 @@ *** Settings *** Library SSHLibrary +Resource Utils.txt *** Variables *** ${linux_prompt} > @@ -8,25 +9,27 @@ ${linux_prompt} > Find Max Switches [Arguments] ${start} ${stop} ${step} [Documentation] Will find out max switches starting from ${start} till reaching ${stop} and in steps defined by ${step} - ${max-switches} Set Variable ${1} + ${max-switches} Set Variable ${0} ${start} Convert to Integer ${start} ${stop} Convert to Integer ${stop} ${step} Convert to Integer ${step} : FOR ${switches} IN RANGE ${start} ${stop+1} ${step} \ Start Mininet Linear ${switches} + \ ${status} ${result} Run Keyword And Ignore Error Verify Controller Is Not Dead ${CONTROLLER} + \ Exit For Loop If '${status}' == 'FAIL' \ ${status} ${result} Run Keyword And Ignore Error Wait Until Keyword Succeeds ${switches*2} 10s \ ... Check Every Switch ${switches} - \ Return From Keyword If '${status}' == 'FAIL' + \ Exit For Loop If '${status}' == 'FAIL' \ ${status} ${result} Run Keyword And Ignore Error Wait Until Keyword Succeeds ${switches*2} 10s \ ... Check Linear Topology ${switches} - \ Return From Keyword If '${status}' == 'FAIL' + \ Exit For Loop If '${status}' == 'FAIL' \ Stop Mininet \ ${status} ${result} Run Keyword And Ignore Error Wait Until Keyword Succeeds ${switches*2} 10s \ ... Check No Switches ${switches} - \ Return From Keyword If '${status}' == 'FAIL' + \ Exit For Loop If '${status}' == 'FAIL' \ ${status} ${result} Run Keyword And Ignore Error Wait Until Keyword Succeeds ${switches*2} 10s \ ... Check No Topology ${switches} - \ Return From Keyword If '${status}' == 'FAIL' + \ Exit For Loop If '${status}' == 'FAIL' \ ${max-switches} Convert To String ${switches} [Return] ${max-switches} diff --git a/test/csit/libraries/Utils.txt b/test/csit/libraries/Utils.txt index 963c7ce66e..0d2a6d8b56 100644 --- a/test/csit/libraries/Utils.txt +++ b/test/csit/libraries/Utils.txt @@ -131,4 +131,4 @@ Verify Controller Is Not Dead [Arguments] ${controller_ip}=${CONTROLLER} [Documentation] Will execute any tests to verify the controller is not dead. Some checks are ... Out Of Memory Execptions. - Check Karaf Log File Does Not Have Messages ${controller_ip} java.lang.OutOfMemoryError \ No newline at end of file + Check Karaf Log File Does Not Have Messages ${controller_ip} java.lang.OutOfMemoryError -- 2.36.6