netvbox 0.0.5 → 0.0.6

data/README.rdoc

@@ -32,26 +32,41 @@ netvbox uses sub-commands. Below is the help listing.
           adds a vm snapshot on the specified host
       list
           lists vm snapshots
+      listips
+          lists ip addresses of vms with guest additions installed
       load
           loads vm snapshots
       poweroff
           powers off all vms
-      remove <ssh host> <username> <vm name> <snapshot name>
-          removes a vm snapshot from management
+      remove <ssh host> <username> <vm name>
+          removes snapshot of specified vm from management
+      sshhosts <command>
+          runs the specified command on host computers
+      sshguests <ssh user> <ssh password> <command>
+          runs the specified command on guest vms
       status
-           shows status of vms
+          shows status of vms
   
   VM SET SUB-COMMANDS
       createset <set name>
-           creates a vm set with the specified name
+          creates a vm set with the specified name
       currentset
-           shows the current vm set in use
+          shows the current vm set in use
       listsets
-           lists all vm sets
+          lists all vm sets
       removeset <set name>
-           removes the vm set with the specified name
+          removes the vm set with the specified name
       usedefaultset
-           uses the default vm set
+          uses the default vm set
       useset <set name>
-           uses the vm set with the specified name
+          uses the vm set with the specified name
+  
+  * Tip: You will be prompted for input if you leave out sub-command
+         arguments (e.g. netvbox add)
+
 
+== Changelog
+*0.0.6*
+- _Breaking change:_ sub-command, remove, no longer requires snapshot name.
+- _Feature:_ can now list the IP addresses of guest VMs with sub-command, listips.
+- _Feature:_ parallel ssh on hosts or guests. currently only supports ssh with password.

data/bin/netvbox

@@ -17,36 +17,42 @@ def print_help
   puts '        adds a vm snapshot on the specified host'
   puts '    list'
   puts '        lists vm snapshots'
+  puts '    listips'
+  puts '        lists ip addresses of vms with guest additions installed'
   puts '    load'
   puts '        loads vm snapshots'
   puts '    poweroff'
   puts '        powers off all vms'
-  puts '    remove <ssh host> <username> <vm name> <snapshot name>'
-  puts '        removes a vm snapshot from management'
+  puts '    remove <ssh host> <username> <vm name>'
+  puts '        removes snapshot of specified vm from management'
+  puts '    sshhosts <command>'
+  puts '        runs the specified command on host computers'
+  puts '    sshguests <ssh user> <ssh password> <command>'
+  puts '        runs the specified command on guest vms'
   puts '    status'
-  puts '         shows status of vms'
+  puts '        shows status of vms'
   puts
   puts 'VM SET SUB-COMMANDS'
   puts '    createset <set name>'
-  puts '         creates a vm set with the specified name'
+  puts '        creates a vm set with the specified name'
   puts '    currentset'
-  puts '         shows the current vm set in use'
+  puts '        shows the current vm set in use'
   puts '    listsets'
-  puts '         lists all vm sets'
+  puts '        lists all vm sets'
   puts '    removeset <set name>'
-  puts '         removes the vm set with the specified name'
+  puts '        removes the vm set with the specified name'
   puts '    usedefaultset'
-  puts '         uses the default vm set'
+  puts '        uses the default vm set'
   puts '    useset <set name>'
-  puts '         uses the vm set with the specified name'
+  puts '        uses the vm set with the specified name'
   puts
   puts '* Tip: You will be prompted for input if you leave out sub-command'
   puts '       arguments (e.g. netvbox add)'
 end
 
 def expect_args(num_expected_args)
-  if ARGV.length == num_expected_args
-    yield ARGV
+  if ARGV.length - 1 == num_expected_args
+    yield ARGV[1..-1]
   else
     puts 'Wrong number of arguments'
     print_help
@@ -55,6 +61,7 @@ end
 
 def process_args
   command = ARGV[0]
+  has_command_args = ARGV.length > 1
   vm_set_manager = NetVbox::VmSetManager.new(NETVBOX_HOME)
   vm_set = vm_set_manager.current_set
   printing_delegator = NetVbox::PrintingDelegator.new(vm_set_manager, vm_set)
@@ -62,40 +69,51 @@ def process_args
   begin
     case command
     when 'add'
-      return wizard_delegator.add_vm if ARGV.length == 1
-      expect_args(6) do
-        hostname, username, password, vm_name, snapshot_name = ARGV[1..5]
+      return wizard_delegator.add_vm unless has_command_args
+      expect_args(5) do |command_args|
+        hostname, username, password, vm_name, snapshot_name = command_args[0..4]
         printing_delegator.add_vm(hostname, username, password, vm_name, snapshot_name)
       end
     when 'list'
       printing_delegator.list_vms
+    when 'listips'
+      printing_delegator.list_vm_ips
     when 'load'
       printing_delegator.load_snapshots
     when 'poweroff'
       printing_delegator.poweroff_all
     when 'remove'
-      return wizard_delegator.remove_vm if ARGV.length == 1
-      expect_args(5) do
-        hostname, username, vm_name, snapshot_name = ARGV[1..4]
-        printing_delegator.remove_vm(hostname, username, vm_name, snapshot_name)
+      return wizard_delegator.remove_vm unless has_command_args
+      expect_args(3) do |command_args|
+        hostname, username, vm_name = command_args[0..2]
+        printing_delegator.remove_vm(hostname, username, vm_name)
+      end
+    when 'sshhosts'
+      return wizard_delegator.ssh_hosts unless has_command_args
+      expect_args(1) {|command_args| printing_delegator.ssh_hosts command_args[0]}
+    when 'sshguests'
+      return wizard_delegator.ssh_guests unless has_command_args
+      expect_args(3) do |command_args|
+        username, pw, command = command_args[0..2]
+        printing_delegator.ssh_guests(username, pw, command)
       end
     when 'status'
       printing_delegator.print_status
     when 'createset'
-      return wizard_delegator.create_set if ARGV.length == 1
-      expect_args(2) {printing_delegator.create_set ARGV[1]}
+      return wizard_delegator.create_set unless has_command_args
+      expect_args(1) {|command_args| printing_delegator.create_set command_args[0]}
     when 'currentset'
       printing_delegator.print_current_set
     when 'listsets'
       printing_delegator.list_sets
     when 'removeset'
-      return wizard_delegator.remove_set if ARGV.length == 1
-      expect_args(2) {printing_delegator.remove_set ARGV[1]}
+      return wizard_delegator.remove_set unless has_command_args
+      expect_args(1) {|command_args| printing_delegator.remove_set command_args[0]}
     when 'usedefaultset'
       printing_delegator.use_default_set
     when 'useset'
-      return wizard_delegator.use_set if ARGV.length == 1
-      expect_args(2) {printing_delegator.use_set ARGV[1]}
+      return wizard_delegator.use_set unless has_command_args
+      expect_args(1) {|command_args| printing_delegator.use_set command_args[0]}
     else
       puts "Unknown command: #{command}. See help."
     end

data/lib/netvbox/printing_delegator.rb

@@ -26,6 +26,16 @@ module NetVbox
       puts 'No vms' if all_vm_info.empty?
     end
 
+    def list_vm_ips
+      puts 'Retrieving VM IP addresses for VMs with guest additions...'
+      all_ips = @vm_set.all_ips
+      all_ips.each do |vm_info, ip|
+        ip_string = (ip == :ip_unavailable) ? 'unavailable' : ip
+        printf "%-40s %s\n", "#{vm_info.vm_name} on #{vm_info.ssh_connection_info.hostname}", "[#{ip_string}]"
+      end
+      puts 'There are no vms' if all_ips.empty?
+    end
+
     def load_snapshots
       puts 'Loading snapshots...'
       @vm_set.load_snapshots
@@ -38,13 +48,29 @@ module NetVbox
       print_status
     end
 
-    def remove_vm(hostname, username, vm_name, snapshot_name)
+    def remove_vm(hostname, username, vm_name)
       begin
-        @vm_set.remove_vm(hostname, username, vm_name, snapshot_name)
-        puts "Removed (#{vm_name}, #{snapshot_name}) on host, #{hostname}"
+        @vm_set.remove_vm(hostname, username, vm_name)
+        puts "Removed #{vm_name} snapshot on host, #{hostname}"
       rescue => e
-        puts "Could not remove VM snapshot: #{e.message}"
+        puts "Could not remove #{vm_name} snapshot: #{e.message}"
+      end
+    end
+
+    def ssh_hosts(command)
+      all_output = @vm_set.ssh_hosts command
+      all_output.each do |vm_info, output|
+        output.split("\n").each {|line| puts "[#{vm_info.ssh_connection_info.hostname}] #{line}"}
+      end
+      puts 'There are no vms' if all_output.empty?
+    end
+
+    def ssh_guests(username, password, command)
+      all_output = @vm_set.ssh_guests(username, password, command)
+      all_output.each do |vm_info, output|
+        output.split("\n").each {|line| puts "[#{vm_info.vm_name} on #{vm_info.ssh_connection_info.hostname}] #{line}"}
       end
+      puts 'There are no vms' if all_output.empty?
     end
 
     def print_status

data/lib/netvbox/version.rb

@@ -1,3 +1,3 @@
 module NetVbox
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/netvbox/vm.rb

@@ -12,13 +12,9 @@ module NetVbox
     end
 
     def ==(other)
-      self === other &&
-      self.password == other.password
-    end
-
-    def ===(other)
       self.hostname == other.hostname &&
-      self.username == other.username      
+      self.username == other.username &&
+      self.password == other.password
     end
   end
 
@@ -31,16 +27,24 @@ module NetVbox
       @snapshot_name = snapshot_name
     end
 
+    def clashes_with?(other)
+      clashes_with_params?(other.ssh_connection_info.hostname, other.ssh_connection_info.username, other.vm_name)
+    end
+
+    def clashes_with_params?(hostname, username, vm_name)
+      self.ssh_connection_info.hostname == hostname &&
+      self.ssh_connection_info.username == username &&
+      self.vm_name == vm_name
+    end
+
     def ==(other)
       self.ssh_connection_info == other.ssh_connection_info &&
       self.vm_name == other.vm_name &&
       self.snapshot_name == other.snapshot_name
     end
 
-    def ===(other)
-      self.ssh_connection_info === other.ssh_connection_info &&
-      self.vm_name == other.vm_name &&
-      self.snapshot_name == other.snapshot_name      
+    def to_s
+      "host: #{self.ssh_connection_info.hostname}, vm: #{vm_name}, snapshot: #{snapshot_name}"
     end
   end
 
@@ -79,7 +83,28 @@ module NetVbox
       return if showvminfo('accelerate3d') == 'on'
       poweroff
       command = "VBoxManage snapshot \"#{@vm_info.vm_name}\" restore \"#{@vm_info.snapshot_name}\" && VBoxManage startvm \"#{@vm_info.vm_name}\" --type headless"
-      my_ssh {|ssh| ssh.exec!(command)}
+      my_ssh {|ssh| ssh.exec! command}
+    end
+
+    def ssh_host(command)
+      my_ssh {|ssh| ssh.exec! command} || ''
+    end
+
+    def ssh_guest(username, pw, command)
+      begin
+        hostname = vm_ip
+      rescue
+        return 'Guest VM IP unavailable'
+      end
+      ssh_info = SshConnectionInfo.new(hostname, username, pw)
+      my_ssh(ssh_info) {|ssh| ssh.exec! command} || ''
+    end
+
+    def vm_ip
+      command = "VBoxManage guestproperty get \"#{@vm_info.vm_name}\" /VirtualBox/GuestInfo/Net/0/V4/IP"
+      out = my_ssh {|ssh| ssh.exec! command}
+      return out['Value:'.length..-1].strip unless (out =~ /^Value:/).nil?
+      raise "Cannot get IP for #{@vm_info.vm_name}: #{out}"
     end
 
     private
@@ -89,8 +114,7 @@ module NetVbox
       my_ssh {|ssh| ssh.exec!(command).strip}
     end
 
-    def my_ssh
-      ssh_info = @vm_info.ssh_connection_info
+    def my_ssh(ssh_info=@vm_info.ssh_connection_info)
       begin
         # can raise SocketError or Net::SSH::AuthenticationFailed
         Net::SSH.start(ssh_info.hostname, ssh_info.username, :password => ssh_info.password) {|ssh| return yield ssh}
@@ -98,6 +122,8 @@ module NetVbox
         return 'connection error'
       rescue Net::SSH::AuthenticationFailed
         return 'authentication error'
+      rescue => e
+        return e.message
       end
     end
   end

data/lib/netvbox/vm_set.rb

@@ -32,9 +32,8 @@ module NetVbox
       @vm_set_config.add_vm(vm_info)
     end
 
-    def remove_vm(hostname, username, vm_name, snapshot_name)
-      vm_info = VmInfo.new(SshConnectionInfo.new(hostname, username, nil), vm_name, snapshot_name)
-      @vm_set_config.remove_vm(vm_info)
+    def remove_vm(hostname, username, vm_name)
+      @vm_set_config.remove_vm(hostname, username, vm_name)
     end
 
     # return Hash of VmInfo to status
@@ -48,6 +47,45 @@ module NetVbox
       status_map
     end
 
+    # return Hash of VmInfo to (vm ip or :ip_unavailable)
+    def all_ips
+      ip_map = {}
+      threads = []
+      get_vms.each do |vm|
+        threads << Thread.new(vm) do |vm|
+          begin
+            ip_map[vm.vm_info] = vm.vm_ip
+          rescue
+            ip_map[vm.vm_info] = :ip_unavailable
+          end
+        end
+      end
+      threads.each(&:join)
+      ip_map
+    end
+
+    # return Hash of VmInfo to output of command
+    def ssh_hosts(command)
+      output_map = {}
+      threads = []
+      get_vms.each do |vm|
+        threads << Thread.new(vm) {|vm| output_map[vm.vm_info] = vm.ssh_host(command)}
+      end
+      threads.each(&:join)
+      output_map
+    end
+
+    # return Hash of VmInfo to output of command
+    def ssh_guests(username, pw, command)
+      output_map = {}
+      threads = []
+      get_vms.each do |vm|
+        threads << Thread.new(vm) {|vm| output_map[vm.vm_info] = vm.ssh_guest(username, pw, command)}
+      end
+      threads.each(&:join)
+      output_map
+    end
+
     private
 
     def get_vms

data/lib/netvbox/vm_set_config.rb

@@ -19,20 +19,20 @@ module NetVbox
 
     def add_vm(vm_info)
       all = all_vm_info
-      if all.index(vm_info).nil?
+      if all.detect {|i| i.clashes_with? vm_info}.nil?
         write_vm_info(all << vm_info)
       else
-        raise "(#{vm_info.vm_name}, #{vm_info.snapshot_name}) is already under management"
+        raise "The VM, #{vm_info.vm_name}, is already under management"
       end
     end
 
-    def remove_vm(vm_info)
+    def remove_vm(hostname, username, vm_name)
       all = all_vm_info
-      updated = all.select {|i| !(i === vm_info)}
+      updated = all.select {|i| !i.clashes_with_params?(hostname, username, vm_name)}
       if all != updated      
         write_vm_info(updated)
       else
-        raise "(#{vm_info.vm_name}, #{vm_info.snapshot_name}) is not under management"
+        raise "The VM, #{vm_name}, is not under management"
       end
     end
 

data/lib/netvbox/wizard_delegator.rb

@@ -20,8 +20,19 @@ module NetVbox
       hostname = get_value 'Enter hostname of VM host: '
       username = get_value 'Enter ssh username: '
       vm_name = get_value 'Enter VM name: '
-      snapshot_name = get_value 'Enter snapshot name: '
-      @printing_delegator.remove_vm(hostname, username, vm_name, snapshot_name)
+      @printing_delegator.remove_vm(hostname, username, vm_name)
+    end
+
+    def ssh_hosts
+      command = get_value 'Enter command: '
+      @printing_delegator.ssh_hosts command
+    end
+
+    def ssh_guests
+      username = get_value 'Enter ssh username: '
+      pw = get_password 'Enter ssh password: '
+      command = get_value 'Enter command: '
+      @printing_delegator.ssh_guests(username, pw, command)
     end
 
     def create_set

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netvbox
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000 Z
+date: 2011-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &8515500 !ruby/object:Gem::Requirement
+  requirement: &8198200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8515500
+  version_requirements: *8198200
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &8529760 !ruby/object:Gem::Requirement
+  requirement: &8197020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8529760
+  version_requirements: *8197020
 description: 
 email:
 - hsu.dennis@gmail.com