mu 5.7.2.4 → 5.7.2.5

data/lib/mu/command/cmd_appid.rb

@@ -128,6 +128,18 @@ private
       @testset = @hash['testset']
     end
 
+    if not @hash['delay']
+      @delay = 0
+    else
+      @delay = @hash['delay'].to_i
+    end
+
+    if not @hash['no_verify']
+      @no_verify = false
+    else
+      @no_verify = true
+    end
+
   end
 
   def run(msl)
@@ -150,17 +162,20 @@ private
     all_hosts = get_all_hosts_from_musl(msl)
     @hosts_config = map_all_hosts_to_json(all_hosts)
     @api.configure("hosts", @hosts_config)
-    msg "verifying #{msl} ..."
-    response = @api.verify
-    # sleep 3
-    v = parse_verify_response(response)
-    if v.nil?
-      msg "error in verify"
-      return
-    end
-    if @verify_only
-      msg v
-      return
+    @api.configure("delay", @delay)
+    if @no_verify == false # don't do verify if no_verify==true
+      msg "verifying #{msl} ..."
+      response = @api.verify
+      # sleep 3
+      v = parse_verify_response(response)
+      if v.nil?
+        msg "error in verify"
+        return
+      end
+      if @verify_only
+        msg v
+        return
+      end
     end
     msg "starting #{msl} ..."
     @api.start
@@ -369,6 +384,11 @@ private
               exit
           end
 
+          if [ '-l', '--delay' ].member? k
+            @hash['delay'] = shift(k, argv)
+            next
+          end
+
           if [ '-m', '--mu_string' ].member? k
              mu_string = shift(k, argv)
              if mu_string =~ /(.+?):(.+?)@(.*)/
@@ -379,6 +399,11 @@ private
              next
           end
 
+          if [ '-n', '--no_verify' ].member? k
+            @hash['no_verify'] = true
+            next
+          end
+
           if [ '-o', '--output'].member? k
             $stdout.reopen(shift(k, argv), "w")
             next
@@ -438,7 +463,9 @@ private
             { :short => '-d', :long => '--dir', :value => '<string>', :help => 'directory containing msl files, required for run_dir' }, 
             { :short => '-h', :long => '--help', :value => '', :help => 'help on command line options' },
             { :short => '-i', :long => '--interfaces', :value => '<string>', :help => 'comma-separated list of interfaces, e.g. b1,b2 or b1-1000:0,b2 for ip range and offset' },
+            { :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' },
+            { :short => '-n', :long => '--no_verify', :value => '', :help => 'do not do verify before start' },
             { :short => '-o', :long => '--output', :value => '<string>', :help => 'output logging to this file' },
             { :short => '-p', :long => '--pattern', :value => '<string>', :help => 'pattern in the form of comma-separated concurrency_start-end:duration strings, e.g. 1-10000:60,10000-1:30. Duration is in seconds' },
             { :short => '-r', :long => '--recursive', :value => '', :help => 'for run_dir, recurse through sub-directories' },

data/lib/mu/command/cmd_runscale.rb

@@ -123,6 +123,18 @@ private
       @cmd_line_hosts = @hash['interfaces']
     end
 
+    if not @hash['delay']
+      @delay = 0
+    else
+      @delay = @hash['delay'].to_i
+    end
+
+    if not @hash['no_verify']
+      @no_verify = false
+    else
+      @no_verify = true
+    end
+
   end
 
  def run(scenario)
@@ -149,21 +161,25 @@ private
     File.delete("app_id_stats.csv") if File.exists?("app_id_stats.csv")
 
     configure_hosts
-
-    msg "verifying #{scenario} ..."
-    response = @api.verify
-    msg response, Logger::DEBUG
-    # sleep 3
-    v = parse_verify_response(response)
-    msg "#{v}", Logger::DEBUG
-    if v.nil?
-      msg "error in verify"
-      return
-    end
-    if @verify_only
-      msg v
-      return
+    @api.configure("delay", @delay)
+
+    if @no_verify == false # don't do verify if no_verify==true
+      msg "verifying #{scenario} ..."
+      response = @api.verify
+      msg response, Logger::DEBUG
+      # sleep 3
+      v = parse_verify_response(response)
+      msg "#{v}", Logger::DEBUG
+      if v.nil?
+        msg "error in verify"
+        return
+      end
+      if @verify_only
+        msg v
+        return
+      end
     end
+    
     msg "starting #{scenario} ..."
     @api.start
     start_time = Time.now.to_i
@@ -423,6 +439,11 @@ private
               exit
           end
 
+          if [ '-l', '--delay' ].member? k
+            @hash['delay'] = shift(k, argv)
+            next
+          end
+
           if [ '-m', '--mu_string' ].member? k
              mu_string = shift(k, argv)
              if mu_string =~ /(.+?):(.+?)@(.*)/
@@ -433,6 +454,11 @@ private
              next
           end
 
+          if [ '-n', '--no_verify' ].member? k
+            @hash['no_verify'] = true
+            next
+          end
+
           if [ '-o', '--output' ].member? k
             $stdout.reopen(shift(k, argv), "w")
             next
@@ -494,7 +520,9 @@ private
             { :short => '-f', :long => '--default_host', :value => '<string>', :help => 'default_host setting' },
             { :short => '-h', :long => '--help', :value => '', :help => 'help on command line options' },
             { :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' },
+            { :short => '-n', :long => '--no_verify', :value => '', :help => 'do not do verify before start' },
             { :short => '-o', :long => '--output', :value => '<string>', :help => 'output logging to this file' },
             { :short => '-p', :long => '--pattern', :value => '<string>', :help => 'pattern in the form of comma-separated concurrency_start-end:duration patterns, e.g. 1-100:60,100-100:60,100-1:60' },
             { :short => '-r', :long => '--recursive', :value => '', :help => 'for run_dir, recurse through sub-directories' },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: mu
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 5
   - 7
   - 2
-  - 4
-  version: 5.7.2.4
+  - 5
+  version: 5.7.2.5
 platform: ruby
 authors: 
 - pcapr
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: mu
 dependencies: 
 - !ruby/object:Gem::Dependency