From 0d23b6f9c03db5355f021bda285c39be3b874e7d Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Wed, 8 Jul 2015 10:54:06 +0200 Subject: [PATCH] adding teardown part to log the ovs content Change-Id: I4a4eec94c778983a690636947b992ea7a5e6aaa0 Signed-off-by: Peter Gubka --- ...s_Collection_100k_WithMininetRestart.robot | 26 +++++++++++++--- ...00k_Flows_Configuration_Time_Measure.robot | 28 +++++++++++++---- .../090_BulkMaticConfigDsSetup_100k.robot | 30 ++++++++++++++----- 3 files changed, 67 insertions(+), 17 deletions(-) diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot index 0fb05026..e28457f4 100644 --- a/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot +++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Suite checks if StatMngr is able to collect flows correctly -Suite Setup Create Http Session +Suite Setup Create Http Session And Upload Files Suite Teardown Delete Http Session And Store Plot Data Library OperatingSystem Library XML @@ -22,6 +22,8 @@ ${tabspread} first @{cntls} ${CONTROLLER} ${linux_prompt} > ${start_cmd} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 +${getf_cmd} sh ./get-total-found.sh +${getr_cmd} sh ./get-total-reported.sh ${iperiod} 1s ${imonitor} 600s ${ichange} 450s @@ -43,18 +45,20 @@ Configure Flows ${res}= Configure Flows Bulk flow_details=${flows} controllers=@{cntls} nrthreads=${nrthreads} fpr=${fpr} Log ${res} Set Suite Variable ${flows} - ${http204ok}= Create List ${204} - ${validation}= Validate Responses ${res} ${http204ok} + ${http204ok}= Create List ${204} + ${validation}= Validate Responses ${res} ${http204ok} Should Be True ${validation} [Teardown] Save Setup Time setuptime Wait Stats Collected [Documentation] Waits till ${flnr} flows are initially collected Measure Setup Time ${swnr} ${flnr} inittime + [Teardown] Log Switch Details Stable State Monitoring [Documentation] Inventory check if all ${flnr} flows are present for specified time frame Monitor Stable State ${swnr} ${flnr} + [Teardown] Log Switch Details Stop Mininet [Documentation] Disconnect/Stop mininet @@ -71,6 +75,7 @@ Connect Mininet Again Check Flows Are Operational Again [Documentation] All ${flnr} slows should be present in the operational datastore after mininet reconnection Measure Setup Time ${swnr} ${flnr} restarttime + [Teardown] Log Switch Details Deconfigure Flows [Documentation] Flows deconfiguration @@ -80,6 +85,7 @@ Deconfigure Flows Check No Flows In Operational Last [Documentation] Operational datastore to be without any flows Inventory Change Reached ${swnr} 0 + [Teardown] Log Switch Details Stop Mininet End Stop Switches @@ -96,8 +102,12 @@ Connect Switches Read Until mininet> Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo -Create Http Session +Create Http Session And Upload Files Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Open Connection ${MININET} prompt=${linux_prompt} timeout=600 + Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any + Put File ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/* ./ + Close Connection Stop Switches [Documentation] Stops mininet @@ -160,3 +170,11 @@ Monitor Stable State [Arguments] ${rswitches} ${rflows} [Documentation] This keywordwaits till inventory reaches required state Verify Keyword Does Not Fail Within Timeout ${imonitor} ${iperiod} Check Flows Inventory ${rswitches} ${rflows} + +Log Switch Details + Write ${getf_cmd} + ${log}= Read Until mininet> + Log ${log} + Write ${getr_cmd} + ${log}= Read Until mininet> + Log ${log} diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot index 90bfe1b4..60266a18 100644 --- a/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot +++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Suite to measure setup reate using add-flows-rpc operation -Suite Setup Create Http Session +Suite Setup Create Http Session And Upload Files Suite Teardown Delete Http Session And Store Plot Data Library OperatingSystem Library XML @@ -20,6 +20,8 @@ ${tabspread} first @{cntls} ${CONTROLLER} ${linux_prompt} > ${start_cmd} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 +${getf_cmd} sh ./get-total-found.sh +${getr_cmd} sh ./get-total-reported.sh ${iperiod} 1s ${ichange} 450s ${outfile} flows_setup_time.csv @@ -37,26 +39,28 @@ Configure Flows ${res}= Operations Add Flows Rpc flow_details=${flows} controllers=@{cntls} nrthreads=${nrthreads} fpr=${fpr} Log ${res} Set Suite Variable ${flows} - ${http200ok}= Create List ${200} - ${validation}= Validate Responses ${res} ${http200ok} + ${http200ok}= Create List ${200} + ${validation}= Validate Responses ${res} ${http200ok} Should Be True ${validation} [Teardown] Save Setup Time Wait Stats Collected [Documentation] Waits till ${flnr} flows are initially collected Inventory Change Reached ${swnr} ${flnr} + [Teardown] Log Switch Details Deconfigure Flows [Documentation] Flows deconfiguration ${res}= Operations Remove Flows Rpc flow_details=${flows} controllers=@{cntls} nrthreads=${nrthreads} fpr=${fpr} Log ${res} - ${http200ok}= Create List ${200} - ${validation}= Validate Responses ${res} ${http200ok} + ${http200ok}= Create List ${200} + ${validation}= Validate Responses ${res} ${http200ok} Should Be True ${validation} Check No Flows In Operational After Remove [Documentation] No flows should be found after their removeal Inventory Change Reached ${swnr} 0 + [Teardown] Log Switch Details Stop Mininet End Stop Switches @@ -73,8 +77,12 @@ Connect Switches Read Until mininet> Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo -Create Http Session +Create Http Session And Upload Files Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Open Connection ${MININET} prompt=${linux_prompt} timeout=600 + Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any + Put File ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/* ./ + Close Connection Stop Switches [Documentation] Stops mininet @@ -115,3 +123,11 @@ Inventory Change Reached [Arguments] ${rswitches} ${rflows} [Documentation] This keywordwaits till inventory reaches required state Wait Until Keyword Succeeds ${ichange} ${iperiod} Check Flows Inventory ${rswitches} ${rflows} + +Log Switch Details + Write ${getf_cmd} + ${log}= Read Until mininet> + Log ${log} + Write ${getr_cmd} + ${log}= Read Until mininet> + Log ${log} diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot b/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot index 6cd139f6..9191841d 100644 --- a/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot +++ b/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Suite to measure flow setup rate using operation add-flows-ds -Suite Setup Create Http Session +Suite Setup Create Http Session And Upload Files Suite Teardown Delete Http Session And Store Plot Data Library OperatingSystem Library XML @@ -20,6 +20,8 @@ ${tabspread} first @{cntls} ${CONTROLLER} ${linux_prompt} > ${start_cmd} sudo mn --controller=remote,ip=${CONTROLLER} --topo linear,${swnr} --switch ovsk,protocols=OpenFlow13 +${getf_cmd} sh ./get-total-found.sh +${getr_cmd} sh ./get-total-reported.sh ${iperiod} 1s ${ichange} 450s ${outfile} flows_setup_time.csv @@ -37,26 +39,28 @@ Configure Flows ${res}= Operations Add Flows Ds flow_details=${flows} controllers=@{cntls} nrthreads=${nrthreads} fpr=${fpr} Log ${res} Set Suite Variable ${flows} - ${http200ok}= Create List ${200} - ${validation}= Validate Responses ${res} ${http200ok} + ${http200ok}= Create List ${200} + ${validation}= Validate Responses ${res} ${http200ok} Should Be True ${validation} - [Teardown] SaveSetupTime + [Teardown] Save Setup Time Wait Stats Collected [Documentation] Waits till ${flnr} flows are initially collected Inventory Change Reached ${swnr} ${flnr} + [Teardown] Log Switch Details Deconfigure Flows [Documentation] Flows deconfiguration ${res}= Operations Remove Flows Ds flow_details=${flows} controllers=@{cntls} nrthreads=${nrthreads} fpr=${fpr} Log ${res} - ${http200ok}= Create List ${200} - ${validation}= Validate Responses ${res} ${http200ok} + ${http200ok}= Create List ${200} + ${validation}= Validate Responses ${res} ${http200ok} Should Be True ${validation} Check No Flows In Operational After Remove [Documentation] No flows should be found after their removeal Inventory Change Reached ${swnr} 0 + [Teardown] Log Switch Details Stop Mininet End Stop Switches @@ -73,8 +77,12 @@ Connect Switches Read Until mininet> Wait Until Keyword Succeeds 10s 1s Are Switches Connected Topo -Create Http Session +Create Http Session And Upload Files Create Session session http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} + Open Connection ${MININET} prompt=${linux_prompt} timeout=600 + Login With Public Key ${MININET_USER} ${USER_HOME}/.ssh/id_rsa any + Put File ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/* ./ + Close Connection Stop Switches [Documentation] Stops mininet @@ -115,3 +123,11 @@ Inventory Change Reached [Arguments] ${rswitches} ${rflows} [Documentation] This keywordwaits till inventory reaches required state Wait Until Keyword Succeeds ${ichange} ${iperiod} Check Flows Inventory ${rswitches} ${rflows} + +Log Switch Details + Write ${getf_cmd} + ${log}= Read Until mininet> + Log ${log} + Write ${getr_cmd} + ${log}= Read Until mininet> + Log ${log} -- 2.36.6