rubiojr-domctl 0.2.20090414130028 → 0.2.20090415143011

data/History.txt

@@ -9,3 +9,11 @@
 
 * lots of new commands implemented
 * bug fixes
+
+=== 0.3 / 2009-04-15
+
+* all the commands are now threaded and faster
+* bug fixes
+* help docs/command improved
+* code cleanup and refactoring
+* better error handling

data/README.txt

@@ -17,7 +17,7 @@ It also serves as an example of Pangea xen-api ruby implementation (http://pange
 
 == SYNOPSIS:
 
-  FIX (code sample of usage)
+* See the getting started guide: http://www.xen-fu.org/blog/?p=86
 
 == REQUIREMENTS:
 

data/bin/domctl

@@ -5,6 +5,15 @@ require 'term/ansicolor'
 gem 'pangea', '~> 0.1'
 require 'pangea'
 
+debug_enabled = false
+
+debug = ! ARGV.index('--debug').nil?
+if debug
+  puts 'Debugging enabled.'
+  debug_enabled = true
+  ARGV.delete('--debug')
+end
+
 begin
   require "#{File.join(File.dirname(__FILE__), '../lib/domctl.rb')}"
 rescue
@@ -16,47 +25,47 @@ include Domctl
 
 DOMCTL_COMMANDS = {
   :cpu_utilisation => {
-    :help => "domctl cpu_utilisation",
+    :help => "domctl cpu_utilisation\n",
     :proc => CpuUtilisationCommand
   },
   :farm_info => {
-    :help => "domctl farm_info",
+    :help => FarmInfoHelp,
     :proc => FarmInfoCommand
   },
   :mem_info => {
-    :help => "domctl mem_info [host]",
+    :help => MemInfoHelp,
     :proc => MemInfoCommand
   },
   :locate_domu => {
-    :help => "domctl locate_domu <domU name>",
+    :help => LocateDomuHelp,
     :proc => LocateDomuCommand
   },
   :list_running => {
-    :help => "domctl list_running <dom0|all>",
+    :help => ListRunningHelp,
     :proc => ListRunningCommand
   },
   :cluster_nodes => {
-    :help => "domctl cluster_nodes",
+    :help => ClusterNodesHelp,
     :proc => ClusterNodesCommand
   },
   :show_vifs => {
-    :help => "domctl show_vifs <domU>",
+    :help => ShowVifsHelp,
     :proc => ShowVifsCommand
   },
   :domu_info => {
-    :help => "domctl domu_info <domU>",
+    :help => DomuInfoHelp,
     :proc => DomuInfoCommand
   },
   :dom0_info => {
-    :help => "domctl dom0_info <dom0>",
+    :help => Dom0InfoHelp,
     :proc => Dom0InfoCommand
   },
   :recent_domus => {
-    :help => "domctl recent_domus",
+    :help => RecentDomusHelp,
     :proc => RecentDomusCommand
   },
   :oldest_domus => {
-    :help => "domctl oldest_domus",
+    :help => OldestDomusHelp,
     :proc => OldestDomusCommand
   },
   :version => {
@@ -68,19 +77,27 @@ DOMCTL_COMMANDS = {
   }
 }
 
+trap("INT") { $stderr.puts "\nAborting."; exit }
+
 Domctl::Config.validate
 command = ARGV.shift
 if command.nil? or DOMCTL_COMMANDS[command.to_sym].nil?
-  HelpCommand.call 
-  exit 1
+ DOMCTL_COMMANDS[:help][:args] = []
+ HelpCommand.call 
+ exit 1
 end
 begin
   args = ARGV
   DOMCTL_COMMANDS[command.to_sym][:args] = args
   DOMCTL_COMMANDS[command.to_sym][:proc].call
+rescue SystemExit => e
+  $stderr.puts "Aborting."
 rescue Exception => e
-  if not e.is_a? SystemExit
+  if debug_enabled
     puts e.message
     puts e.backtrace
+  else
+    puts "CRITICAL: #{e.message}"
   end
 end
+

data/domctl.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{domctl}
-  s.version = "0.2.20090414130028"
+  s.version = "0.2.20090415143011"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio RubioSergio Rubio"]
-  s.date = %q{2009-04-14}
+  s.date = %q{2009-04-15}
   s.default_executable = %q{domctl}
   s.description = %q{Xen Cluster Management Tool}
   s.email = %q{sergio@rubio.namesergio@rubio.name}

data/lib/domctl.rb

@@ -2,5 +2,5 @@ require "#{File.join(File.dirname(__FILE__), 'domctl/config.rb')}"
 require "#{File.join(File.dirname(__FILE__), 'domctl/commands.rb')}"
 
 module Domctl
-  VERSION = "0.2.20090414130247"
+  VERSION = "0.3.20090415155328"
 end

data/lib/domctl/commands/cluster_nodes.rb

@@ -2,6 +2,14 @@ module Domctl
   ################
   # cluster_nodes 
   # ##############
+ClusterNodesHelp = <<-EOF
+
+Usage: domctl cluster_nodes
+
+Show the Xen hosts (dom0) defined in #{Domctl::Config.config_file}
+
+EOF
+
   ClusterNodesCommand = Proc.new do
     Domctl::Config.cluster_nodes.keys.sort.each do |n|
       puts n

data/lib/domctl/commands/dom0_info.rb

@@ -2,6 +2,20 @@ module Domctl
   ################
   # dom0_info
   ################
+
+Dom0InfoHelp = <<-HERE
+
+domctl dom0_info <dom0_name>
+
+Print some info from the given dom0
+
+EXAMPLES
+
+1. domctl dom0_info xen0
+
+"Print info from the xen0 host"
+
+HERE
   Dom0InfoCommand = Proc.new do
     def print_dom0_info(h)
       puts "Label:             #{h.label}"
@@ -12,7 +26,7 @@ module Domctl
       puts "Xen Version:       #{h.software_version['Xen']}"
       puts "Arch:              #{h.software_version['machine']}"
       puts "Kernel Version:    #{h.software_version['release']}"
-      print "CPUs: "
+      print "CPUs:              "
       h.cpus.each do |c|
         print "%.2f  " % (c.utilisation * 100)
       end
@@ -23,13 +37,14 @@ module Domctl
       $stderr.puts DOMCTL_COMMANDS[:dom0_info][:help]
       exit 1
     end
+    Domctl::Config.exit_if_not_defined(dom0)
     dom0.strip.chomp!
     settings = Domctl::Config.cluster_nodes[dom0] 
     begin
       h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
       print_dom0_info(h)
     rescue Exception
-      puts "Error connecting to host #{node}. Skipping."
+      puts "Error connecting to host #{dom0}. Skipping."
     end
   end
 end

data/lib/domctl/commands/domu_info.rb

@@ -2,17 +2,45 @@ module Domctl
   ################
   # domu_info
   ################
+
+DomuInfoHelp = <<-HERE
+
+domctl domu_info <domu_name>
+
+Print some info from the given domU. domu_name can be the full name
+or the partial name from a running domU.
+
+EXAMPLES
+
+1. domctl domu_info vm-test
+
+"Print info from vm-test"
+
+2. domctl domu_info xen0:vm-test
+
+"Print info from vm-test, but match only domUs resident in xen0 host"
+
+HERE
+
   DomuInfoCommand = Proc.new do
-    def print_vm_status(vm)
-      puts "Dom ID:            #{vm.domid}"
-      puts "Max Mem:           #{Pangea::Util::humanize_bytes(vm.dyn_max_mem)}"
-      puts "Min Mem:           #{Pangea::Util::humanize_bytes(vm.dyn_min_mem)}"
-      puts "Power State:       #{vm.power_state}"
-      puts "Resident On:       #{vm.resident_on.label}"
-      puts "Actions:"
-      puts "  after crash:       #{vm.actions_after_crash}"
-      puts "  after reboot:      #{vm.actions_after_reboot}"
-      puts "  after shutdown:    #{vm.actions_after_shutdown}"
+    def print_vm_status(h, vm_label)
+      h.resident_vms.each do |vm|
+        if vm.label =~ /^.*#{vm_label}.*$/
+          puts
+          header = "[#{vm.label}]"
+          puts header
+          puts "-" * header.size
+          puts "Dom ID:            #{vm.domid}"
+          puts "Max Mem:           #{Pangea::Util::humanize_bytes(vm.dyn_max_mem)}"
+          puts "Min Mem:           #{Pangea::Util::humanize_bytes(vm.dyn_min_mem)}"
+          puts "Power State:       #{vm.power_state}"
+          puts "Resident On:       #{vm.resident_on.label}"
+          puts "Actions:"
+          puts "  after crash:       #{vm.actions_after_crash}"
+          puts "  after reboot:      #{vm.actions_after_reboot}"
+          puts "  after shutdown:    #{vm.actions_after_shutdown}"
+        end
+      end
     end
     args = DOMCTL_COMMANDS[:domu_info][:args][0]
     if args.nil?
@@ -20,36 +48,18 @@ module Domctl
       exit 1
     end
     args.strip.chomp!
-    found = false
     # dom0:domU notation
     if args =~ /^.*:.*$/
       host, domu = args.split(':')
       settings = Domctl::Config.cluster_nodes[host]
       h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
-      h.resident_vms.each do |vm|
-        if vm.label == domu
-          found = true
-          print_vm_status(vm)
-        end
-      end
-      puts "DomU #{domu} not found in #{host}" if not found
+      print_vm_status(h, domu)
     else
       domu = args
       puts "Searching..."
-      Domctl::Config.cluster_nodes.each do |node, settings|
-        begin
-          h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
-        rescue Exception
-          puts "Error connecting to host #{node}. Skipping."
-        end
-        h.resident_vms.each do |vm|
-          if vm.label == domu
-            found = true
-            print_vm_status(vm)
-          end
-        end
+      Domctl::Config.each_host do |h|
+        print_vm_status(h, domu)
       end
-      puts "DomU #{domu} not found" if not found
     end
   end
 end

data/lib/domctl/commands/farm_info.rb

@@ -2,23 +2,66 @@ module Domctl
   ################
   # farm_info
   # ##############
+
+FarmInfoHelp = <<-HELP
+
+domctl farm_info
+
+Print info from all the hosts defined in the config file:
+- Memory Free
+- Total Memory
+- Number of CPUs
+- Resident Virtual Machines (domUs)
+- Number of CPUs/Cores
+- CPUs/Cores utilisation
+
+HELP
+
   FarmInfoCommand = Proc.new do
-    puts "Gathering Info..."
+    buffer = ""
+    print "Gathering Info"
+    farm_total_mem = 0
+    farm_free_mem = 0
+    farm_resident_vms = 0
+    farm_cpus = 0
+    farm_hosts = 0
+    threads = []
     Domctl::Config.each_host do |h|
-      puts h.label
-      puts "-------"
-      metrics = h.metrics
-      mfree = Pangea::Util.humanize_bytes(metrics.memory_free)
-      mtotal = Pangea::Util.humanize_bytes(metrics.memory_total)
-      puts "Resident VMs: #{h.resident_vms.size}"
-      puts "Mem Free: #{mfree}  Mem Total: #{mtotal}"
-      cpus = h.cpus.sort { |a,b| a.number <=> b.number }
-      print "CPUs: "
-      cpus.each do |c|
-        print "%.2f  " % (c.utilisation * 100)
+      print '.'
+      threads << Thread.new(buffer) do |bf|
+        farm_hosts += 1
+        buff = ''
+        buff << "\n\n[#{h.label}]\n"
+        buff << "-------\n"
+        metrics = h.metrics
+        mfree = Pangea::Util.humanize_bytes(metrics.memory_free)
+        farm_free_mem += metrics.memory_free.to_i
+        mtotal = Pangea::Util.humanize_bytes(metrics.memory_total)
+        farm_total_mem += metrics.memory_total.to_i
+        vms = h.resident_vms.size - 1
+        farm_resident_vms += vms
+        buff += "Resident VMs: #{vms}\n"
+        buff += "Mem Free: #{mfree}  Mem Total: #{mtotal}\n"
+        cpus = h.cpus.sort { |a,b| a.number <=> b.number }
+        buff += "CPUs (#{cpus.size}): "
+        cpus.each do |c|
+          farm_cpus += 1
+          buff += "%.2f  " % (c.utilisation * 100)
+        end
+        bf << buff
       end
-      puts
-      puts
     end
+    threads.each { |t| t.join }
+    buffer += "\n\n"
+    puts buffer
+    puts
+    puts 'Global Info:'
+    puts '-----------------------------------------------'
+    puts "Farm Hosts:                #{farm_hosts}"
+    puts "Farm Total Memory:         #{Pangea::Util.humanize_bytes(farm_total_mem)}"
+    puts "Farm Free Memory:          #{Pangea::Util.humanize_bytes(farm_free_mem)}"
+    puts "Farm Resident VMs:         #{farm_resident_vms}"
+    puts "Farm CPUs:                 #{farm_cpus}"
+    puts '-----------------------------------------------'
   end
 end

data/lib/domctl/commands/help.rb

@@ -3,28 +3,34 @@ module Domctl
   # help 
   # ##############
   HelpCommand = Proc.new do
-  puts """
-  domctl #{Domctl::VERSION}
+    cmd = DOMCTL_COMMANDS[:help][:args][0]
+    if not cmd.nil? and not DOMCTL_COMMANDS[cmd.to_sym].nil?
+      puts DOMCTL_COMMANDS[cmd.to_sym][:help]
+    else
+puts """
+domctl #{Domctl::VERSION}
 
-  Usage: #{File.basename(__FILE__)} command [arguments...]
+Usage: #{File.basename(__FILE__)} command [arguments...]
 
-    Available commands:
+  Available commands:
 
-    help                          print this help or the help associated
-                                  to a command
-    list_running                  list all running domUs in the specified dom0
-    locate_domu                   find the dom0 hosting the specified domU
-    show_vifs                     list the VIFs from a given domU
-    domu_info                     print DomU info
-    dom0_info                     print Dom0 info
-    recent_domus                  print the last 10 domus created
-    oldest_domus                  print the first 10 domus created
-    mem_info                      print the memory available in a host
-    farm_info                     print statistics from all the Hosts 
-    cpu_utilisation               CPU utilisation from all the Hosts 
+  help                          print this help or the help associated
+                                to a command
+  list_running                  list all running domUs in the specified dom0
+  locate_domu                   find the dom0 hosting the specified domU
+  show_vifs                     list the VIFs from a given domU
+  domu_info                     print DomU info
+  dom0_info                     print Dom0 info
+  recent_domus                  print the last 10 domus created
+  oldest_domus                  print the first 10 domus created
+  mem_info                      print the memory available in a host
+  farm_info                     print statistics from all the Hosts 
+  cpu_utilisation               CPU utilisation from all the Hosts 
+  cluster_nodes                 print the cluster nodes defined in #{Domctl::Config.config_file} 
 
-  Type domctl help <command> to get specific command help.
+Type domctl help <command> to get specific command help.
 
-  """
+"""
+    end
   end
 end

data/lib/domctl/commands/list_running.rb

@@ -2,57 +2,73 @@ module Domctl
   ################
   # list_running
   # ##############
+ListRunningHelp = <<-HERE
+
+Usage: domctl list_running <dom0_name|all>
+
+Lists the running domUs in a given host (in every defined host if 'all' parameter is used instead of the dom0 name)
+
+EXAMPLES
+
+1. domctl list_running xen0
+
+"List all the domUs running in xen0"
+
+2. domctl list_running all
+
+"List all the domUs in every host defined in #{Domctl::Config.config_file}"
+
+HERE
+
   ListRunningCommand = Proc.new do
+    def print_running(h)
+      buffer = "\n"
+      header = 'label'.ljust(30) + 'memory'.ljust(15) + 'power state'.ljust(15) + 'cpus'
+      buffer << "[#{h.label}]".rjust(header.size) + "\n"
+      buffer << header + "\n"
+      buffer << ("-" * header.size) + "\n"
+      h.resident_vms.each do |vm|
+          label = vm.label
+          next if vm.is_control_domain?
+          buffer << "#{label}".ljust(30) 
+          metrics = vm.metrics
+          m = Pangea::Util.humanize_bytes(metrics.memory_actual)
+          buffer << m.ljust(15) 
+          buffer << vm.power_state.to_s.ljust(15) 
+          buffer << metrics.vcpus_number + "\n"
+      end
+      buffer
+    end
     node = DOMCTL_COMMANDS[:list_running][:args][0]
     if node.nil?
       $stderr.puts DOMCTL_COMMANDS[:list_running][:help]
       exit 1
     end
+    threads = []
+    buffer = ''
     if node == 'all'
+      print "Working"
       Domctl::Config.each_host do |h|
-        puts
-        header = 'label'.ljust(30) + 'memory'.ljust(15) + 'power state'.ljust(15) + 'cpus'
-        puts "[#{h.label}]".rjust(header.size)
-        puts header
-        puts "-" * header.size
-        h.resident_vms.each do |vm|
-            label = vm.label
-            next if vm.is_control_domain?
-            print "#{label}".ljust(30) 
-            metrics = vm.metrics
-            m = Pangea::Util.humanize_bytes(metrics.memory_actual)
-            print m.ljust(15) 
-            print vm.power_state.to_s.ljust(15) 
-            print metrics.vcpus_number
-            puts
+        print '.'
+        threads << Thread.new do
+          buffer << print_running(h)
         end
       end
     else
-      if not Domctl::Config.node_defined?(node)
-        $stderr.puts "ERROR: Xen host not defined in #{Domctl::Config.config_file}"
-        exit 1
-      end
+      Domctl::Config.exit_if_not_defined(node)
       settings = Domctl::Config.cluster_nodes[node]
       begin
+        puts 'Working...'
         h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
-        header = 'label'.ljust(30) + 'memory'.ljust(15) + 'power state'.ljust(15) + 'cpus'
-        puts header
-        puts "-" * header.size
-        h.resident_vms.each do |vm|
-            label = vm.label
-            next if vm.is_control_domain?
-            print "#{label}".ljust(30) 
-            metrics = vm.metrics
-            m = Pangea::Util.humanize_bytes(metrics.memory_actual)
-            print m.ljust(15) 
-            print vm.power_state.to_s.ljust(15) 
-            print metrics.vcpus_number
-            puts
+        threads << Thread.new do
+          buffer << print_running(h)
         end
       rescue Exception => e
         puts e.message
         puts "Error connecting to host #{node}. Skipping."
       end
     end
+    threads.each { |t| t.join }
+    puts buffer
   end
 end

data/lib/domctl/commands/locate_domu.rb

@@ -2,29 +2,42 @@ module Domctl
   ################
   # locate_domu 
   # ##############
+LocateDomuHelp = <<-HERE
+
+domctl locate_domu <domU name>
+
+Find the domUs matching <domU name>
+
+EXAMPLES
+
+domctl locate_domu test-vm
+
+"Locates a DomU named test-vm."
+
+HERE
+
   LocateDomuCommand = Proc.new do
     domus = []
-    args = DOMCTL_COMMANDS[:locate_domu][:args]
-    if args.nil?
+    threads = []
+    arg = DOMCTL_COMMANDS[:locate_domu][:args][0]
+    if arg.nil?
       $stderr.puts DOMCTL_COMMANDS[:locate_domu][:help]
       exit 1
     end
     print "Searching"
-    Domctl::Config.cluster_nodes.sort.each do |node, settings|
-      begin
-        h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
-      rescue Exception
-        puts "Error connecting to host #{node}. Skipping."
-      end
-      h.resident_vms.each do |vm|
-        if vm.label =~ /^.*#{args}.*$/
-          domus << "#{node}: #{vm.label}" 
+    Domctl::Config.each_host do |h|
+      print '.'
+      threads << Thread.new do 
+        h.resident_vms.each do |vm|
+          if vm.label =~ /^.*#{arg}.*$/
+            domus << "#{h.label}: #{vm.label}" 
+          end
         end
       end
-      print '.'
     end
+    threads.each { |t| t.join }
     puts
-    puts " Not found." if domus.empty?
+    puts "DomU matching '#{arg}' not found." if domus.empty?
     domus.each { |d| puts d }
   end
 end

data/lib/domctl/commands/mem_info.rb

@@ -2,17 +2,43 @@ module Domctl
   ################
   # mem_info
   # ##############
+
+MemInfoHelp = <<-HERE
+
+Usage: domctl mem_info [dom0_name]
+
+dom0_name is optional. If dom0_name is supplied, it only prints the memory info from the given host.
+
+EXAMPLES
+
+1. domctl mem_info xen0
+
+"Print the memory info from xen0"
+
+2. domctl mem_info
+
+"Print the memory info from all the hosts defined in domctl config file"
+HERE
+
   MemInfoCommand = Proc.new do
     node = DOMCTL_COMMANDS[:mem_info][:args][0]
+    threads = []
+    buffer = ""
     if node.nil?
+      print 'Working'
       Domctl::Config.each_host do |h|
-        mfree = Pangea::Util.humanize_bytes(h.metrics.memory_free)
-        mtotal = Pangea::Util.humanize_bytes(h.metrics.memory_total)
-        print "#{h.label}".ljust(30)
-        print "#{mfree} free".ljust(15)
-        puts "#{mtotal} available"
+        print '.'
+        threads << Thread.new do
+          mfree = Pangea::Util.humanize_bytes(h.metrics.memory_free)
+          mtotal = Pangea::Util.humanize_bytes(h.metrics.memory_total)
+          buffer << "#{h.label.ljust(30)} #{(mfree + ' free').ljust(15)} #{mtotal} available\n"
+        end
       end
+      threads.each { |t| t.join }
+      puts
+      puts buffer
     else
+      Domctl::Config.exit_if_not_defined(node)
       settings = Domctl::Config.cluster_nodes[node]
       begin
         h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])

data/lib/domctl/commands/oldest_domus.rb

@@ -1,13 +1,25 @@
 module Domctl
+OldestDomusHelp = <<-HELP
+
+Usage: domctl oldest_domus
+
+Print the oldest domUs (the first 10 created).
+
+HELP
+
   OldestDomusCommand = Proc.new do
     oldest = []
+    threads = []
     print 'Working '
     Domctl::Config.each_host do |h|
       print '.'
-      h.resident_vms.each do |vm|
-        oldest << [vm.label, vm.metrics.start_time] if vm.label != 'Domain-0'
+      threads << Thread.new do
+        h.resident_vms.each do |vm|
+          oldest << [vm.label, vm.metrics.start_time] if vm.label != 'Domain-0'
+        end
       end
     end
+    threads.each { |t| t.join }
     puts ' done.'
     oldest.sort { |a,b| a[1] <=> b[1] }[0..9].each do |label, date|
       puts "#{label}".ljust(30) + date.to_s

data/lib/domctl/commands/recent_domus.rb

@@ -1,15 +1,28 @@
 module Domctl
+
+RecentDomusHelp = <<-HELP
+
+domctl recent_domus
+
+Print the most recent domUs created (the last 10 created).
+
+HELP
+
   RecentDomusCommand = Proc.new do
     recent = []
+    t = []
     print 'Working '
     Domctl::Config.each_host do |h|
-      print '.'
-      h.resident_vms.each do |vm|
-        recent << [vm.label, vm.metrics.start_time] if vm.label != 'Domain-0'
+      t << Thread.new do
+        print '.'
+        h.resident_vms.each do |vm|
+          recent << [vm.label, vm.metrics.start_time] if vm.label != 'Domain-0'
+        end
       end
     end
+    t.each { |thread| thread.join }
     puts ' done.'
-    recent.sort { |a,b| a[1] <=> b[1] }[-10..-1].each do |label, date|
+    recent.sort { |a,b| a[1] <=> b[1] }[-10..-1].reverse.each do |label, date|
       puts "#{label}".ljust(30) + date.to_s
     end
   end

data/lib/domctl/commands/show_vifs.rb

@@ -2,56 +2,67 @@ module Domctl
   ################
   # show_vifs
   # ##############
+
+ShowVifsHelp = <<-HERE
+
+domctl show_vifs <[dom0_name:]domU_name>
+
+Print the virtual interfaces from the given domU
+
+EXAMPLES
+
+1. domctl show_vifs vm-test
+
+"Print the VIFs found in vm-test (if vm-test exists)"
+
+1. domctl show_vifs xen0:vm-test
+
+"Print the VIFs found in vm-test, but look for vm-test in xen0 host only."
+HERE
+
   ShowVifsCommand = Proc.new do
-    def print_vif(vif)
-      puts "Device:      #{vif.device}"
-      puts "MAC Address: #{vif.mac}"
-      metrics = vif.metrics
-      puts "KBits/s IN:  #{metrics.io_read_kbs}"
-      puts "KBits/s OUT: #{metrics.io_write_kbs}"
+    def print_vifs(h, vm_label)
+      buffer = ''
+      h.resident_vms.each do |vm|
+        if vm.label =~ /^.*#{vm_label}.*$/
+          header = "\n[#{vm.label}]\n"
+          buffer << header
+          buffer << ("-" * header.size)
+          vm.vifs.each do |vif|
+            buffer << "\nDevice:      #{vif.device} **\n"
+            buffer << "MAC Address: #{vif.mac}\n"
+            metrics = vif.metrics
+            buffer << "KBits/s IN:  %.3f\n" % metrics.io_read_kbs
+            buffer << "KBits/s OUT: %.3f\n" % metrics.io_write_kbs
+          end
+        end
+      end
+      buffer
     end
-    found = false
-    args = DOMCTL_COMMANDS[:show_vifs][:args][0]
-    if args.nil?
+    domu_name = DOMCTL_COMMANDS[:show_vifs][:args][0]
+    if domu_name.nil?
       $stderr.puts DOMCTL_COMMANDS[:show_vifs][:help]
       exit 1
     end
-    if args =~ /^.*:.*$/
-      host, domu = args.split(':')
+    if domu_name =~ /^.*:.*$/
+      host, domu = domu_name.split(':')
       Domctl::Config.exit_if_not_defined(host)
       settings = Domctl::Config.cluster_nodes[host]
       h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
-      h.resident_vms.each do |vm|
-        if vm.label == domu
-          found = true
-          puts "#{vm.label}"
-          puts "------------------"
-          vm.vifs.each do |vif|
-            print_vif(vif)
-          end
-        end
-      end
-      puts "DomU #{domu} not found in #{host}" if not found
+      puts print_vifs(h, domu)
     else
-      puts "Searching..."
-      Domctl::Config.cluster_nodes.each do |node, settings|
-        begin
-          h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
-        rescue Exception
-          puts "Error connecting to host #{node}. Skipping."
-        end
-        h.resident_vms.each do |vm|
-          if vm.label == args
-            found = true
-            puts "#{vm.label}"
-            puts "------------------"
-            vm.vifs.each do |vif|
-              print_vif(vif)
-            end
-          end
+      threads = []
+      print "Searching"
+      buffer = ''
+      Domctl::Config.each_host do |h|
+        print '.'
+        threads << Thread.new do
+          buffer << print_vifs(h, domu_name)
         end
       end
+      threads.each { |t| t.join }
+      puts ' done.'
+      puts buffer if not buffer.empty?
     end
-    puts "#{args} not found." if not found
   end
 end

data/lib/domctl/config.rb

@@ -49,7 +49,7 @@ module Domctl
         begin
           h = Pangea::Host.connect(settings['url'], settings['username'], settings['password'])
           yield h
-        rescue Exception
+        rescue Pangea::LinkConnectError => e
           puts "Error connecting to host #{node}. Skipping."
         end
       end
@@ -58,7 +58,7 @@ module Domctl
     def self.exit_if_not_defined(node)
       settings = Domctl::Config.cluster_nodes[node]
       if settings.nil?
-        $stderr.puts "ERROR: Xen host not defined in #{Domctl::Config.config_file}"
+        $stderr.puts "ERROR: Xen host #{node} not defined in #{Domctl::Config.config_file}"
         exit 1
       end
     end

data/scripts/newrelease

@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=0.2.`ruby -e 'puts Time.now.strftime("%Y%m%d%H%M%S")'`
+VERSION=0.3.`ruby -e 'puts Time.now.strftime("%Y%m%d%H%M%S")'`
 echo $VERSION
 sed -i bak "s/VERSION .*$/VERSION = \"$VERSION\"/" lib/domctl.rb
 rm lib/domctl.rbbak

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubiojr-domctl
 version: !ruby/object:Gem::Version 
-  version: 0.2.20090414130028
+  version: 0.2.20090415143011
 platform: ruby
 authors: 
 - Sergio RubioSergio Rubio
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-14 00:00:00 -07:00
+date: 2009-04-15 00:00:00 -07:00
 default_executable: domctl
 dependencies: 
 - !ruby/object:Gem::Dependency