fog-vsphere 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d522f89cf7a0b460bc53861f70f2c14e2e7b9eb28077b6e98ce2bb7c043f88a6
-  data.tar.gz: f8f87ac00f957fb5506b4b52c404ab92e1a1ba17dd5fb77018e858537e4381cd
+  metadata.gz: 1090356cd911b5f4d34de083d7ebd0c26fc10d976155a4896767dbc8c4593001
+  data.tar.gz: c52e89e4fb8fbb66654d8555abf1c3d962fa1baf915b8bd5ab45f85a6ae6b789
 SHA512:
-  metadata.gz: a2b9cd261f022e924d7316f242f9ae7605f657c34254bc0ca98baa6ef3b29218596a141fcba07a2b01b4ca346d6fa43733046cef87c285adbb4cab9682ad0701
-  data.tar.gz: 60a07472cf4acd475431f5b54017a6e5b62ad6c70b35ec969f5ca198158b9b657aa6fa38a631c1679a8cc8eb80bdef3dbc0ba9a6d7108d376cc1c6a60eb5840b
+  metadata.gz: 5031553aa6291340875c681f9ec771668bc1465e5b09fca9681713a0bab8feda8c5f08e95c11f99f0ffc7a82c18e76e8f1fba6b7dce923641885ccea0dbc1746
+  data.tar.gz: c1207ec44317315c925f77efe93b8c5469677fb0807cf3163654052eb63ea5941320672a20cf4a36f8fd92a91a747153846d9f474cd7c16bad335be4679809bb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## v3.4.0
+* list_resource_pools returns incorrect resource pool name (#256)
+* Add ability to create update and delete Resource Pools (#253)
+* Check datastore for existence prior vm_clone
+
 ## v3.3.1
 Fixes eager zero flag (#251, #252)
 

data/CONTRIBUTORS.md

@@ -56,9 +56,10 @@
 * Paul Thornthwaite <paul@brightbox.co.uk>
 * Paul Thornthwaite <tokengeek@gmail.com>
 * Paulo Henrique Lopes Ribeiro <plribeiro3000@gmail.com>
-* Rohan Arora <roarora@redhat.com>
 * Rich Daley <rdaley@williamhill.co.uk>
 * Rich Lane <rlane@club.cc.cmu.edu>
+* Rohan Arora <roarora@redhat.com>
+* Roman Lazoryshchak <lazoryshchak@gmail.com>
 * Samuel Keeley <samuel@dropbox.com>
 * Sergio Cambra <sergio@programatica.es>
 * Shlomi Zadok <shlomi@ben-hanna.com>

data/lib/fog/vsphere/compute.rb

@@ -71,6 +71,9 @@ module Fog
       request :get_cluster
       request :list_resource_pools
       request :get_resource_pool
+      request :create_resource_pool
+      request :update_resource_pool
+      request :destroy_resource_pool
       request :list_networks
       request :get_network
       request :list_datastores

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

@@ -0,0 +1,49 @@
+module Fog
+  module Vsphere
+    class Compute
+      class Real
+        def create_resource_pool(attributes = {})
+          cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
+
+          root_resource_pool = if attributes[:root_resource_pool_name]
+                                 cluster.resourcePool.find attributes[:root_resource_pool_name]
+                               else
+                                 cluster.resourcePool
+                               end
+
+          root_resource_pool.CreateResourcePool(
+            name: attributes[:name],
+            spec: get_resource_pool_spec(attributes)
+          )
+
+          get_resource_pool(attributes[:name], attributes[:cluster], attributes[:datacenter])
+        end
+
+        private
+
+        def get_resource_pool_spec(attributes = {})
+          RbVmomi::VIM.ResourceConfigSpec(
+            cpuAllocation: get_resource_pool_allocation_spec(attributes.fetch(:cpu, {})),
+            memoryAllocation: get_resource_pool_allocation_spec(attributes.fetch(:memory, {}))
+          )
+        end
+
+        def get_resource_pool_allocation_spec(attributes = {})
+          RbVmomi::VIM.ResourceAllocationInfo(
+            reservation: attributes.fetch(:reservation, 0),
+            limit: attributes.fetch(:limit, -1),
+            expandableReservation: attributes.fetch(:expandable_reservation, false),
+            shares: RbVmomi::VIM.SharesInfo(
+              level: RbVmomi::VIM.SharesLevel(attributes.fetch(:shares_level, 'normal')),
+              shares: attributes.fetch(:shares, 0)
+            )
+          )
+        end
+      end
+
+      class Mock
+        def create_resource_pool(attributes = {}); end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Fog
+  module Vsphere
+    class Compute
+      class Real
+        def destroy_resource_pool(attributes = {})
+          get_raw_resource_pool_by_ref(attributes).Destroy_Task().wait_for_completion
+        end
+      end
+
+      class Mock
+        def destroy_resource_pool(attributes = {}); end
+      end
+    end
+  end
+end

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

@@ -36,8 +36,8 @@ module Fog
         end
 
         def resource_pool_attributes(resource_pool, cluster, datacenter)
-          name = folder_path(resource_pool).gsub(/^.*Resources(\/|)/, '')
-          name = 'Resources' if name.empty?
+          folder_path(resource_pool) =~ /(?<=Resources\/)(.+)/
+          name = Regexp.last_match(1) || 'Resources'
           {
             id: managed_obj_id(resource_pool),
             name: name,

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

@@ -0,0 +1,31 @@
+module Fog
+  module Vsphere
+    class Compute
+      class Real
+        def update_resource_pool(attributes = {})
+          raw_resource_pool = get_raw_resource_pool_by_ref(attributes)
+
+          raw_resource_pool.UpdateConfig(
+            name: attributes[:name],
+            config: get_resource_pool_spec(attributes)
+          )
+
+          get_resource_pool(attributes[:name], attributes[:cluster], attributes[:datacenter])
+        end
+
+        private
+
+        def get_raw_resource_pool_by_ref(attributes = {})
+          dc = find_raw_datacenter(attributes[:datacenter])
+          cluster = dc.find_compute_resource(attributes[:cluster])
+
+          list_raw_resource_pools(cluster).detect { |rp| rp._ref == attributes[:ref] }
+        end
+      end
+
+      class Mock
+        def update_resource_pool(attributes = {}); end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,9 @@ module Fog
           raise Fog::Vsphere::Compute::NotFound, "Template #{options['template_path']} Doesn't Exist!" unless get_virtual_machine(options['template_path'], options['datacenter'])
           raise Fog::Vsphere::Compute::NotFound, "Cluster #{options['resource_pool'][0]} Doesn't Exist in the DC!" unless get_raw_cluster(options["resource_pool"][0], options['datacenter'])
           raise ArgumentError, 'path option is required' unless options.fetch('dest_folder', '/')
+          if options.key?('datastore') && !options['datastore'].nil? && !get_raw_datastore(options['datastore'], options['datacenter'])
+            raise Fog::Vsphere::Compute::NotFound, "Datastore #{options['datastore']} Doesn't Exist!"
+          end
           if options.key?('storage_pod') && !options['storage_pod'].nil? && !get_raw_storage_pod(options['storage_pod'], options['datacenter'])
             raise Fog::Vsphere::Compute::NotFound, "Storage Pod #{options['storage_pod']} Doesn't Exist!"
           end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.3.1'.freeze
+    VERSION = '3.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -240,10 +240,12 @@ files:
 - lib/fog/vsphere/requests/compute/cloudinit_to_customspec.rb
 - lib/fog/vsphere/requests/compute/create_folder.rb
 - lib/fog/vsphere/requests/compute/create_group.rb
+- lib/fog/vsphere/requests/compute/create_resource_pool.rb
 - lib/fog/vsphere/requests/compute/create_rule.rb
 - lib/fog/vsphere/requests/compute/create_vm.rb
 - lib/fog/vsphere/requests/compute/current_time.rb
 - lib/fog/vsphere/requests/compute/destroy_group.rb
+- lib/fog/vsphere/requests/compute/destroy_resource_pool.rb
 - lib/fog/vsphere/requests/compute/destroy_rule.rb
 - lib/fog/vsphere/requests/compute/folder_destroy.rb
 - lib/fog/vsphere/requests/compute/get_cluster.rb
@@ -293,6 +295,7 @@ files:
 - lib/fog/vsphere/requests/compute/modify_vm_volume.rb
 - lib/fog/vsphere/requests/compute/revert_to_snapshot.rb
 - lib/fog/vsphere/requests/compute/set_vm_customvalue.rb
+- lib/fog/vsphere/requests/compute/update_resource_pool.rb
 - lib/fog/vsphere/requests/compute/update_vm.rb
 - lib/fog/vsphere/requests/compute/upload_iso.rb
 - lib/fog/vsphere/requests/compute/vm_acquire_ticket.rb
@@ -335,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.