From 93f7fe54fa2ef0f3206b6b4bb60b06c74c5dcede Mon Sep 17 00:00:00 2001 From: Kailash Khalasi Date: Mon, 24 Aug 2015 15:50:10 -0700 Subject: [PATCH] Modifying openflow switch scale test to gracefully handle failures (mininet timeouts) Change-Id: Ida1e98573a82bf076c3e77c345f840d31f09b562 Signed-off-by: Kailash Khalasi --- test/csit/libraries/Scalability.robot | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/csit/libraries/Scalability.robot b/test/csit/libraries/Scalability.robot index 5344fc5c9b..5d81ebed72 100644 --- a/test/csit/libraries/Scalability.robot +++ b/test/csit/libraries/Scalability.robot @@ -12,11 +12,13 @@ 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 ${0} + Set Suite Variable ${max-switches} ${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 Start Mininet Linear ${switches} + \ Exit For Loop If '${status}' == 'FAIL' \ ${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 @@ -25,7 +27,8 @@ Find Max Switches \ ${status} ${result} Run Keyword And Ignore Error Wait Until Keyword Succeeds ${switches*2} 10s \ ... Check Linear Topology ${switches} \ Exit For Loop If '${status}' == 'FAIL' - \ Stop Mininet Simulation + \ ${status} ${result} Run Keyword And Ignore Error Stop Mininet Simulation + \ Exit For Loop If '${status}' == 'FAIL' \ ${status} ${result} Run Keyword And Ignore Error Wait Until Keyword Succeeds ${switches*2} 10s \ ... Check No Switches ${switches} \ Exit For Loop If '${status}' == 'FAIL' -- 2.36.6