mu 5.7.23 → 5.7.24

data/lib/mu/api/muapi.rb

@@ -2,7 +2,7 @@ class Mu
 class Muapi
   include Helper
   
-  attr_accessor :host, :docroot, :posted_uuid, :run_uuid, :job_id, :username, :password, :params, :expected_error
+  attr_accessor :host, :docroot, :posted_uuid, :run_uuid, :job_id, :username, :password, :params, :expected_error, :filepath
 
   def initialize(host=ENV['MU_IP'], username=ENV['MU_ADMIN_USER'], password=ENV['MU_ADMIN_PASS'])
     @host = host
@@ -56,6 +56,49 @@ class Muapi
     end
     return @run_uuid
   end
+  
+  # starts a test from a template file
+  #  * template = the path and name of the template file that contains a single Test template
+  def run_from_template(template, rename="")
+  	response = import_templates(template)
+  	msg response, Logger::DEBUG
+  	doc = make_xml(response)
+  	uuid = ""
+  	unless doc.xpath("//uuid").empty?
+      node = doc.at_xpath("//uuid")
+      uuid = node.content()
+    end
+    msg uuid, Logger::DEBUG
+    req = "analysis/run?uuid=#{uuid}"
+    unless rename.empty?
+      req = "#{req}&rename=#{rename}"
+    end
+    msg req, Logger::DEBUG
+    doc = @http.get_xml(req)
+    unless doc.xpath("//analysis").empty?
+      @run_uuid = doc.xpath("//analysis")[0].attribute('uuid')
+      return @run_uuid
+    end
+    return @run_uuid
+  end
+  
+  # import templates from a file
+  # * template = the path and name of the template file that contains a single Test template
+  def import_templates(template)
+      # open the file and pull the contents for posting
+      begin
+          data = File.open(template,'r') {|f| f.read }
+      rescue Exception => e
+          msg "File read error for #{template}: #{e}"
+          return
+      end
+      
+      # post the contents of the file
+      response = @http.post("templates/import",whole_file)
+      msg response, Logger::DEBUG
+
+      return response
+  end
 
   # stops a running test
   #  * uuid = the uuid of the test
@@ -104,9 +147,9 @@ class Muapi
   # returns a list of faults from the specified test
   #  * uuid = the uuid of the test
   def get_faults(uuid=@run_uuid)
-    doc = @http.get_xml("templates/export?uuid=#{uuid}")
+    doc = @http.get_xml("analysis/status?uuid=#{uuid}")
     unless doc.xpath("//analysis").empty?
-      faults = @http.get_xml("analysis/getFaultList?uuid=#{uuid}",true)
+      faults = @http.get_xml("analysis/getFaultList?uuid=#{uuid}")
       return faults
     end
     return "error: no analysis with uuid: #{uuid} found"
@@ -149,16 +192,64 @@ class Muapi
     return @http.get_xml("templates/export?uuid=#{uuid}")
   end
 
-  # performs archive operations
+# performs archive operations
   #   * command=run to create a test archive
   #   * command=status to view the status of a test archive job
   #   * command=get to download a test archive job
   #   * uuid = the uuid of the test
-  def archive(command="run", id=@run_uuid, filepath='.')
+  #	  * title = string to include as title if not empty
+  #	  * notes = string to add to notes field if not empty
+  #   * evts = boolean to include evts, default is true
+  #   * pcaps = boolean to include pcaps, default is true
+  #   * samples = boolean to include samples, default is false
+  #   * logo = boolean to include logo, default is false
+  #   * audit = boolean to include audit, default is false
+  #   * sign = boolean to perform sign, default is false
+  def archive(command="run", id=@run_uuid, filepath='.', title="", notes="", evts=true, pcaps=true, samples=false, logo=false, audit=false, sign=false)
     case command
     when 'run'
       request_string = "archive/run?uuid=#{id}"
-      request_string += @params unless @params.nil?
+      # not sure where the hell whis is set so I'm commenting out and running my way
+      #request_string += @params unless @params.nil?
+      # need to set title is not empty
+      if title != "" and title != nil
+      	# replace all spaces with %20 and add
+      	request_string += "&title=" + URI.encode(title)
+      end
+      # need to set notes if not empty
+      if notes != "" and notes != nil
+      	# replace all spaces with %20 and add
+      	request_string += "&notes=" + URI.encode(notes)
+      end
+      tmpS = ""
+      # do we need to add evts
+      if evts
+      	tmpS += "evts,"
+      end
+      # do we need need to add pcaps
+      if pcaps
+      	tmpS += "pcaps,"
+      end
+      # do we need need to add sample pcaps
+      if samples
+      	tmpS += "samples,"
+      end
+      # do we need need to add logo
+      if logo
+      	tmpS += "logo,"
+      end
+      # do we need need to add audit
+      if audit
+      	tmpS += "audit"
+      end
+      if tmpS != ""
+      	request_string += "&include="+tmpS
+      end
+      # do we need need to sign
+      if sign
+      	request_string +=  "&sign"
+      end
+      msg request_string, Logger::DEBUG
       doc = @http.get_xml(request_string)
       unless doc.xpath("//job").empty?
         @job_id = doc.xpath("//job")[0].attribute('id')
@@ -178,7 +269,7 @@ class Muapi
     end
     return false
   end
-
+  
   # performs backup operations
   #  * command=run to create a system backup file.
   #  * command=status to view the status of a backup job. If no backup job is running, gets the date of the most recent backup.

data/lib/mu/api/scale.rb

@@ -55,11 +55,15 @@ class Scale
   #   * param = the parameter to configure (e.g. volume)
   #   * value = the parameter's value ( e.g. 100)
   def configure(param, value)
-     if param == "pattern" and value.is_a?(String)
-         value = JSON.parse(value)
-     end
-     @configuration[param] = value
-     File.open(@config_file,'w'){|f| f.write(JSON.pretty_generate(@configuration))}
+      begin
+          if param == "pattern" and value.is_a?(String)
+              value = JSON.parse(value)
+          end
+          @configuration[param] = value
+          File.open(@config_file,'w'){|f| f.write(JSON.pretty_generate(@configuration))}
+      rescue => e
+          raise "Something is wrong with the JSON parsing or generation:#{e} backtrace:#{e.backtrace}"
+      end
   end
 
   # starts a scale test with the class @configuration object

data/lib/mu/command/cmd_muapi.rb

@@ -53,6 +53,33 @@ class Cmd_muapi < Command
     msg response
     return response
   end
+  
+  # runs an analysis, reference is the posted uuid
+  # ex: cmd_run_template("/path/my_template_file.xml", "my_new_name_for_test")
+  #   * argv = command-line arguments, requires a template file (-f) and an optional name such that each successive run of the same uuid yields a new name
+  def cmd_run_template argv
+    setup argv
+    filepath = @hash['filepath']
+    if @hash['boolean'].nil?
+      rename = ""
+    else
+      rename = @hash['boolean']
+    end
+    response = @api.run_from_template(filepath, rename)
+    msg response
+    return response
+  end
+  
+  # imports xml templates,
+  # ex: import_templates("/path/my_template_file.xml")
+  #   * argv = command-line arguments, requires a template file (-f)
+  def cmd_import_templates argv
+  	setup argv
+    template_file = @hash['filepath']
+  	response = @api.import_templates(template_file)
+    msg response
+    return response
+  end
 
   # aborts a running analysis. the next queued analysis will start
   #   * argv = command-line arguments, requires a uuid (-u) argument specifying the test
@@ -178,7 +205,43 @@ class Cmd_muapi < Command
      setup argv
      command = @hash['command']
      job_id = @hash['uuid']
-     response = @api.archive(command, job_id)
+     includes = @hash['include']
+     filepath = @hash['filepath']
+     if filepath==nil
+        filepath = "."
+     end
+     notes,title=""
+     pcaps,evts = true
+     sign,logo,samples,audit = false
+     if includes!=nil
+     	pcaps,evts = false
+     	includes.split(",").each do | option |
+     		if option=="pcaps"
+     			pcaps=true
+     		elsif option=="evts"
+     			evts = true
+     		elsif option=="sign"
+     			sign = true
+     		elsif option=="logo"
+     			logo = true
+     		elsif option=="samples"
+     			samples = true
+     		elsif option=="audit"
+     			audit = true
+     		elsif option.match(/^notes=/)
+     			matches = option.match(/^notes=(.+)/)
+     			if matches!=nil
+     				notes = matches[1]
+     			end
+     		elsif option.match(/^title=/)
+     			matches = option.match(/^title=(.+)/)
+     			if matches!=nil
+     				title = matches[1]
+     			end
+     		end
+     	end
+     end
+     response = @api.archive(command, job_id, filepath, title, notes, evts, pcaps, samples, logo, audit, sign)
      msg response
      return response
   end
@@ -254,6 +317,11 @@ private
             help
             exit
           end
+          
+          if [ '-i', '--include' ].member? k
+            @hash['include'] = shift(k, argv)
+            next
+          end
 
           if [ '-m', '--mu_string' ].member? k
              mu_string = shift(k, argv)
@@ -294,6 +362,11 @@ private
               @hash['uuid'] = shift(k, argv)
               next
           end
+          
+          if [ '-f', '--filepath' ].member? k
+              @hash['filepath'] = shift(k, argv)
+              next
+          end
 
           if [ '-v', '--verbose' ].member? k
             $log.level = Logger::DEBUG
@@ -308,7 +381,9 @@ private
         helps = [
             { :short => '-b', :long => '--boolean', :value => '<string>', :help => 'boolean arg' },
             { :short => '-c', :long => '--command', :value => '<string>', :help => 'e.g. run|get|status' },
+            { :short => '-f', :long => '--filepath', :value => '', :help => 'the template file to run' },
             { :short => '-h', :long => '--help', :value => '', :help => 'help on command line options' },
+            { :short => '-i', :long => '--include', :value => '<string>', :help => 'comma separated list of options to include' },
             { :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 => '--name', :value => '<string>', :help => 'name for filtering' },
             { :short => '-o', :long => '--output', :value => '<string>', :help => 'output logging to this file' },
@@ -320,7 +395,7 @@ private
         ]
 
         cmds = [
-           "mu cmd_muapi:archive -c <command> -u <uuid>",
+           "mu cmd_muapi:archive -c <command> -u <uuid> -i <notes=\"my notes\",title=\"my title\",pcaps,evts,samples,audit,logo,sign>",
            "mu cmd_muapi:backup -c <command> [-n <name>]",
            "mu cmd_muapi:capture -c <command> -p <port> [-u <uuid>]",
            "mu cmd_muapi:delete -u <uuid>",
@@ -329,11 +404,13 @@ private
            "mu cmd_muapi:get_faults -u <uuid>",
            "mu cmd_muapi:get_name -u <uuid>",
            "mu cmd_muapi:help",
+           "mu cmd_muapi:import_templates -f <my_template_file>",
            "mu cmd_muapi:list -t <type>",
            "mu cmd_muapi:list_by_status -s <status>",
            "mu cmd_muapi:pause -u <uuid>",
            "mu cmd_muapi:resume -u <uuid>",
            "mu cmd_muapi:run -u <uuid> [-b rename]",
+           "mu cmd_muapi:run_template -f <filepath> [-b rename]",
            "mu cmd_muapi:status -u <uuid>",
            "mu cmd_muapi:stop -u <uuid>",
            "mu cmd_muapi:types",

data/lib/mu/command/cmd_runanalysis.rb

@@ -0,0 +1,376 @@
+# Use these commands to access the legacy REST API for Test Runs (Protocol Mutation, Scenario Mutation).
+
+require 'mu/api/muapi'
+class Mu
+class Command
+class Cmd_runfuzz < Command
+
+  attr_accessor :host, :username, :password, :api, :docroot
+
+  # displays command-line help
+  #  * argv = command-line arguments
+  def cmd_help argv
+    help
+  end
+
+  # capture has a set of three commands that are used to generate
+  # packet captures, poll the status and return the resulting file
+  # ex:
+  #   * argv = command-line arguments, requires a command (-c) argument
+  #   * command=run returns the job_id
+  #   * command=status (called after 'run'), requires the job_id (-u) argument
+  #   * command=get (called when status returns "Finished"), requires the job_id (-u) argument
+  #   * port = the Mu interface on which to capture packets
+  def cmd_run argv
+     setup argv
+     # set all aparms
+     archive = @hash['archive']
+     directory = @hash['directory']
+     force = @hash['force']
+     interval = @hash['interval']
+     output = @hash['output']
+     prepend = @hash['prepend']
+     template = @hash['template']
+     uuid = @hash['uuid']
+     
+     # set any timers to minimum non psychotic numbers
+     sleeptime = 10 # 10 sec
+     if force != nil
+     	force = Integer(force)
+     	if force < 1
+     		force = 1
+     	end
+     else 
+    	force = 0
+     end
+     if interval != nil
+     	interval = Integer(interval)
+     	if interval < 5
+     		interval = 5
+     	end
+     	if interval < sleeptime
+     		sleeptime = interval
+     	end
+     else 
+     	interval = 0
+     end
+     
+     # my_uuid_hash is a hash that will contain the name, and uuid of the test to run my_name => my_uuid
+     my_uuid_hash = {}
+     
+     # determine proper execution path: uuid, template, or directory
+     if directory != nil
+     	# load all xml files in directory and add uuids to execution list
+     	files = Dir.glob(File.join(@hash["directory"],"","*.xml"))
+     	files.each do | file |
+     		response = @api.import_templates(file)
+     		msg response, Logger::DEBUG
+     		doc = make_xml(response)
+    		unless doc.xpath("//model_object").empty?
+    			doc.xpath("//model_object").each do |node|
+    				my_uuid = node.xpath("uuid").text
+    				my_name = node.xpath("name").text
+    				my_type = node.xpath("type").text
+    				if my_type=="Analysis"
+    					msg "type = #{my_type} uuid = #{my_uuid} name = #{my_name}", Logger::DEBUG
+    					my_uuid_hash[my_uuid] = my_name
+    				end
+				end
+      		end
+     	end
+     end
+     if template != nil
+     	# import template file into mu and add all uuids to list
+     	response = @api.import_templates(template)
+     	msg response, Logger::DEBUG
+     	doc = make_xml(response)
+    	unless doc.xpath("//model_object").empty?
+    		doc.xpath("//model_object").each do |node|
+    			my_uuid = node.xpath("uuid").text
+    			my_name = node.xpath("name").text
+    			my_type = node.xpath("type").text
+    			if my_type=="Analysis"
+    				msg "type = #{my_type} uuid = #{my_uuid} name = #{my_name}", Logger::DEBUG
+    				my_uuid_hash[my_uuid] = my_name
+    			end
+			end
+      	end
+      end
+      if uuid != nil
+     	# add all uuids to list
+     	if uuid =~ /,/
+     		list = uuid.split(",")
+     		list.each do | my_uuid |
+     			response = @api.get_name(my_uuid)
+     			my_uuid_hash[my_uuid] = response
+     		end
+     	else
+     		# add single uuid to list
+     		response = @api.get_name(uuid)
+     		my_uuid_hash[uuid] = response
+     	end
+     end
+     if my_uuid_hash.empty? 
+     	msg "no valid test option selected, please specify directory, template file, or uuid"
+     	help
+     	exit
+     end
+     
+     # now we run all the tests
+     #msg "RUNNING"
+     results = {}
+     map = my_uuid_hash.each_pair do |key,value|
+     	t1 = Time.now.localtime.tv_sec
+     	confidence_level_5,confidence_level_4,confidence_level_3,confidence_level_2,confidence_level_1 = 0, 0, 0, 0, 0
+     	suspend_time = t1
+     	polling_time = t1
+  		if prepend != nil
+  			name = "#{prepend} #{value}"
+  		else
+  			name = value
+  		end
+  		msg "my name = #{name} with uuid = #{key}"
+  		run = true
+  		run_uuid = @api.run(key, URI.encode(name))
+  		while run
+  			sleep(sleeptime)
+    		status = @api.status(run_uuid)
+    		msg status
+    		t2 = Time.now.localtime.tv_sec
+    		msg t2-t1
+    		if interval > 0
+    			if t2-polling_time > interval
+    				faults = @api.get_faults(run_uuid)
+    				msg faults, Logger::DEBUG
+    				# faults should be an xml doc already
+    				unless faults.xpath("//fault_list_summary").empty?
+    					count = 0
+    					confidence_level_5,confidence_level_4,confidence_level_3,confidence_level_2,confidence_level_1 = 0, 0, 0, 0, 0
+    					faults.xpath("//tba_fault").each do | node |
+    						count += 1
+    						confidence_level = node.xpath("confidence_level").text
+    						title = node.xpath("title").text
+    						fault_detection = node.xpath("fault_detection").text
+    						fault_isolation = node.xpath("fault_isolation").text
+    						attack_type = node.xpath("attack_type").text
+    						if confidence_level =~ /5/
+    							confidence_level_5 += 1
+    						elsif confidence_level =~ /4/
+    							confidence_level_4 += 1
+    						elsif confidence_level =~ /3/
+    							confidence_level_3 += 1
+    						elsif confidence_level =~ /2/
+    							confidence_level_2 += 1
+    						elsif confidence_level =~ /1/
+    							confidence_level_1 += 1
+    						end
+    					end
+    					msg "Current fault count: #{count}, confidence_level 5: #{confidence_level_5}"+ 
+    						", confidence_level 4: #{confidence_level_4}, confidence_level 3: #{confidence_level_3}"+
+    						", confidence_level 2: #{confidence_level_2}, confidence_level 1: #{confidence_level_1}"
+    				end
+    				polling_time = Time.now.localtime.tv_sec
+    			end
+    		end
+    		if status =~ /ABORTED/ or status =~ /FINISHED/ or status =~ /FAILED/
+    			run = false
+    		elsif status =~ /SUSPENDED/
+    			msg "SUSPEND--->"
+    			if t2-suspend_time > force*60
+    				response = @api.resume(run_uuid)
+    				msg response
+    				suspend_time = Time.now.localtime.tv_sec
+    			end
+    		end
+    	end
+    	# now we pull results for run and tabulate fault list
+    	job_id = @api.archive("run",run_uuid,"",name,"Run via Mu Ruby Gem API #{Time.now}",true,true,true,false,false,false)
+	 	job = true
+	 	count = 0
+	 	while job
+	 		job_status = @api.archive("status", job_id)
+	 		msg "job_status = #{job_status}"
+	 		if job_status =~ /Finished/
+	 			job = false
+	 		end
+	 		sleep(sleeptime)
+	 		count += 1
+	 		if count > 30
+	 			job = false
+	 		end 
+	 	end
+	 	if Dir[name] == nil
+  			Dir.mkdir(name)
+		end
+	 	response = @api.archive("get",job_id,name)
+	 	faults = @api.get_faults(run_uuid)
+    	msg faults, Logger::DEBUG
+    	# faults should be an xml doc already
+    	unless faults.xpath("//fault_list_summary").empty?
+    		count = 0
+    		confidence_level_5,confidence_level_4,confidence_level_3,confidence_level_2,confidence_level_1 = 0, 0, 0, 0, 0
+    		faults.xpath("//tba_fault").each do | node |
+    			count += 1
+    			confidence_level = node.xpath("confidence_level").text
+				title = node.xpath("title").text
+    			fault_detection = node.xpath("fault_detection").text
+				fault_isolation = node.xpath("fault_isolation").text
+    			attack_type = node.xpath("attack_type").text
+    			if confidence_level =~ /5/
+    				confidence_level_5 += 1
+				elsif confidence_level =~ /4/
+    				confidence_level_4 += 1
+    			elsif confidence_level =~ /3/
+    				confidence_level_3 += 1
+				elsif confidence_level =~ /2/
+    				confidence_level_2 += 1
+				elsif confidence_level =~ /1/
+    				confidence_level_1 += 1
+				end
+    		end
+    		
+    		msg "Ending fault countfor #{name}: #{count}, confidence_level 5: #{confidence_level_5}"+ 
+    			", confidence_level 4: #{confidence_level_4}, confidence_level 3: #{confidence_level_3}"+
+    			", confidence_level 2: #{confidence_level_2}, confidence_level 1: #{confidence_level_1}"
+    	end
+	 end
+     #response = @api.capture(command, port, job_id)
+     
+     return "RUN"
+  end
+
+private
+
+
+  def setup argv
+    parse_cli argv
+    @host = (@@mu_ip.nil?) ? "127.0.0.1" : @@mu_ip
+    @username  = (@@mu_admin_user.nil?) ? "admin" : @@mu_admin_user
+    @password  = (@@mu_admin_pass.nil?) ? "admin" : @@mu_admin_pass
+    @docroot = "/api/v3"
+    @params = nil
+    @expected_error = nil
+    @api = Muapi.new(@host, @username, @password)
+    msg "Created API object to :#{@host}", Logger::DEBUG
+  end
+
+  def parse_cli argv   
+      args = Array.new
+      @hash = Hash.new
+      while not argv.empty?
+          args << argv.shift if argv.first[0,1] != '-'
+
+          k = argv.shift
+
+          if [ '-a', '--archive' ].member? k
+              @hash['archive'] = shift(k, argv)
+              next
+          end
+
+          if [ '-d', '--dir' ].member? k
+              @hash['directory'] = shift(k, argv)
+              next
+          end
+          
+          if [ '-f', '--force' ].member? k
+              @hash['force'] = shift(k, argv)
+              next
+          end
+
+          if [ '-h', '--help' ].member? k
+            help
+            exit
+          end
+          
+          if [ '-i', '--interval' ].member? k
+              @hash['interval'] = shift(k, argv)
+              next
+          end
+
+          if [ '-m', '--mu_string' ].member? k
+             mu_string = shift(k, argv)
+             if mu_string =~ /(.+?):(.+?)@(.*)/
+               @@mu_admin_user = $1
+               @@mu_admin_pass = $2
+               @@mu_ip = $3
+             end
+             next
+          end
+
+          if [ '-n', '--name' ].member? k
+              @hash['name'] = shift(k, argv)
+              next
+          end
+
+          if [ '-o', '--output' ].member? k
+            $stdout.reopen(shift(k, argv), "w")
+            next
+          end
+
+          if [ '-p', '--prepend' ].member? k
+              @hash['prepend'] = shift(k, argv)
+              next
+          end
+
+          if [ '-t', '--template' ].member? k
+              @hash['template'] = shift(k, argv)
+              next
+          end
+
+          if [ '-u', '--uuid' ].member? k
+              @hash['uuid'] = shift(k, argv)
+              next
+          end
+
+          if [ '-v', '--verbose' ].member? k
+            $log.level = Logger::DEBUG
+            next
+          end
+          msg "Unknown argument #{k}"
+          help
+          exit
+          
+      end
+
+      args
+  end
+
+  def help
+        helps = [
+        	{ :short => '-a', :long => '--archive', :value => '<string>', :help => 'collect all archive result files with comma separated options list, pcaps and evts on by default' },
+            { :short => '-d', :long => '--dir', :value => '<string>', :help => 'directory containing the scenario files' },
+            { :short => '-f', :long => '--force', :value => '<integer>', :help => 'force resume on pause after time elapse in min' },
+            { :short => '-h', :long => '--help', :value => '', :help => 'help on command line options' },
+            { :short => '-i', :long => '--interval', :value => '<integer>', :help => 'execute fault status update at intervalin seconds. minimum = 5' },
+            { :short => '-m', :long => '--mu_string', :value => '<string>', :help => 'user, password, mu_ip in the form of admin:admin@10.9.8.7' },
+            { :short => '-o', :long => '--output', :value => '<string>', :help => 'output logging to this file' },
+            { :short => '-p', :long => '--prepend', :value => '<string>', :help => 'prepend test name with <string>' },
+            { :short => '-t', :long => '--template', :value => '', :help => 'the template file to run' },
+            { :short => '-u', :long => '--uuid', :value => '<string>', :help => 'comma seperated uuid list of template uuids' },
+            { :short => '-v', :long => '--verbose', :value => '', :help => 'set Logger::DEBUG level' }
+        ]
+
+        cmds = [
+           "mu cmd_runfuzz:run -f <string /path/my-template-name.xml> -p <string> -a <string pcaps,evts,samples,logo,audit,sign ",
+        ]
+		
+        max_long_size = helps.inject(0) { |memo, obj| [ obj[:long].size, memo ].max }
+        max_value_size = helps.inject(0) { |memo, obj| [ obj[:value].size, memo ].max }
+        puts
+        puts "Usage: mu cmd_runfuzz <options>"
+        puts
+        helps.each do |h|
+            puts "%-*s %*s %-*s %s" % [max_long_size, h[:long], 2, h[:short], max_value_size, h[:value], h[:help]]
+        end
+        puts
+        puts "Available Commands"
+        puts
+        cmds.each do | c |
+           puts c
+        end
+        puts
+    end
+    
+end
+end # Command
+end # Mu

data/lib/mu/helper.rb

@@ -51,5 +51,22 @@ module Helper
    return arr
   end
 
+  def make_xml(resp)
+    begin
+      if (/<.+>/).match(resp)
+        xmldoc = Nokogiri::XML(resp)
+      else
+        err_node = Nokogiri::XML::Node.new('err_node', xmldoc)
+        err_node.content = resp
+        xmldoc.root << err_node
+      end
+    rescue =>  e
+      msg "Error parsing XML " + e.to_s, Logger::DEBUG
+    ensure
+      msg xmldoc, Logger::DEBUG
+      return xmldoc
+    end
+  end
+
 end
 end # Mu

data/version.rb

@@ -1 +1 @@
-VERSION='5.7.23'
+VERSION='5.7.24'

metadata

@@ -1,125 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mu
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 5.7.24
   prerelease: 
-  version: 5.7.23
 platform: ruby
-authors: 
+authors:
 - MuEng
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-13 00:00:00 -07:00
+date: 2011-05-16 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &21267240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *21267240
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &21266780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *21266780
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &21266320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.16"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.16'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *21266320
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &21265940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hexy
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *21265940
+- !ruby/object:Gem::Dependency
+  name: hexy
+  requirement: &21295160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: uuid
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *21295160
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: &21294660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id006
-description: |-
-  The Mu gem allows users to include mu libraries within scripts
-      that interact with mu appliance software. The gem also supplies command line interfaces
-      to many of these same libraries
-email: 
+  prerelease: false
+  version_requirements: *21294660
+description: ! "The Mu gem allows users to include mu libraries within scripts\n    that
+  interact with mu appliance software. The gem also supplies command line interfaces\n
+  \   to many of these same libraries"
+email:
 - info@mudynamics.com
-executables: 
+executables:
 - mu
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/mu/api/ddt.rb
-- lib/mu/api/homepage.rb
-- lib/mu/api/muapi.rb
+files:
+- lib/mu.rb
+- lib/mu/har.rb
+- lib/mu/http_helper.rb
+- lib/mu/client.rb
 - lib/mu/api/netconfig.rb
-- lib/mu/api/scale.rb
+- lib/mu/api/muapi.rb
+- lib/mu/api/homepage.rb
 - lib/mu/api/system.rb
-- lib/mu/client.rb
+- lib/mu/api/scale.rb
+- lib/mu/api/ddt.rb
+- lib/mu/helper.rb
+- lib/mu/maker.rb
+- lib/mu/command/cmd_homepage.rb
 - lib/mu/command/api.rb
 - lib/mu/command/cmd_ddt.rb
-- lib/mu/command/cmd_homepage.rb
+- lib/mu/command/cmd_scale.rb
+- lib/mu/command/curl.rb
 - lib/mu/command/cmd_muapi.rb
+- lib/mu/command/help.rb
 - lib/mu/command/cmd_musl.rb
-- lib/mu/command/cmd_netconfig.rb
+- lib/mu/command/cmd_system.rb
 - lib/mu/command/cmd_runscale.rb
 - lib/mu/command/cmd_runscenario.rb
+- lib/mu/command/cmd_runanalysis.rb
+- lib/mu/command/cmd_netconfig.rb
 - lib/mu/command/cmd_runverify.rb
-- lib/mu/command/cmd_scale.rb
-- lib/mu/command/cmd_system.rb
-- lib/mu/command/curl.rb
-- lib/mu/command/help.rb
 - lib/mu/command.rb
 - lib/mu/curl/error.rb
 - lib/mu/curl/verify.rb
-- lib/mu/har.rb
-- lib/mu/helper.rb
-- lib/mu/http_helper.rb
-- lib/mu/maker.rb
-- lib/mu.rb
 - bin/mu
 - Mu_Gem.html
 - version.rb
@@ -128,30 +125,26 @@ files:
 has_rdoc: true
 homepage: http://www.mudynamics.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mu Dynamics General Purpose Library and Command Line Tool
 test_files: []
-