kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

Merge pull request #1740 from aussielunix/vsphere-clone-conflicts

Browse source 
[vsphere|compute] cleanup merge conflicts with clone method
This commit is contained in:
Kevin Menard 2013-10-28 07:40:24 -07:00
commit db4137c76b
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/fog/vsphere/requests/compute/vm_clone.rb
View file

@ -141,6 +141,8 @@ module Fog
# Options['numCPUs'] or Options['memoryMB'] # Options['numCPUs'] or Options['memoryMB']
# Build up the specification for Hardware, for more details see ____________ # Build up the specification for Hardware, for more details see ____________
# https://github.com/rlane/rbvmomi/blob/master/test/test_serialization.rb # https://github.com/rlane/rbvmomi/blob/master/test/test_serialization.rb
# http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html
# FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec
virtual_machine_config_spec.numCPUs = options['numCPUs'] if ( options.has_key?('numCPUs') ) virtual_machine_config_spec.numCPUs = options['numCPUs'] if ( options.has_key?('numCPUs') )
virtual_machine_config_spec.memoryMB = options['memoryMB'] if ( options.has_key?('memoryMB') ) virtual_machine_config_spec.memoryMB = options['memoryMB'] if ( options.has_key?('memoryMB') )
# Options['customization_spec'] # Options['customization_spec']
@ -189,15 +191,6 @@ module Fog
end end
customization_spec ||= nil customization_spec ||= nil
# FIXME: pad this out with the rest of the useful things in VirtualMachineConfigSpec
# http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim.vm.ConfigSpec.html
if options.has_key?('memoryMB') || options.has_key?('numCPUs')
virtual_machine_config_spec = {
:memoryMB => options['memoryMB'],
:numCPUs => options['numCPUs']
}
end
relocation_spec=nil relocation_spec=nil
if ( options['linked_clone'] ) if ( options['linked_clone'] )
# cribbed heavily from the rbvmomi clone_vm.rb # cribbed heavily from the rbvmomi clone_vm.rb