fog-vsphere 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbf8c2995fa660abf28a98251b80558313b774a1bc2e8ef3bc586d45d8064935
-  data.tar.gz: 5866c48ca90536982c801690532da58552c1eddf41152e375c2b5c5cd7c32607
+  metadata.gz: ad810bd0bdd64f88734bbd79e55ec34499638de434018789fee29d7b0e80e18b
+  data.tar.gz: 12ee08e303541b65f02314ab02187a04952dd487198bc33e2c84d87591bf8245
 SHA512:
-  metadata.gz: e0b9e971137d1514ff5d222a220da02ea4666b9bd57e51d961af17d5a797ce1d48291d6a995a1ab4791521f2021c8b7165c6612896db58be6ac3fd0904daeb4d
-  data.tar.gz: b775ee968dc815b746ed032bf499230a95fbe7ff8e34a44c12270be68be5708c88effb117462cca0a6d385335297b594fc6ad5e2a9a9aafc5c2d56837410ae73
+  metadata.gz: 5635212e1c8379224a31165790df4d2c34c09760e3c6b52e6d2a432500d1ec115f174ab09d264690cbd8d544eaeb9d64a946b96fe195d7531ac124aaec43fe2c
+  data.tar.gz: c078f8486725f2749a6c6729952154baf64864e6ce422190680c5b4125f584de5e9739b264f9fea667b49a294fe39ce3d5c1e0e5450522f3172fde86177f00c9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v3.1.1
+
+* Fixes multiple storagePods deployment (#213)
+
 ## v3.1.0
 
 * Adds vcr webmock testing basics (#208)

data/lib/fog/vsphere/requests/compute/create_vm.rb

@@ -33,7 +33,7 @@ module Fog
           # if any volume has a storage_pod set, we deploy the vm on a storage pod instead of the defined datastores
           pod = get_storage_pod_from_volumes(attributes)
           vm = if pod
-                 create_vm_on_storage_pod(pod, vm_cfg, vmFolder, resource_pool, attributes[:datacenter], host)
+                 create_vm_on_storage_pod(pod, attributes[:volumes], vm_cfg, vmFolder, resource_pool, attributes[:datacenter], host)
                else
                  create_vm_on_datastore(vm_cfg, vmFolder, resource_pool, host)
                end
@@ -46,15 +46,17 @@ module Fog
           vm = vmFolder.CreateVM_Task(config: vm_cfg, pool: resource_pool, host: host).wait_for_completion
         end
 
-        def create_vm_on_storage_pod(storage_pod, vm_cfg, vmFolder, resource_pool, datacenter, host = nil)
-          pod_spec = RbVmomi::VIM::StorageDrsPodSelectionSpec.new(
-            storagePod: get_raw_storage_pod(storage_pod, datacenter)
-          )
+        # rubocop:disable Metrics/ParameterLists
+        def create_vm_on_storage_pod(vm_pod_name, volumes, vm_cfg, vmFolder, resource_pool, datacenter, host = nil)
+          disks_per_pod = volumes.group_by(&:storage_pod)
+          disks_per_pod[vm_pod_name] ||= []
+          disks_per_pod[vm_pod_name].concat(disks_per_pod.delete(nil)) if disks_per_pod.key?(nil)
+
           storage_spec = RbVmomi::VIM::StoragePlacementSpec.new(
             type: 'create',
             folder: vmFolder,
             resourcePool: resource_pool,
-            podSelectionSpec: pod_spec,
+            podSelectionSpec: pod_selection_spec(vm_pod_name, disks_per_pod, datacenter),
             configSpec: vm_cfg,
             host: host
           )
@@ -62,8 +64,11 @@ module Fog
           result = srm.RecommendDatastores(storageSpec: storage_spec)
 
           # if result array contains recommendation, we can apply it
-          if key = result.recommendations.first.key
-            result = srm.ApplyStorageDrsRecommendation_Task(key: [key]).wait_for_completion
+          # we need one recomendation for one storagePod
+          grouped_recoms = result.recommendations.group_by { |rec| rec.target._ref }
+          if grouped_recoms.keys.size == disks_per_pod.size
+            keys = grouped_recoms.map { |_ref, recoms| recoms.first.key }
+            result = srm.ApplyStorageDrsRecommendation_Task(key: keys).wait_for_completion
             vm = result.vm
           else
             raise 'Could not create vm on storage pod, did not get a storage recommendation'
@@ -71,6 +76,21 @@ module Fog
           vm
         end
 
+        def pod_selection_spec(vm_pod_name, disks_per_pod, datacenter)
+          raw_pods = {}
+          disks_per_pod.each_key { |pod_name| raw_pods[pod_name] = get_raw_storage_pod(pod_name, datacenter) }
+
+          RbVmomi::VIM::StorageDrsPodSelectionSpec.new(
+            storagePod: raw_pods[vm_pod_name],
+            initialVmConfig: disks_per_pod.map do |name, vols|
+              RbVmomi::VIM::VmPodConfigForPlacement.new(
+                disk: vols.collect { |vol| RbVmomi::VIM::PodDiskLocator.new(diskId: vol.key) },
+                storagePod: raw_pods[name]
+              )
+            end
+          )
+        end
+
         # check if a storage pool is set on any of the volumes and return the first result found or nil
         # return early if vsphere revision is lower than 5 as this is not supported
         def get_storage_pod_from_volumes(attributes)

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -650,14 +650,16 @@ module Fog
           # Clone VM on a storage pod
           if options.key?('storage_pod') && !options['storage_pod'].nil?
             raise ArgumentError, 'need to use at least vsphere revision 5.0 or greater to use storage pods' unless @vsphere_rev.to_f >= 5
-            pod_spec = RbVmomi::VIM::StorageDrsPodSelectionSpec.new(
-              storagePod: get_raw_storage_pod(options['storage_pod'], options['datacenter'])
-            )
+            vm_pod_name = options['storage_pod']
+            disks_per_pod = options['volumes'].group_by(&:storage_pod)
+            disks_per_pod[vm_pod_name] ||= []
+            disks_per_pod[vm_pod_name].concat(disks_per_pod.delete(nil)) if disks_per_pod.key?(nil)
+
             storage_spec = RbVmomi::VIM::StoragePlacementSpec.new(
               type: 'clone',
               folder: dest_folder,
               resourcePool: resource_pool,
-              podSelectionSpec: pod_spec,
+              podSelectionSpec: pod_selection_spec(vm_pod_name, disks_per_pod, options['datacenter']),
               cloneSpec: clone_spec,
               cloneName: options['name'],
               vm: vm_mob_ref
@@ -666,8 +668,11 @@ module Fog
             result = srm.RecommendDatastores(storageSpec: storage_spec)
 
             # if result array contains recommendation, we can apply it
-            if key = result.recommendations.first.key
-              task = srm.ApplyStorageDrsRecommendation_Task(key: [key])
+            # we need one recomendation for one storagePod
+            grouped_recoms = result.recommendations.group_by { |rec| rec.target._ref }
+            if grouped_recoms.keys.size == disks_per_pod.size
+              keys = grouped_recoms.map { |_ref, recoms| recoms.first.key }
+              task = srm.ApplyStorageDrsRecommendation_Task(key: keys)
               if options.fetch('wait', true)
                 result = task.wait_for_completion
                 new_vm = result.vm

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.1.0'.freeze
+    VERSION = '3.1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core