mu 5.7.2.5 → 5.7.2.6

data/lib/mu/command/cmd_appid.rb

@@ -103,6 +103,7 @@ private
   def setup argv
     parse_cli argv
     @params = {}
+    @peak_throughput = 0.0
 
     if @hash['test']
       @verify_only = true
@@ -339,10 +340,19 @@ private
       @reported_volume = @reported_volume + scenario["volume"]     
     end
 
+    bits1 = (@client_tx_bytes.to_i + @client_rx_bytes.to_i) * 8
+    dur1 = @duration.to_f
+    thruput = format_float(2, bits1.to_f / dur1)
+
+    if thruput.to_f > @peak_throughput
+      @peak_throughput = thruput.to_f
+    end
+
     msg ""
     msg "duration:           #{format_float(2, @duration)}"
     msg "concurrency:        #{@reported_volume}"
     msg "tests/sec:          #{format_float(2, @executed.to_f / @duration)}" if @duration.to_i > 0
+    msg "bits/sec:           #{thruput}" if @duration.to_i > 0
     msg "passed:             #{@executed}"
     msg "errors:             #{@errors}"
     msg "timeouts:           #{@timeouts}"

data/lib/mu/command/cmd_runscale.rb

@@ -7,7 +7,7 @@ class Mu
 class Command
 class Cmd_runscale < Command
 
-  attr_accessor :api, :params, :hosts, :addr_indexes, :offset_indexes
+  attr_accessor :api, :params, :hosts, :addr_indexes, :offset_indexes, :peak_concurrency, :peak_throughput
 
   # displays command-line help
   #  * argv = command-line arguments
@@ -98,6 +98,8 @@ private
  def setup argv
     parse_cli argv
     @params = {}
+    @peak_concurrency = 0
+    @peak_throughput = 0.0
 
     if @hash['test']
       @verify_only = true
@@ -135,6 +137,22 @@ private
       @no_verify = true
     end
 
+    if not @hash['vector_address_pairing']
+      @vector_address_pairing = false
+      @limit_concurrency = false
+    else
+      @vector_address_pairing = true
+      @limit_concurrency =  true
+    end
+
+=begin
+    if not @hash['hold_concurrency']
+      @hold_concurrency = false
+    else
+      @hold_concurrency =  true
+    end
+=end
+   
   end
 
  def run(scenario)
@@ -162,6 +180,9 @@ private
 
     configure_hosts
     @api.configure("delay", @delay)
+    @api.configure("vectorAddressPairing", @vector_address_pairing)
+    @api.configure("limitConcurrency", @limit_concurrency)
+    # @api.configure("holdConcurrency", @hold_concurrency)
 
     if @no_verify == false # don't do verify if no_verify==true
       msg "verifying #{scenario} ..."
@@ -389,10 +410,23 @@ private
       @reported_volume = @reported_volume + scenario["volume"]
     end
 
+    if @reported_volume.to_i > @peak_concurrency
+      @peak_concurrency = @reported_volume.to_i
+    end
+
+    bits1 = (@client_tx_bytes.to_i + @client_rx_bytes.to_i) * 8
+    dur1 = @duration.to_f
+    thruput = format_float(2, bits1.to_f / dur1)
+
+    if thruput.to_f > @peak_throughput
+      @peak_throughput = thruput.to_f
+    end
+
     msg ""
     msg "duration:           #{format_float(2, @duration)}"
     msg "concurrency:        #{@reported_volume}"
     msg "tests/sec:          #{format_float(2, @executed.to_f / @duration)}" if @duration.to_i > 0
+    msg "bits/sec:           #{thruput}" if @duration.to_i > 0
     msg "passed:             #{@executed}"
     msg "errors:             #{@errors}"
     msg "timeouts:           #{@timeouts}"
@@ -414,6 +448,11 @@ private
 
           k = argv.shift
 
+          if [ '-a', '--vector_address_pairing' ].member? k
+            @hash['vector_address_pairing'] = true
+            next
+          end
+
           if [ '-c', '--csv' ].member? k
               @hash['testset'] = shift(k, argv)
               next
@@ -438,7 +477,12 @@ private
               help
               exit
           end
-
+=begin
+          if [ '-hold', '--hold_concurrency' ].member? k
+            @hash['hold_concurrency'] = true
+            next
+          end
+=end
           if [ '-l', '--delay' ].member? k
             @hash['delay'] = shift(k, argv)
             next
@@ -515,10 +559,12 @@ private
 
   def help
         helps = [
+            { :short => '-a', :long => '--vector_address_pairing', :value => '', :help => 'sets vectorAddressPairing to true (limits and maps concurrency to the rows in the testset)' },
             { :short => '-c', :long => '--csv', :value => '<string>', :help => 'name of the csv testset to run' },
             { :short => '-d', :long => '--dir', :value => '<string>', :help => 'directory containing the scenario file' },
             { :short => '-f', :long => '--default_host', :value => '<string>', :help => 'default_host setting' },
             { :short => '-h', :long => '--help', :value => '', :help => 'help on command line options' },
+           # { :short => '-hold', :long => '--hold_concurrency', :value => '', :help => 'sets holdConcurrency to tru' },
             { :short => '-i', :long => '--interfaces', :value => '<string>', :help => 'comma-separated list of interfaces, e.g. b1,b2 or b1-1000,b2 for ip range' },
             { :short => '-l', :long => '--delay', :value => '<string>', :help => 'intra-scenario delay value' },
             { :short => '-m', :long => '--mu_string', :value => '<string>', :help => 'user, password, mu_ip in the form of admin:admin@10.9.8.7' },

data/rdoc/classes/Mu.html

@@ -55,16 +55,20 @@
         <tr class="top-aligned-row">
             <td><strong>In:</strong></td>
             <td>
-                <a href="../files/lib/mu/api/scale_rb.html">
-                lib/mu/api/scale.rb
+                <a href="../files/lib/mu/api/netconfig_rb.html">
+                lib/mu/api/netconfig.rb
                 </a>
         <br />
-                <a href="../files/lib/mu/command/cmd_runscale_rb.html">
-                lib/mu/command/cmd_runscale.rb
+                <a href="../files/lib/mu/command/cmd_appid_rb.html">
+                lib/mu/command/cmd_appid.rb
                 </a>
         <br />
-                <a href="../files/lib/mu_rb.html">
-                lib/mu.rb
+                <a href="../files/lib/mu/command/cmd_netconfig_rb.html">
+                lib/mu/command/cmd_netconfig.rb
+                </a>
+        <br />
+                <a href="../files/lib/mu/command/cmd_runscale_rb.html">
+                lib/mu/command/cmd_runscale.rb
                 </a>
         <br />
             </td>
@@ -73,7 +77,9 @@
         <tr class="top-aligned-row">
             <td><strong>Parent:</strong></td>
             <td>
+                <a href="Object.html">
                 Object
+               </a>
             </td>
         </tr>
         </table>
@@ -86,25 +92,10 @@
 
   <div id="contextContent">
 
-    <div id="description">
-      <p>
-<a href="Mu/Command.html">Command</a>-line tools and applications for using
-the <a href="Mu.html">Mu</a> Dynamics REST Api&#8216;s
-</p>
-
-    </div>
 
 
    </div>
 
-    <div id="method-list">
-      <h3 class="section-bar">Methods</h3>
-
-      <div class="name-list">
-      <a href="#M000002">check_version</a>&nbsp;&nbsp;
-      <a href="#M000001">run</a>&nbsp;&nbsp;
-      </div>
-    </div>
 
   </div>
 
@@ -117,23 +108,10 @@ the <a href="Mu.html">Mu</a> Dynamics REST Api&#8216;s
       <h3 class="section-bar">Classes and Modules</h3>
 
       Class <a href="Mu/Command.html" class="link">Mu::Command</a><br />
-Class <a href="Mu/Scale.html" class="link">Mu::Scale</a><br />
+Class <a href="Mu/Netconfig.html" class="link">Mu::Netconfig</a><br />
 
     </div>
 
-    <div id="constants-list">
-      <h3 class="section-bar">Constants</h3>
-
-      <div class="name-list">
-        <table summary="Constants">
-        <tr class="top-aligned-row context-row">
-          <td class="context-item-name">Version</td>
-          <td>=</td>
-          <td class="context-item-value">@version.freeze</td>
-        </tr>
-        </table>
-      </div>
-    </div>
 
 
 
@@ -141,39 +119,6 @@ Class <a href="Mu/Scale.html" class="link">Mu::Scale</a><br />
 
 
     <!-- if method_list -->
-    <div id="methods">
-      <h3 class="section-bar">Public Class methods</h3>
-
-      <div id="method-M000002" class="method-detail">
-        <a name="M000002"></a>
-
-        <div class="method-heading">
-          <a href="Mu.src/M000002.html" target="Code" class="method-signature"
-            onclick="popupCode('Mu.src/M000002.html');return false;">
-          <span class="method-name">check_version</span><span class="method-args">()</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
-
-        <div class="method-heading">
-          <a href="Mu.src/M000001.html" target="Code" class="method-signature"
-            onclick="popupCode('Mu.src/M000001.html');return false;">
-          <span class="method-name">run</span><span class="method-args">(cmd, argv)</span>
-          </a>
-        </div>
-      
-        <div class="method-description">
-        </div>
-      </div>
-
-
-    </div>
 
 
   </div>

data/rdoc/classes/Mu/Command.html

@@ -55,6 +55,14 @@
         <tr class="top-aligned-row">
             <td><strong>In:</strong></td>
             <td>
+                <a href="../../files/lib/mu/command/cmd_appid_rb.html">
+                lib/mu/command/cmd_appid.rb
+                </a>
+        <br />
+                <a href="../../files/lib/mu/command/cmd_netconfig_rb.html">
+                lib/mu/command/cmd_netconfig.rb
+                </a>
+        <br />
                 <a href="../../files/lib/mu/command/cmd_runscale_rb.html">
                 lib/mu/command/cmd_runscale.rb
                 </a>
@@ -65,7 +73,9 @@
         <tr class="top-aligned-row">
             <td><strong>Parent:</strong></td>
             <td>
+                <a href="../Object.html">
                 Object
+               </a>
             </td>
         </tr>
         </table>
@@ -93,7 +103,9 @@
     <div id="class-list">
       <h3 class="section-bar">Classes and Modules</h3>
 
-      Class <a href="Command/Cmd_runscale.html" class="link">Mu::Command::Cmd_runscale</a><br />
+      Class <a href="Command/Cmd_appid.html" class="link">Mu::Command::Cmd_appid</a><br />
+Class <a href="Command/Cmd_netconfig.html" class="link">Mu::Command::Cmd_netconfig</a><br />
+Class <a href="Command/Cmd_runscale.html" class="link">Mu::Command::Cmd_runscale</a><br />
 
     </div>
 

data/rdoc/classes/Mu/Command/Cmd_appid.html

@@ -86,10 +86,10 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000145">cmd_help</a>&nbsp;&nbsp;
-      <a href="#M000148">cmd_run_dir</a>&nbsp;&nbsp;
-      <a href="#M000147">cmd_run_file</a>&nbsp;&nbsp;
-      <a href="#M000146">cmd_running?</a>&nbsp;&nbsp;
+      <a href="#M000053">cmd_help</a>&nbsp;&nbsp;
+      <a href="#M000056">cmd_run_dir</a>&nbsp;&nbsp;
+      <a href="#M000055">cmd_run_file</a>&nbsp;&nbsp;
+      <a href="#M000054">cmd_running?</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -144,12 +144,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000145" class="method-detail">
-        <a name="M000145"></a>
+      <div id="method-M000053" class="method-detail">
+        <a name="M000053"></a>
 
         <div class="method-heading">
-          <a href="Cmd_appid.src/M000145.html" target="Code" class="method-signature"
-            onclick="popupCode('Cmd_appid.src/M000145.html');return false;">
+          <a href="Cmd_appid.src/M000053.html" target="Code" class="method-signature"
+            onclick="popupCode('Cmd_appid.src/M000053.html');return false;">
           <span class="method-name">cmd_help</span><span class="method-args">(argv)</span>
           </a>
         </div>
@@ -161,20 +161,20 @@ displays command-line help
         </div>
       </div>
 
-      <div id="method-M000148" class="method-detail">
-        <a name="M000148"></a>
+      <div id="method-M000056" class="method-detail">
+        <a name="M000056"></a>
 
         <div class="method-heading">
-          <a href="Cmd_appid.src/M000148.html" target="Code" class="method-signature"
-            onclick="popupCode('Cmd_appid.src/M000148.html');return false;">
+          <a href="Cmd_appid.src/M000056.html" target="Code" class="method-signature"
+            onclick="popupCode('Cmd_appid.src/M000056.html');return false;">
           <span class="method-name">cmd_run_dir</span><span class="method-args">(argv)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-runs through a directory of msl files and executes a Studio <a
-href="../Scale.html">Scale</a> test for each one
+runs through a directory of msl files and executes a Studio Scale test for
+each one
 </p>
 <pre>
  * argv = command-line arguments, require a directory (-d) argument
@@ -183,19 +183,19 @@ href="../Scale.html">Scale</a> test for each one
         </div>
       </div>
 
-      <div id="method-M000147" class="method-detail">
-        <a name="M000147"></a>
+      <div id="method-M000055" class="method-detail">
+        <a name="M000055"></a>
 
         <div class="method-heading">
-          <a href="Cmd_appid.src/M000147.html" target="Code" class="method-signature"
-            onclick="popupCode('Cmd_appid.src/M000147.html');return false;">
+          <a href="Cmd_appid.src/M000055.html" target="Code" class="method-signature"
+            onclick="popupCode('Cmd_appid.src/M000055.html');return false;">
           <span class="method-name">cmd_run_file</span><span class="method-args">(argv)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-runs a single Studio <a href="../Scale.html">Scale</a> test
+runs a single Studio Scale test
 </p>
 <pre>
  * argv = command-line arguments, requires a scenario (-s) argument
@@ -203,12 +203,12 @@ runs a single Studio <a href="../Scale.html">Scale</a> test
         </div>
       </div>
 
-      <div id="method-M000146" class="method-detail">
-        <a name="M000146"></a>
+      <div id="method-M000054" class="method-detail">
+        <a name="M000054"></a>
 
         <div class="method-heading">
-          <a href="Cmd_appid.src/M000146.html" target="Code" class="method-signature"
-            onclick="popupCode('Cmd_appid.src/M000146.html');return false;">
+          <a href="Cmd_appid.src/M000054.html" target="Code" class="method-signature"
+            onclick="popupCode('Cmd_appid.src/M000054.html');return false;">
           <span class="method-name">cmd_running?</span><span class="method-args">(argv)</span>
           </a>
         </div>

data/rdoc/classes/Mu/Command/Cmd_appid.src/M000053.html

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>cmd_help (Mu::Command::Cmd_appid)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/mu/command/cmd_appid.rb, line 13</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cmd_help</span> <span class="ruby-identifier">argv</span>
+     <span class="ruby-identifier">help</span>
+  <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/rdoc/classes/Mu/Command/Cmd_appid.src/M000054.html

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>cmd_running? (Mu::Command::Cmd_appid)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../../../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/mu/command/cmd_appid.rb, line 19</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">cmd_running?</span> <span class="ruby-identifier">argv</span>
+    <span class="ruby-keyword kw">if</span> <span class="ruby-ivar">@api</span>.<span class="ruby-identifier">nil?</span>
+      <span class="ruby-identifier">msg</span> <span class="ruby-value str">&quot;false&quot;</span>
+      <span class="ruby-keyword kw">return</span>
+    <span class="ruby-keyword kw">end</span>
+
+    <span class="ruby-identifier">status</span> = <span class="ruby-ivar">@api</span>.<span class="ruby-identifier">status</span>
+    <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">status</span>.<span class="ruby-identifier">nil?</span>
+      <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">status</span>[<span class="ruby-value str">&quot;status&quot;</span>].<span class="ruby-identifier">nil?</span>
+        <span class="ruby-identifier">msg</span> <span class="ruby-identifier">status</span>[<span class="ruby-value str">&quot;status&quot;</span>][<span class="ruby-value str">&quot;running&quot;</span>]
+      <span class="ruby-keyword kw">end</span>
+    <span class="ruby-keyword kw">else</span>
+      <span class="ruby-identifier">msg</span> <span class="ruby-value str">&quot;false&quot;</span>
+    <span class="ruby-keyword kw">end</span>
+  <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>