fog-vsphere 3.2.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfa29ecec11049b1398d65cb6c1542b14658a3afad14a9f005f19d5a21b2820a
-  data.tar.gz: 7f356b9fcc49454d530ce22fd244450f0aac04cf2f6ddc1e0072a4c02a684248
+  metadata.gz: 1090356cd911b5f4d34de083d7ebd0c26fc10d976155a4896767dbc8c4593001
+  data.tar.gz: c52e89e4fb8fbb66654d8555abf1c3d962fa1baf915b8bd5ab45f85a6ae6b789
 SHA512:
-  metadata.gz: 6a3dd52da5a8a6a9a2b8cb43ff4dae629efe0e89c6fef8878f6d30278f13901507b4c8c7c03e172dbf597aff7b27335c39ab994dcf3e253dede5ba03e9dbcf48
-  data.tar.gz: e7543eb6086cb7806e5a574e4c889e7576f325749fd98f65564aa55b7451baea68e37ecd05f7f673b8cc584cd5a6a42aff3e051e79da4d906f30f14398234803
+  metadata.gz: 5031553aa6291340875c681f9ec771668bc1465e5b09fca9681713a0bab8feda8c5f08e95c11f99f0ffc7a82c18e76e8f1fba6b7dce923641885ccea0dbc1746
+  data.tar.gz: c1207ec44317315c925f77efe93b8c5469677fb0807cf3163654052eb63ea5941320672a20cf4a36f8fd92a91a747153846d9f474cd7c16bad335be4679809bb

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 sudo: false
-before_install: gem install bundler -v 1.17.3
 matrix:
   allow_failures:
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 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)
+
+## v3.3.0
+* Add support for nsx-t (#248)
+
+## v3.2.5
+* Check cluster existance properly (#239)
+
+## ~~v3.2.3~~
+* Check cluster existance (#239)
+
+## v3.2.2
+* Load simple clusters (#237)
+* ISO upload: correctly check if upload directory exists
+
 ## v3.2.1
 
 * Fix VM creation on storagePod (#234)

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/fog-vsphere.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'fog-core'
   spec.add_runtime_dependency 'rbvmomi', '>= 1.9', '< 3'
 
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry', '~> 0.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'minitest', '~> 5.8'
   spec.add_development_dependency 'rubocop', '~> 0.50.0'
   spec.add_development_dependency 'mocha', '~> 1.8'

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
@@ -276,7 +279,7 @@ module Fog
                     when :datacenter
                       RbVmomi::VIM::Datacenter
                     when :cluster
-                      RbVmomi::VIM::ClusterComputeResource
+                      RbVmomi::VIM::ComputeResource
                     when :host
                       RbVmomi::VIM::HostSystem
                     else

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/create_vm.rb

@@ -4,6 +4,8 @@ module Fog
       class Real
         def create_vm(attributes = {})
           # build up vm configuration
+          cluster = get_raw_cluster(attributes[:cluster], attributes[:datacenter])
+          raise Fog::Vsphere::Compute::NotFound, "Cluster #{attributes[:cluster]} Doesn't Exist in the DC!" unless cluster
 
           vm_cfg = {
             name: attributes[:name],
@@ -24,7 +26,7 @@ module Fog
           resource_pool = if attributes[:resource_pool] && attributes[:resource_pool] != 'Resources'
                             get_raw_resource_pool(attributes[:resource_pool], attributes[:cluster], attributes[:datacenter])
                           else
-                            get_raw_cluster(attributes[:cluster], attributes[:datacenter]).resourcePool
+                            cluster.resourcePool
                           end
           vmFolder      = get_raw_vmfolder(attributes[:path], attributes[:datacenter])
           host = if attributes.key?(:host)
@@ -298,7 +300,7 @@ module Fog
           file_operation = options[:file_operation] || (:create if operation == :add)
           payload[:fileOperation] = file_operation if file_operation
 
-          if operation == :add && disk.thin == 'false' && disk.eager_zero == 'true'
+          if operation == :add && !disk.thin && disk.eager_zero
             payload[:device][:backing][:eagerlyScrub] = disk.eager_zero
           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_networks.rb

@@ -29,6 +29,11 @@ module Fog
                 vlanid: raw_network_vlan(network['config.defaultPortConfig']),
                 virtualswitch: dvswitches[network['config.distributedVirtualSwitch']._ref]
               )
+            elsif network.obj.is_a?(RbVmomi::VIM::OpaqueNetwork)
+              map_attrs_to_hash(network, network_dvportgroup_attribute_mapping).merge(
+                id: network.obj._ref,
+                opaqueNetworkId: network.obj.summary.opaqueNetworkId
+              )
             else
               map_attrs_to_hash(network, network_attribute_mapping).merge(
                 id: network.obj._ref

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/list_vm_interfaces.rb

@@ -29,12 +29,12 @@ module Fog
         # unitNumber: 7,
         #
         def list_vm_interfaces(vm_id, datacenter = nil)
-          get_raw_interfaces(vm_id, datacenter).map { |nic| raw_to_hash nic }
+          get_raw_interfaces(vm_id, datacenter).map { |nic| raw_to_hash(nic, datacenter) }
         end
 
         def get_vm_interface(vm_id, options = {})
           raw = get_raw_interface(vm_id, options)
-          raw_to_hash(raw) if raw
+          raw_to_hash(raw, options[:datacenter]) if raw
         end
 
         def get_raw_interfaces(vm_id, datacenter = nil)
@@ -61,12 +61,16 @@ module Fog
 
         private
 
-        # rubocop:disable Style/ConditionalAssignment
-        def raw_to_hash(nic)
+        def raw_to_hash(nic, datacenter)
           if nic.backing.respond_to?(:network)
             network = nic.backing.network.name
           elsif nic.backing.respond_to?(:port)
             network = nic.backing.port.portgroupKey
+          elsif nic.backing.respond_to?(:opaqueNetworkId)
+            opaquenetworks = list_networks(:datacenter => datacenter).select { |net| net.key?(:opaqueNetworkId) }
+            network = opaquenetworks.find do |opaquenetwork|
+                        nic.backing.opaqueNetworkId == opaquenetwork[:opaqueNetworkId]
+                      end[:id]
           else
             network = nil
           end

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

@@ -37,6 +37,11 @@ module Fog
                         rescue
                           (nil)
                         end),
+              eager_zero: (begin
+                          vol.backing.eagerlyScrub
+                        rescue
+                          (nil)
+                        end),
               mode: vol.backing.diskMode,
               filename: vol.backing.fileName,
               datastore: (begin

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/upload_iso.rb

@@ -21,7 +21,7 @@ module Fog
           datastore = get_raw_datastore(options['datastore'], options['datacenter'])
           datacenter = get_raw_datacenter(options['datacenter'])
           filename = options['filename'] || File.basename(options['local_path'])
-          unless datastore.exists? options['upload_directory'] + '/'
+          unless datastore.exists?(options['upload_directory'])
             connection.serviceContent.fileManager.MakeDirectory name: "[#{options['datastore']}] #{options['upload_directory']}",
                                                                 datacenter: datacenter,
                                                                 createParentDirectories: false

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
@@ -800,7 +803,7 @@ module Fog
                 device: template_nic
               }
             else
-              interface = Fog::Vsphere::Compute::Interface.new(raw_to_hash(template_nic))
+              interface = Fog::Vsphere::Compute::Interface.new(raw_to_hash(template_nic, datacenter))
               specs << create_interface(interface, interface.key, :remove, datacenter: datacenter)
             end
           end
@@ -838,6 +841,7 @@ module Fog
               end
               template_volume.backing.diskMode = new_volume.mode
               template_volume.backing.thinProvisioned = new_volume.thin
+              template_volume.backing.eagerlyScrub = !new_volume.thin && new_volume.eager_zero
               specs << { operation: :edit, device: template_volume }
             else
               specs << { operation: :remove,

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.2.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.2.1
+  version: 3.4.0
 platform: ruby
 authors:
 - J.R. Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -48,16 +48,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -76,16 +76,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -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,8 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.