From: Luis Gomez <ecelgp@gmail.com>
Date: Thu, 22 Sep 2016 15:52:18 +0000 (-0700)
Subject: Set test delay to 0 by default
X-Git-Tag: release/beryllium-sr4~62
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=09c289d1fcf2aaca5aeeff1a2e3b9162b967746a;p=integration%2Ftest.git

Set test delay to 0 by default

This applies to scalability and cbench test.

Change-Id: I53067dc93de1ab27b854b542a85fe03c4a476460
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/csit/libraries/Scalability.robot b/csit/libraries/Scalability.robot
index 60803b3cdd..a4330f76eb 100644
--- a/csit/libraries/Scalability.robot
+++ b/csit/libraries/Scalability.robot
@@ -9,7 +9,7 @@ Library           SwitchClasses/BaseSwitch.py
 
 *** Keywords ***
 Find Max Switches
-    [Arguments]    ${start}    ${stop}    ${step}    ${sustain_time}=5
+    [Arguments]    ${start}    ${stop}    ${step}    ${sustain_time}=0
     [Documentation]    Will find out max switches starting from ${start} till reaching ${stop} and in steps defined by ${step}.
     ...    The network is hold for ${sustain_time} seconds after everything is checked successful.
     ${max-switches}    Set Variable    ${0}
diff --git a/csit/suites/openflowplugin/Performance/010_Cbench.robot b/csit/suites/openflowplugin/Performance/010_Cbench.robot
index 1ff952d0d7..44761cec7f 100644
--- a/csit/suites/openflowplugin/Performance/010_Cbench.robot
+++ b/csit/suites/openflowplugin/Performance/010_Cbench.robot
@@ -20,6 +20,7 @@ ${duration_in_secs}    10
 ${loops}          10
 ${num_of_unique_macs}    100
 ${start_delay}    5000
+${test_delay}     0
 ${cbench_system}    ${TOOLS_SYSTEM_IP}
 ${cbench_executable}    /usr/local/bin/cbench
 ${throughput_results_file}    throughput.csv
@@ -34,7 +35,7 @@ Cbench Latency Test
     Log    Cbench tests using ${loops} iterations of ${duration_in_secs} second tests. Switch Count: ${switch_count}. Unique MACS to cycle: ${num_of_unique_macs}
     Run Cbench And Log Results    -m ${duration_in_ms} -M ${num_of_unique_macs} -s ${switch_count} -l ${loops} -D ${start_delay}    ${latency_threshold}    ${latency_results_file}
     # We have to give some time for the controller to recover. See bug 6176.
-    Sleep    10
+    Sleep    ${test_delay}
 
 Cbench Throughput Test
     [Documentation]    cbench executed in throughput mode (-t). Test parameters have defaults, but can be overridden
@@ -44,7 +45,7 @@ Cbench Throughput Test
     Log    Cbench tests using ${loops} iterations of ${duration_in_secs} second tests. Switch Count: ${switch_count}. Unique MACS to cycle: ${num_of_unique_macs}
     Run Cbench And Log Results    -t -m ${duration_in_ms} -M ${num_of_unique_macs} -s ${switch_count} -l ${loops} -D ${start_delay}    ${throughput_threshold}    ${throughput_results_file}
     # We have to give some time for the controller to recover. See bug 6176.
-    Sleep    10
+    Sleep    ${test_delay}
 
 Rerun Latency Test To Check Bug 6176
     [Documentation]    cbench executed in latency mode to see if controller is healthy
@@ -53,7 +54,7 @@ Rerun Latency Test To Check Bug 6176
     Log    Cbench tests using ${loops} iterations of ${duration_in_secs} second tests. Switch Count: ${switch_count}. Unique MACS to cycle: ${num_of_unique_macs}
     Run Cbench And Log Results    -m ${duration_in_ms} -M ${num_of_unique_macs} -s ${switch_count} -l ${loops} -D ${start_delay}    ${latency_threshold}    bug.csv
     # We have to give some time for the controller to recover. See bug 6176.
-    Sleep    10
+    Sleep    ${test_delay}
 
 *** Keywords ***
 Run Cbench And Log Results