virtualbox 0.7.9 → 0.8.0

data/lib/virtualbox/com/interface/4.0.x/storage_controller.rb

@@ -0,0 +1,24 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class StorageController < AbstractInterface
+          IID = "6bf8335b-d14a-44a5-9b45-ddc49ce7d5b2"
+
+          property :name, WSTRING, :readonly => true
+          property :max_devices_per_port_count, T_UINT32, :readonly => true
+          property :min_port_count, T_UINT32, :readonly => true
+          property :max_port_count, T_UINT32, :readonly => true
+          property :instance, T_UINT32
+          property :port_count, T_UINT32
+          property :bus, :StorageBus, :readonly => true
+          property :controller_type, :StorageControllerType
+          property :use_host_io_cache, T_BOOL
+
+          function :get_ide_emulation_port, T_INT32, [T_INT32]
+          function :set_ide_emulation_port, nil, [T_INT32, T_INT32]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/storage_controller_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class StorageControllerType < AbstractEnum
+          map [:null, :lsi_logic, :bus_logic, :intel_ahci, :piix3, :piix4, :ich6, :i82078, :lsi_logic_sas]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/system_properties.rb

@@ -0,0 +1,42 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class SystemProperties < AbstractInterface
+          IID = "8030645c-8fef-4320-bb7b-c829f00069dc"
+
+          property :min_guest_ram, T_UINT32, :readonly => true
+          property :max_guest_ram, T_UINT32, :readonly => true
+          property :min_guest_vram, T_UINT32, :readonly => true
+          property :max_guest_vram, T_UINT32, :readonly => true
+          property :min_guest_cpu_count, T_UINT32, :readonly => true
+          property :max_guest_cpu_count, T_UINT32, :readonly => true
+          property :max_guest_monitors, T_UINT32, :readonly => true
+          property :info_vd_size, T_INT64, :readonly => true
+          property :network_adapter_count, T_UINT32, :readonly => true
+          property :serial_port_count, T_UINT32, :readonly => true
+          property :parallel_port_count, T_UINT32, :readonly => true
+          property :max_boot_position, T_UINT32, :readonly => true
+          property :default_machine_folder, WSTRING
+          property :medium_formats, [:MediumFormat], :readonly => true
+          property :default_hard_disk_format, WSTRING
+          property :free_disk_space_warning, T_UINT64
+          property :free_disk_space_percent_warning, T_UINT32
+          property :free_disk_space_error, T_UINT64
+          property :free_disk_space_percent_error, T_UINT64
+          property :vrde_auth_library, WSTRING
+          property :web_service_auth_library, WSTRING
+          property :log_history_count, T_UINT32
+          property :default_audio_driver, :AudioDriverType, :readonly => true
+
+          function :get_max_devices_per_port_for_storage_bus, T_UINT32, [:StorageBus]
+          function :get_min_port_count_for_storage_bus, T_UINT32, [:StorageBus]
+          function :get_max_port_count_for_storage_bus, T_UINT32, [:StorageBus]
+          function :get_max_instances_of_storage_bus, T_UINT32, [:StorageBus]
+          function :get_device_types_for_storage_bus, [:DeviceType], [:StorageBus]
+          function :get_default_io_cache_setting_for_storage_controller, T_BOOL, [:StorageControllerType]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/usb_controller.rb

@@ -0,0 +1,21 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class USBController < AbstractInterface
+          IID = "238540fa-4b73-435a-a38e-4e1d9eab5c17"
+
+          property :enabled, T_BOOL
+          property :enabled_ehci, T_BOOL
+          property :proxy_available, T_BOOL, :readonly => true
+          property :usb_standard, T_UINT16, :readonly => true
+          property :device_filters, [:USBDeviceFilter], :readonly => true
+
+          function :create_device_filter, :USBDeviceFilter, [WSTRING]
+          function :insert_device_filter, nil, [T_UINT32, :USBDeviceFilter]
+          function :remove_device_filter, :USBDeviceFilter, [T_UINT32]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/usb_device.rb

@@ -0,0 +1,24 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class USBDevice < AbstractInterface
+          IID = "f8967b0b-4483-400f-92b5-8b675d98a85b"
+
+          property :id, WSTRING, :readonly => true
+          property :vendor_id, T_UINT16, :readonly => true
+          property :product_id, T_UINT16, :readonly => true
+          property :revision, T_UINT16, :readonly => true
+          property :manfacturer, WSTRING, :readonly => true
+          property :product, WSTRING, :readonly => true
+          property :serial_number, WSTRING, :readonly => true
+          property :address, WSTRING, :readonly => true
+          property :port, T_UINT16, :readonly => true
+          property :version, T_UINT16, :readonly => true
+          property :port_version, T_UINT16, :readonly => true
+          property :remote, T_BOOL, :readonly => true
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/usb_device_filter.rb

@@ -0,0 +1,23 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class USBDeviceFilter < AbstractInterface
+          IID = "d6831fb4-1a94-4c2c-96ef-8d0d6192066d"
+
+          property :name, WSTRING
+          property :active, T_BOOL
+          property :vendor_id, WSTRING
+          property :product_id, WSTRING
+          property :revision, WSTRING
+          property :manufacturer, WSTRING
+          property :product, WSTRING
+          property :serial_number, WSTRING
+          property :port, WSTRING
+          property :remote, WSTRING
+          property :masked_interfaces, T_UINT32
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/usb_device_filter_action.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class USBDeviceFilterAction < AbstractEnum
+          map [:null, :ignore, :hold]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/usb_device_state.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class USBDeviceState < AbstractEnum
+          map [:not_supported, :unavailable, :busy, :available, :help, :captured]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/virtual_box_error_info.rb

@@ -0,0 +1,17 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class VirtualBoxErrorInfo < AbstractInterface
+          IID = "4b86d186-407e-4f9e-8be8-e50061be8725"
+
+          property :result_code, T_UINT32, :readonly => true
+          property :interface_i_d, WSTRING, :readonly => true
+          property :component, WSTRING, :readonly => true
+          property :text, WSTRING, :readonly => true
+          property :next, :VirtualBoxErrorInfo, :readonly => true
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/virtual_system_description.rb

@@ -0,0 +1,19 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class VirtualSystemDescription < AbstractInterface
+          IID = "d7525e6c-531a-4c51-8e04-41235083a3d8"
+
+          property :count, T_UINT32, :readonly => true
+
+          function :get_description, nil, [[:out, [:VirtualSystemDescriptionType]], [:out, [WSTRING]], [:out, [WSTRING]], [:out, [WSTRING]], [:out, [WSTRING]]]
+          function :get_description_by_type, nil, [:VirtualSystemDescriptionType, [:out, [:VirtualSystemDescriptionType]], [:out, [WSTRING]], [:out, [WSTRING]], [:out, [WSTRING]], [:out, [WSTRING]]]
+          function :get_values_by_type, [WSTRING], [:VirtualSystemDescriptionType, :VirtualSystemDescriptionValueType]
+          function :set_final_values, nil, [[T_BOOL], [WSTRING], [WSTRING]]
+          function :add_description, nil, [:VirtualSystemDescriptionType, WSTRING, WSTRING]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/virtual_system_description_type.rb

@@ -0,0 +1,14 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class VirtualSystemDescriptionType < AbstractEnum
+          map [:null, :ignore, :os, :name, :product, :vendor, :version, :product_url, :vendor_url,
+                :description, :license, :misc, :cpu, :memory, :hard_disk_controller_ide,
+                :hard_disk_controller_sata, :hard_disk_controller_scsi, :hard_disk_controller_sas, :hard_disk_image,
+                :floppy, :cdrom, :network_adapter, :usb_controller, :sound_card]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/virtual_system_description_value_type.rb

@@ -0,0 +1,11 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class VirtualSystemDescriptionValueType < AbstractEnum
+          map [:null, :reference, :original, :auto, :extra_config]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/virtualbox.rb

@@ -0,0 +1,50 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class VirtualBox < AbstractInterface
+          IID_STR = "D2DE270C-1D4B-4C9E-843F-BBB9B47269FF"
+
+          property :version, WSTRING, :readonly => true
+          property :revision, T_ULONG, :readonly => true
+          property :package_type, WSTRING, :readonly => true
+          property :home_folder, WSTRING, :readonly => true
+          property :settings_file_path, WSTRING, :readonly => true
+          property :host, :Host, :readonly => true
+          property :system_properties, :SystemProperties, :readonly => true
+          property :machines, [:Machine], :readonly => true
+          property :hard_disks, [:Medium], :readonly => true
+          property :dvd_images, [:Medium], :readonly => true
+          property :floppy_images, [:Medium], :readonly => true
+          property :progress_operations, [:Progress], :readonly => true
+          property :guest_os_types, [:GuestOSType], :readonly => true
+          property :shared_folders, [:SharedFolder], :readonly => true
+          property :performance_collector, :PerformanceCollector, :readonly => true
+          property :dhcp_servers, [:DHCPServer], :readonly => true
+          property :event_source, :EventSource, :readonly => true
+          property :extension_pack_manager, :ExtPackManager, :readonly => true
+
+          function :compose_machine_filename, WSTRING, [WSTRING, WSTRING]
+          function :create_machine, :Machine, [WSTRING, WSTRING, WSTRING, WSTRING, T_BOOL]
+          function :open_machine, :Machine, [WSTRING]
+          function :register_machine, nil, [:Machine]
+          function :find_machine, :Machine, [WSTRING]
+          function :create_appliance, :Appliance, []
+          function :create_hard_disk, :Medium, [WSTRING, WSTRING]
+          function :open_medium, :Medium, [WSTRING, :DeviceType, :AccessMode]
+          function :find_medium, :Medium, [WSTRING, :DeviceType]
+          function :get_guest_os_type, :GuestOSType, [WSTRING]
+          function :create_shared_folder, nil, [WSTRING, WSTRING, T_BOOL, T_BOOL]
+          function :remove_shared_folder, nil, [WSTRING]
+          function :get_extra_data_keys, [WSTRING], []
+          function :get_extra_data, WSTRING, [WSTRING]
+          function :set_extra_data, nil, [WSTRING, WSTRING]
+          function :create_dhcp_server, :DHCPServer, [WSTRING]
+          function :find_dhcp_server_by_network_name, :DHCPServer, [WSTRING]
+          function :remove_dhcp_server, nil, [:DHCPServer]
+          function :check_firmware_present, T_BOOL, [:FirmwareType, WSTRING, [:out, WSTRING], [:out, WSTRING]]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/com/interface/4.0.x/vrde_server.rb

@@ -0,0 +1,23 @@
+module VirtualBox
+  module COM
+    module Interface
+      module Version_4_0_X
+        class VRDEServer < AbstractInterface
+          IID = "72e671bc-1712-4052-ad6b-e45e76d9d3e4"
+
+          property :enabled, T_BOOL
+          property :auth_type, :AuthType
+          property :auth_timeout, T_UINT32
+          property :allow_multi_connection, T_BOOL
+          property :reuse_single_connection, T_BOOL
+          property :vrde_ext_pack, WSTRING
+          property :auth_library, WSTRING
+          property :vrde_properties, [WSTRING], :readonly => true
+
+          function :set_vrde_property, nil, [WSTRING, WSTRING]
+          function :get_vrde_property, WSTRING, [WSTRING]
+        end
+      end
+    end
+  end
+end

data/lib/virtualbox/host_network_interface.rb

@@ -91,7 +91,7 @@ module VirtualBox
     def attached_vms
       parent.parent.vms.find_all do |vm|
         result = vm.network_adapters.find do |adapter|
-          adapter.host_interface == name
+          adapter.enabled? && adapter.host_interface == name
         end
 
         !result.nil?

data/lib/virtualbox/hw_virtualization.rb

@@ -8,6 +8,7 @@ module VirtualBox
       attribute :exclusive, :boolean => true
       attribute :vpid, :boolean => true
       attribute :nested_paging, :boolean => true
+      attribute :force, :boolean => true
     end
 
     class << self

data/lib/virtualbox/network_adapter.rb

@@ -59,7 +59,7 @@ module VirtualBox
     attribute :internal_network
     attribute :host_interface
     attribute :interface, :readonly => true, :property => false
-    relationship :nat_driver, :NATEngine, :version => "3.2", :lazy => true
+    relationship :nat_driver, :NATEngine, :lazy => true
 
     class << self
       # Populates the nic relationship for anything which is related to it.

data/lib/virtualbox/system_properties.rb

@@ -12,16 +12,15 @@ module VirtualBox
     attribute :max_guest_vram, :readonly => true
     attribute :min_guest_cpu_count, :readonly => true
     attribute :max_guest_cpu_count, :readonly => true
-    attribute :max_vdi_size, :readonly => true
+    attribute :info_vd_size, :readonly => true
     attribute :network_adapter_count, :readonly => true
     attribute :serial_port_count, :readonly => true
     attribute :parallel_port_count, :readonly => true
     attribute :max_boot_position, :readonly => true
     attribute :default_machine_folder
-    attribute :default_hard_disk_folder
     attribute :medium_formats, :readonly => true
     attribute :default_hard_disk_format
-    attribute :remote_display_auth_library
+    attribute :vrde_auth_library
     attribute :web_service_auth_library
     attribute :log_history_count
     attribute :default_audio_driver, :readonly => true

data/lib/virtualbox/version.rb

@@ -1,5 +1,5 @@
 module VirtualBox
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 
   module Version
     # Returns a boolean denoting whether the current VirtualBox

data/lib/virtualbox/vm.rb

@@ -146,8 +146,6 @@ module VirtualBox
     attribute :accessible, :readonly => true, :boolean => true
     attribute :hardware_version
     attribute :hardware_uuid
-    # TODO: Removed in 3.2.x, how should we handle this?
-    # attribute :statistics_update_interval
     attribute :firmware_type
     attribute :snapshot_folder
     attribute :settings_file_path, :readonly => true
@@ -169,7 +167,7 @@ module VirtualBox
     relationship :bios, :BIOS
     relationship :hw_virt, :HWVirtualization
     relationship :cpu, :CPU
-    relationship :vrdp_server, :VRDPServer
+    relationship :vrde_server, :VRDEServer
     relationship :storage_controllers, :StorageController, :dependent => :destroy
     relationship :medium_attachments, :MediumAttachment
     relationship :shared_folders, :SharedFolder
@@ -378,7 +376,7 @@ module VirtualBox
     # be modified with an open session on a machine. An open session is similar
     # to a write-lock. Once the session is completed, it must be closed, which
     # this method does as well.
-    def with_open_session
+    def with_open_session(mode=:write)
       # Set the session up
       session = Lib.lib.session
 
@@ -386,23 +384,23 @@ module VirtualBox
 
       if session.state != :open
         # Open up a session for this virtual machine
-        interface.parent.open_session(session, uuid)
+        interface.lock_machine(session, mode)
 
         # Mark the session to be closed
         close_session = true
       end
 
       # Yield the block with the session
-      yield session
+      yield session if block_given?
 
       # Close the session
       if close_session
         # Save these settings only if we're closing and only if the state
         # is not saved, since that doesn't allow the machine to be saved.
-        session.machine.save_settings if session.machine.state != :saved
+        session.machine.save_settings if mode == :write && session.machine.state != :saved
 
         # Close the session
-        session.close
+        session.unlock_machine
       end
     rescue Exception
       # Close the session so we don't get locked out. We use a rescue block
@@ -410,7 +408,7 @@ module VirtualBox
       # exception is raised. Otherwise, we may or may not close the session,
       # depending how deeply nested this call to `with_open_session` is.
       # (see close_session boolean above)
-      session.close if session.state == :open
+      session.unlock_machine if session.state == :open
 
       # Reraise the exception, we're not actually catching it to handle it
       raise
@@ -473,11 +471,8 @@ module VirtualBox
       # Open a new remote session, this will automatically start the machine
       # as well
       session = Lib.lib.session
-      interface.parent.open_remote_session(session, uuid, mode.to_s, "").wait_for_completion(-1)
+      interface.launch_vm_process(session, mode.to_s, "").wait
       true
-    ensure
-      # Be sure to close that session!
-      session.close if session && session.state == :open
     end
 
     # Shuts down the VM by directly calling "acpipowerbutton". Depending on the
@@ -543,16 +538,10 @@ module VirtualBox
     # @param [String] command The command to run on controlvm
     # @return [Boolean] True if command was successful, false otherwise.
     def control(command, *args)
-      # Grab the session using an existing session
-      session = Lib.lib.session
-      interface.parent.open_existing_session(session, uuid)
-
-      # Send the proper command, waiting if we have to
-      result = session.console.send(command, *args)
-      result.wait_for_completion(-1) if result.is_a?(COM::Util.versioned_interface(:Progress))
-    ensure
-      # Close the session
-      session.close if session && session.state == :open
+      with_open_session(:shared) do |session|
+        result = session.console.send(command, *args)
+        result.wait if result.is_a?(COM::Util.versioned_interface(:Progress))
+      end
     end
 
     # Destroys the virtual machine. This method also removes all attached
@@ -567,30 +556,17 @@ module VirtualBox
     #     not only unregister attached media, but will also physically
     #     remove their respective data.
     def destroy(*args)
-      # Destroy all snapshots first (by destroying the root, all children
-      # are automatically destroyed)
-      if root_snapshot
-        destroy_snapshot = lambda do |snapshot|
-          return if snapshot.nil?
-
-          snapshot.children.each { |c| destroy_snapshot.call(c) }
-          snapshot.destroy
-        end
+      # Do a full cleanup on the machine, then delete all the media attached
+      media = interface.unregister(:full)
 
-        destroy_snapshot.call(root_snapshot)
+      if !media.empty?
+        interface.delete(media)
 
-        # Reload ourselves before continuing since snapshots do some
-        # crazy things.
-        reload
+        # TODO: This sleep is silly. The progress object returned by the media
+        # delete always fails to "wait" for some reason, so I do this. I hope
+        # to solve this issue soon.
+        sleep 1
       end
-
-      # Call super first so destroy is propogated through to relationships
-      # first
-      super
-
-      # Finally, destroy this machine and remove the settings file
-      interface.parent.unregister_machine(uuid)
-      interface.delete_settings
     end
 
     # Returns true if the virtual machine state is starting

data/lib/virtualbox/{vrdp_server.rb → vrde_server.rb}

@@ -1,23 +1,23 @@
 module VirtualBox
   # Represents the VRDP Server settings of a {VM}.
-  class VRDPServer < AbstractModel
+  class VRDEServer < AbstractModel
     attribute :parent, :readonly => true, :property => false
     attribute :enabled, :boolean => true
-    attribute :ports
-    attribute :net_address
     attribute :auth_type
     attribute :auth_timeout
     attribute :allow_multi_connection, :boolean => true
     attribute :reuse_single_connection, :boolean => true
+    attribute :vrde_ext_pack
+    attribute :auth_library
 
     class << self
       # Populates a relationship with another model.
       #
       # **This method typically won't be used except internally.**
       #
-      # @return [VRDPServer]
+      # @return [VRDEServer]
       def populate_relationship(caller, imachine)
-        data = new(caller, imachine.vrdp_server)
+        data = new(caller, imachine.vrde_server)
       end
 
       # Saves the relationship.
@@ -28,11 +28,11 @@ module VirtualBox
       end
     end
 
-    def initialize(parent, vrdp_settings)
+    def initialize(parent, vrde_settings)
       write_attribute(:parent, parent)
 
       # Load the attributes and mark the whole thing as existing
-      load_interface_attributes(vrdp_settings)
+      load_interface_attributes(vrde_settings)
       clear_dirty!
       existing_record!
     end
@@ -41,9 +41,7 @@ module VirtualBox
       super
 
       validates_inclusion_of :enabled, :allow_multi_connection, :reuse_single_connection, :in => [true, false]
-      validates_format_of :ports, :with => /^[\d\s\-\.]+$/, :message => "must only contain numbers, spaces, dashes or periods."
-      validates_format_of :net_address, :with => /^[\w\d\-\.]+$/, :message => "must only contain latters, numbers, dashes or periods."
-      validates_inclusion_of :auth_type, :in => COM::Util.versioned_interface(:VRDPAuthType).map
+      validates_inclusion_of :auth_type, :in => COM::Util.versioned_interface(:AuthType).map
       validates_numericality_of :auth_timeout
     end
 
@@ -52,7 +50,7 @@ module VirtualBox
         machine = session.machine
 
         # Save them
-        save_changed_interface_attributes(machine.vrdp_server)
+        save_changed_interface_attributes(machine.vrde_server)
       end
     end
   end

data/test/virtualbox/host_network_interface_test.rb

@@ -109,6 +109,7 @@ class HostNetworkInterfaceTest < Test::Unit::TestCase
 
         interfaces.each do |name|
           adapter = mock("adapter")
+          adapter.stubs(:enabled?).returns(true)
           adapter.stubs(:host_interface).returns(name)
           adapters << adapter
         end