On Wed, 2011-07-27 at 13:23 +0200, [email protected] wrote:
> From: Francesco Vollero <[email protected]>
Great stuff. One minor nit:
> diff --git a/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
> b/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
> index cff74ca..3797123 100644
> --- a/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
> +++ b/server/lib/deltacloud/drivers/vsphere/vsphere_driver.rb
> @@ -229,6 +229,25 @@ module Deltacloud::Drivers::VSphere
> # encoded gzipped ISO image.
> # This image will be uplaoded to the Datastore given in 'realm_id'
> # parameter and them attached to instance.
> + if opts[:user_data] and not opts[:user_data].empty?
> + device = vm[:instance].config.hardware.device.select { |hw|
> hw.class == RbVmomi::VIM::VirtualCdrom }.first
We should raise an error if both user_data and user_iso are set; that
the two are mutually exclusive should also be described in the feature
definition.
David