back to sanity. added a console and updated the test lab

config/test_lab.yml

@@ -6,6 +6,67 @@
    credentials:
      - user: root
        pass: toor
+       admin: true
    os: linux
    flavor: ubuntu
    arch: 64
+ - vmid: backtrack_remote
+   driver: remote_workstation
+   user: root
+   host: vmhost
+   modifiers:
+     - Test
+   credentials:
+     - user: root
+       pass: toor
+       admin: true
+   os: linux
+   flavor: ubuntu
+   arch: 64
+###
+#  Windows XP SP3 - Browser Autopwn Target
+###
+ - vmid: 222
+   hostname: xp
+   description: Windows XP SP3 - Browser Autopwn Target
+   driver: remote_esxi
+   user: root
+   host: vmhost1
+   type: target
+   arch: 32
+   os: linux
+   credentials:
+    - user: msfadmin
+      pass: msfadmin
+      admin: true
+   tags:
+    - ie6
+    - ie7
+    - ie8
+    - firefox
+    - java
+    - flash
+    - quicktime
+###
+#  Windows 7 SP1
+###
+ - vmid: 1111
+   hostname: win7
+   description: Windows 7 SP1 - Browser Autopwn Target
+   driver: remote_esxi
+   user: root
+   host: vmhost1
+   pass: whatever
+   type: target
+   arch: 32
+   os: linux
+   credentials:
+    - user: msfadmin
+      pass: msfadmin
+      admin: true
+   tags:
+    - ie8
+    - firefox
+    - java
+    - flash
+    - quicktime

lib/lab/controller/vsphere_controller.rb

@@ -3,58 +3,14 @@
 
 module Lab
 module Controllers
-module RemoteEsxiController
-
-  # Note that 3.5 was different (vmware-vim-cmd)
-  VIM_CMD = 'vim-cmd'.freeze
+module VsphereController
 
   def self.dir_list(basepath=nil)
     # Does this method really even make sense for esxi?
-    return "Unsupported :("
+    return "Unimplemented"
   end
 
   def self.running_list(user, host)
-    user.gsub!(/(\W)*/, '')
-    host.gsub!(/(\W)*/, '')
-
-    # first get all registered vms
-    registered_vms = self.get_vms(user, host) || []
-    running_vms = []
-
-    # now let's see which ones are running
-    # TODO:  this is ghetto, would be better not to connect repeatedly
-    registered_vms.each do |vm|
-      remote_cmd = "ssh #{user}@#{host} \"#{VIM_CMD} vmsvc/power.getstate #{vm[:id]}\""
-      raw = `#{remote_cmd}`
-      running_vms << vm if raw =~ /Powered on/
-    end
-
-    return running_vms
-  end
-
-private 
-
-  def self.get_vms(user, host)
-    user.gsub!(/(\W)*/, '')
-    host.gsub!(/(\W)*/, '')
-
-    vms = [] # array of VM hashes
-    remote_cmd = "ssh #{user}@#{host} \"#{VIM_CMD} vmsvc/getallvms | grep ^[0-9] | sed 's/[[:blank:]]\\{3,\\}/ /g'\""
-    raw = `#{remote_cmd}`.split("\n")
-
-    raw.each do |line|
-      # So effing ghetto
-      id_and_name = line.split('[datastore').first
-      id = id_and_name.split(' ').first
-
-      # TODO - there's surely a better way to do this.
-      name_array = id_and_name.split(' ')
-      name_array.shift
-      name = name_array.join(' ')
-      vms << {:id => id, :name => name}
-    end
-
-    return vms
   end
 
 end

lib/lab/driver/vsphere_driver.rb

@@ -15,7 +15,7 @@ class VsphereDriver < VmDriver
   def initialize(config)
     unless config['user'] then raise ArgumentError, "Must provide a username" end
     unless config['host'] then raise ArgumentError, "Must provide a hostname" end
-    unless config[''] then raise ArgumentError, "Must provide a password" end
+    unless config['pass'] then raise ArgumentError, "Must provide a password" end
     super(config)
 
     @user = filter_command(config['user'])
@@ -28,7 +28,7 @@ def initialize(config)
       raise "WARNING: Library rbvmomi not found. Could not create driver!"
     end
 
-    vim = RbVmomi::VIM.connect host: @host, user: @user, password: @pass
+    vim = RbVmomi::VIM.connect host: @host, user: @user, password: @pass, insecure: true
     dc = vim.serviceInstance.find_datacenter("datacenter1") or fail "datacenter not found"
     @vm = dc.find_vm("test") or fail "VM not found"
   end

lib/lab/vm_controller.rb

@@ -35,7 +35,7 @@ class VmController
     include Lab::Controllers::FogController
     include Lab::Controllers::DynagenController 
     include Lab::Controllers::RemoteEsxiController
-    include Lab::Controllers::VsphereDriver
+    include Lab::Controllers::VsphereController
     #include Lab::Controllers::QemuController 
     #include Lab::Controllers::QemudoController 
     def initialize (labdef=nil)
@@ -62,15 +62,19 @@ def [](x)
 
     def find_by_vmid(search)
       @vms.each do |vm|
-        return vm if vm.hostname.to_s.downcase == search.to_s.downcase
+        return vm if vm.hostname == search
       end
-      return nil
+    nil
+    end
+
+    def find_by_hostname(search)
+      self.find_by_vmid search
     end
 
     def find_by_tag(search)
       @vms.each do |vm|
         vm.tags.each do |tag| 
-          return vm if tag.downcase == search.to_s.downcase
+          return vm if tag == search
         end
       end
       return nil
@@ -121,6 +125,13 @@ def includes_vmid?(vmid)
     false
     end
 
+    def includes_hostname?(hostname)
+      @vms.each do |vm|
+        return true if (vm.hostname == hostname)
+      end
+    false
+    end
+
     #
     # Build a vm lab from a directory of files. Really only useful for file-based
     # vm hosts. (vmware workstation)