vagrant-vsphere 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca7707beee33ab9618da472c660a46a05e2ca8f4
-  data.tar.gz: bd28c6055786c007862865c0768f053d8309498c
+  metadata.gz: c0b7b0145083bd30757aeba7829a8b75620300dd
+  data.tar.gz: d66b51f6e4a73bd1cf9d2373616c07cead5b6aaf
 SHA512:
-  metadata.gz: 7a83daf3b86d22e1346e463b82d5f54536663cca554d7b4dcd554fdb5cd85bfd114bb02e0a15b126b4f9c6cb5a5e0eba7304484bd050c2cf62ddc7900043e172
-  data.tar.gz: e5457be35238ac4eed9e1c95329ec9f699711d90c80432265dbce8a37cf288adaeb858c8edcbb8d21e1340fb2607f2b66f8fc804c7af0b51e323812f46732096
+  metadata.gz: 98453cec388971d2f0d5b8f1b5e3b50f7aa86203aa9c3ade98f4c7f76c863ccf25ab4af07fff3d0e7c8df59da9f9295a1e09311226432465fbde48d5774908eb
+  data.tar.gz: 029f6cb25ec23bd2219b2cc060f021c93a9343cc037b993ee228c7ae665a04587dc5412ae04cad26eb54151b42faa8904390f81318959d175f8b9920cb7cce41

data/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.18.0
+current_version = 0.19.0
 tag = true
 commit = true
 

data/README.md

@@ -14,9 +14,9 @@ This provider is built on top of the [RbVmomi](https://github.com/vmware/rbvmomi
 * libxml2, libxml2-dev, libxslt, libxslt-dev
 
 ## Current Version
-**version: 0.18.0**
+**version: 0.19.0**
 
-vagrant-vsphere (**version: 0.18.0**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
+vagrant-vsphere (**version: 0.19.0**) is available from [RubyGems.org](https://rubygems.org/gems/vagrant-vsphere)
 
 ## Installation
 
@@ -297,6 +297,9 @@ vagrant destroy
     [#104 clintoncwolfe:shutdown-guest-on-halt](https://github.com/nsidc/vagrant-vsphere/pull/104).
   * Add configuration option `mac` to specify a MAC address for the VM
     [#108 dataplayer:master](https://github.com/nsidc/vagrant-vsphere/pull/108).
+* 0.19.0
+  * Add support for ClusterComputeResource and DatastoreCluster
+    [#101 GregDomjan:StorageSDRS](https://github.com/nsidc/vagrant-vsphere/pull/101).
 
 ## Versioning
 

data/lib/vSphere/action/clone.rb

@@ -26,7 +26,11 @@ module VagrantPlugins
           raise Errors::VSphereError, :'invalid_base_path' if vm_base_folder.nil?
 
           begin
-            location = get_location connection, machine, config, template
+# Storage DRS does not support vSphere linked clones. http://www.vmware.com/files/pdf/techpaper/vsphere-storage-drs-interoperability.pdf
+            ds = get_datastore dc, machine
+            raise Errors::VSphereError, :'invalid_configuration_linked_clone_with_sdrs' if config.linked_clone and datastore.is_a? RbVmomi::VIM::StoragePod
+
+            location = get_location ds, dc, machine, template
             spec = RbVmomi::VIM.VirtualMachineCloneSpec :location => location, :powerOn => true, :template => false
             spec[:config] = RbVmomi::VIM.VirtualMachineConfigSpec
             customization_info = get_customization_spec_info_by_name connection, machine
@@ -37,11 +41,40 @@ module VagrantPlugins
             add_custom_memory(spec, config.memory_mb) unless config.memory_mb.nil?
             add_custom_cpu(spec, config.cpu_count) unless config.cpu_count.nil?
 
-            env[:ui].info I18n.t('vsphere.creating_cloned_vm')
-            env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{template.pretty_path}"
-            env[:ui].info " -- Target VM: #{vm_base_folder.pretty_path}/#{name}"
+            if !config.clone_from_vm and ds.is_a? RbVmomi::VIM::StoragePod
+
+              storageMgr = connection.serviceContent.storageResourceManager
+              podSpec = RbVmomi::VIM.StorageDrsPodSelectionSpec(:storagePod => ds)
+# TODO: May want to add option on type? 
+              storageSpec = RbVmomi::VIM.StoragePlacementSpec(:type => 'clone', :cloneName => name, :folder => vm_base_folder, :podSelectionSpec => podSpec, :vm => template, :cloneSpec => spec)
+
+              env[:ui].info I18n.t('vsphere.requesting_sdrs_recommendation')
+              env[:ui].info " -- DatastoreCluster: #{ds.name}"
+              env[:ui].info " -- Template VM: #{template.pretty_path}"
+              env[:ui].info " -- Target VM: #{vm_base_folder.pretty_path}/#{name}"
+
+              result = storageMgr.RecommendDatastores(:storageSpec => storageSpec)
+
+              recommendation = result.recommendations[0]
+              key = recommendation.key ||= ''
+              if key == ''
+                raise Errors::VSphereError, :missing_datastore_recommendation
+              end
+
+              env[:ui].info I18n.t('vsphere.creating_cloned_vm_sdrs')
+              env[:ui].info " -- Storage DRS recommendation: #{recommendation.target.name} #{recommendation.reasonText}"
 
-            new_vm = template.CloneVM_Task(:folder => vm_base_folder, :name => name, :spec => spec).wait_for_completion
+              applySRresult = storageMgr.ApplyStorageDrsRecommendation_Task(:key => [key]).wait_for_completion
+              new_vm = applySRresult.vm
+
+            else
+
+              env[:ui].info I18n.t('vsphere.creating_cloned_vm')
+              env[:ui].info " -- #{config.clone_from_vm ? "Source" : "Template"} VM: #{template.pretty_path}"
+              env[:ui].info " -- Target VM: #{vm_base_folder.pretty_path}/#{name}"
+
+              new_vm = template.CloneVM_Task(:folder => vm_base_folder, :name => name, :spec => spec).wait_for_completion
+            end
           rescue Errors::VSphereError => e
             raise
           rescue Exception => e
@@ -80,8 +113,8 @@ module VagrantPlugins
           customization_spec
         end
 
-        def get_location(connection, machine, config, template)
-          if config.linked_clone
+        def get_location(datastore, dc, machine, template)
+          if machine.provider_config.linked_clone
             # The API for linked clones is quite strange. We can't create a linked
             # straight from any VM. The disks of the VM for which we can create a
             # linked clone need to be read-only and thus VC demands that the VM we
@@ -113,13 +146,14 @@ module VagrantPlugins
             end
 
             location = RbVmomi::VIM.VirtualMachineRelocateSpec(:diskMoveType => :moveChildMostDiskBacking)
+          elsif datastore.is_a? RbVmomi::VIM::StoragePod
+            location = RbVmomi::VIM.VirtualMachineRelocateSpec
           else
             location = RbVmomi::VIM.VirtualMachineRelocateSpec
 
-            datastore = get_datastore connection, machine
             location[:datastore] = datastore unless datastore.nil?
           end
-          location[:pool] = get_resource_pool(connection, machine) unless config.clone_from_vm
+          location[:pool] = get_resource_pool(dc, machine) unless machine.provider_config.clone_from_vm
           location
         end
 

data/lib/vSphere/util/vim_helpers.rb

@@ -12,15 +12,56 @@ module VagrantPlugins
           get_datacenter(connection, machine).vmFolder.findByUuid machine.id
         end
 
-        def get_resource_pool(connection, machine)
-          cr = get_datacenter(connection, machine).find_compute_resource(machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :missing_compute_resource
-          rp = cr.resourcePool
+        def get_resource_pool(datacenter, machine)
+          computeResource = get_compute_resource(datacenter, machine)
+          rp = computeResource.resourcePool
           if !(machine.provider_config.resource_pool_name.nil?)
-            rp = cr.resourcePool.find(machine.provider_config.resource_pool_name) or  fail Errors::VSphereError, :missing_resource_pool
+            rp = computeResource.resourcePool.find(machine.provider_config.resource_pool_name) or  fail Errors::VSphereError, :missing_resource_pool
           end
           rp
         end
 
+        def get_compute_resource(datacenter, machine)
+          cr = find_clustercompute_or_compute_resource(datacenter, machine.provider_config.compute_resource_name) or fail Errors::VSphereError, :missing_compute_resource
+          cr
+        end
+
+        def find_clustercompute_or_compute_resource(datacenter, path)
+          if path.is_a? String
+            es = path.split('/').reject(&:empty?)
+          elsif path.is_a? Enumerable
+            es = path
+          else
+            fail "unexpected path class #{path.class}"
+          end
+          return datacenter.hostFolder if es.empty?
+          final = es.pop
+          
+          p = es.inject(datacenter.hostFolder) do |f,e|
+            f.find(e, RbVmomi::VIM::Folder) || return
+          end
+
+          begin
+            if x = p.find(final, RbVmomi::VIM::ComputeResource)
+              x
+            elsif x = p.find(final, RbVmomi::VIM::ClusterComputeResource)
+              x
+            else
+              nil
+            end
+          rescue Exception => e
+# When looking for the ClusterComputeResource there seems to be some parser error in RbVmomi Folder.find, try this instead
+            x = p.childEntity.find { |x| x.name == final }
+            if x.is_a? RbVmomi::VIM::ClusterComputeResource or x.is_a? RbVmomi::VIM::ComputeResource
+              x
+            else
+              puts "ex unknown type " + x.to_json
+              nil
+            end
+          end
+
+        end
+
         def get_customization_spec_info_by_name(connection, machine)
           name = machine.provider_config.customization_spec_name
           return if name.nil? || name.empty?
@@ -29,11 +70,12 @@ module VagrantPlugins
           spec = manager.GetCustomizationSpec(:name => name) or fail Errors::VSphereError, :missing_configuration_spec if spec.nil?
         end
 
-        def get_datastore(connection, machine)
+        def get_datastore(datacenter, machine)
           name = machine.provider_config.data_store_name
           return if name.nil? || name.empty?
 
-          get_datacenter(connection, machine).find_datastore name or fail Errors::VSphereError, :missing_datastore
+# find_datastore uses folder datastore that only lists Datastore and not StoragePod, if not found also try datastoreFolder which contains StoragePod(s)
+          datacenter.find_datastore name or datacenter.datastoreFolder.traverse name or fail Errors::VSphereError, :missing_datastore
         end
 
         def get_network_by_name(dc, name)

data/lib/vSphere/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphere
-    VERSION = '0.18.0'
+    VERSION = '0.19.0'
   end
 end

data/locales/en.yml

@@ -2,6 +2,10 @@ en:
   vsphere:
     creating_cloned_vm: |-
       Calling vSphere CloneVM with the following settings:
+    creating_cloned_vm_sdrs: |-
+      Calling vSphere ApplyStorageDrsRecommendation with the following settings:
+    requesting_sdrs_recommendation: |-
+      Calling vSphere RecommendDatastores with StoragePlacementSpec of the following settings:
     vm_clone_success: |-
       New virtual machine successfully cloned and started
     destroy_vm: |-
@@ -44,6 +48,9 @@ en:
         Configured vlan not found
       missing_network_card: |-
         Cannot find network card to customize
+      invalid_configuration_linked_clone_with_sdrs: |-
+        Cannot use Linked Clone with Storage DRS
+
     config:
       host: |-
         Configuration must specify a vSphere host

data/spec/spec_helper.rb

@@ -102,10 +102,16 @@ RSpec.configure do |config|
     @child_resource_pool = double('testresourcepool')
     @root_resource_pool = double('pools', :find => @child_resource_pool)
 
+    @compute_resource = RbVmomi::VIM::ComputeResource.new(nil, nil)
+    @compute_resource.stub(:resourcePool).and_return(@root_resource_pool)
+
+    @host_folder = double('hostFolder', :childEntity => double('childEntity', :find => @compute_resource))
+
     @data_center = double('data_center',
                           :vmFolder => vm_folder,
                           :pretty_path => "data_center/#{vm_folder}",
-                          :find_compute_resource => double('compute resource', :resourcePool => @root_resource_pool))
+                          :find_compute_resource => @compute_resource,
+                          :hostFolder => @host_folder)
 
     @device = RbVmomi::VIM::VirtualEthernetCard.new
     @device.stub(:backing).and_return(RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo.new)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Andrew Grauch