Support for setting rate scaling independently of reporting frequency

bklang · benlangfeld · commit 28c494f1d5a2 · 2015-03-17T14:02:45.000-03:00
Via the new `calls_per_second_interval` option. See also SIPp/sipp#107 and SIPp/sipp#126.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # develop
+  * Feature: Support for setting rate scaling independently of reporting frequency via the new `calls_per_second_interval` option. See also https://github.com/SIPp/sipp/pull/107 and https://github.com/SIPp/sipp/pull/126.
 
 # [0.5.0](https://github.com/mojolingo/sippy_cup/compare/v0.4.1...v0.5.0)
 SYNTAX CHANGES!
diff --git a/README.markdown b/README.markdown
@@ -235,7 +235,10 @@ Each parameter has an impact on the test, and may either be changed once the XML
   <dd>The rate at which new calls should be created. Note that SIPp will automatically adjust this downward to stay at or beneath the maximum number of concurrent calls (`concurrent_max`). Default: 10</dt>
 
   <dt>calls_per_second_incr</dt>
-  <dd>When used with `calls_per_second_max`, tells SIPp the amount by which calls-per-second should be incremented. CPS rate is adjusted each `stats_interval`. Default: 1.</dd>
+  <dd>When used with `calls_per_second_max`, tells SIPp the amount by which calls-per-second should be incremented. CPS rate is adjusted each `calls_per_second_interval`. Default: 1.</dd>
+
+  <dt>calls_per_second_interval</dt>
+  <dd>When used with `calls_per_second_max`, tells SIPp the time interval (in seconds) by which calls-per-second should be incremented. Default: Unset; SIPp's default (60s). NOTE: Requires a development build of SIPp; see https://github.com/SIPp/sipp/pull/107</dd>
 
   <dt>calls_per_second_max</dt>
   <dd>The maximum rate of calls-per-second. If unset, the CPS rate will remain at the level set by `calls_per_second`.</dd>
diff --git a/lib/sippy_cup/runner.rb b/lib/sippy_cup/runner.rb
@@ -112,6 +112,7 @@ def command_options
         options[:no_rate_quit] = nil
         options[:rate_max] = @scenario_options[:calls_per_second_max]
         options[:rate_increase] = @scenario_options[:calls_per_second_incr] || 1
+        options[:rate_interval] = @scenario_options[:calls_per_second_interval] if @scenario_options[:calls_per_second_interval]
       end
 
       if @scenario_options[:stats_file]
diff --git a/spec/sippy_cup/runner_spec.rb b/spec/sippy_cup/runner_spec.rb
@@ -335,6 +335,7 @@ def expect_command_execution(command = anything)
 calls_per_second: 2
 calls_per_second_max: 5
 calls_per_second_incr: 2
+calls_per_second_interval: 20
 number_of_calls: 10
 errors_report_file: errors.txt
 steps:
@@ -350,7 +351,7 @@ def expect_command_execution(command = anything)
       end
 
       it 'should not terminate the test when reaching the rate limit and set the rate limit and increase appropriately' do
-        expect_command_execution(/-no_rate_quit -rate_max 5 -rate_increase 2/)
+        expect_command_execution(/-no_rate_quit -rate_max 5 -rate_increase 2 -rate_interval 20/)
         subject.run
       end
     end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# develop`
	`2`	+ * Feature: Support for setting rate scaling independently of reporting frequency via the new `calls_per_second_interval` option. See also https://github.com/SIPp/sipp/pull/107 and https://github.com/SIPp/sipp/pull/126.
`2`	`3`
`3`	`4`	`# [0.5.0](https://github.com/mojolingo/sippy_cup/compare/v0.4.1...v0.5.0)`
`4`	`5`	`SYNTAX CHANGES!`