fog-vsphere 3.7.1 → 3.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fde8da8e67f090b3268f7c130b48d8730fb7fc1fcd922579c66f1ee67f50b19
-  data.tar.gz: 3fc30e334b66725ab517afc440dbdcbe3804c0565d8ad6e90d396529d9249d03
+  metadata.gz: 007c81c87f05ab21ba0a6adb8a8bb48a43a6ed64642a463af8d65a12211fae44
+  data.tar.gz: 40124e384e184ffbacd47fd37f1e564f5cdb6a3be87611df65493866f5a55885
 SHA512:
-  metadata.gz: 8a2c98ab7b82db9587b12cfc7bb06bd23a1346a9048cbf16bfec1d6e20b20ec0b9f39ee2a8912f92f7aec3c1a6e42caef3f37f9af6ddd6527468c572c08b76f0
-  data.tar.gz: c7569f04cade03956f13d637a6cebe77d5cefd97535c62b604b62c115c53cd423548f1379a94c96a7f1c74636f57b3f2d58fc26548b43d66580c6b757b7d53f0
+  metadata.gz: ef28241d40f0026f973f0a8660dc9d9a905201fe78c1bc45f8978b86aa1a631580dbb1f257b068f49c5409fdf34849b61d5c3f5512201f0a0494c6a0bbd66b79
+  data.tar.gz: fd3a32c0ad6d6ee14fa7b592d9b872eaeefa022fe5134e6312a5c5cc159f6f21884eec70e35a2aa9b343e806a487c74baf61504238a7095d81dab1d777f34bce

data/fog-vsphere.gemspec

@@ -25,6 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'fog-core'
   spec.add_runtime_dependency 'rbvmomi2', '~> 3.0'
 
+  spec.add_dependency "base64"
+  spec.add_dependency "ostruct"
+
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rake', '>= 12.3.3'

data/lib/fog/vsphere/compute.rb

@@ -120,6 +120,7 @@ module Fog
       request :revert_to_snapshot
       request :list_processes
       request :upload_iso
+      request :destroy_iso
       request :folder_destroy
       request :create_rule
       request :list_rules

data/lib/fog/vsphere/models/compute/server.rb

@@ -290,11 +290,11 @@ module Fog
         end
 
         def scsi_controllers
-          attributes[:scsi_controllers] ||= service.list_vm_scsi_controllers(id)
+          attributes[:scsi_controllers] ||= id.nil? ? [] : service.list_vm_scsi_controllers(id)
         end
 
         def nvme_controllers
-          attributes[:nvme_controllers] ||= service.list_vm_nvme_controllers(id)
+          attributes[:nvme_controllers] ||= id.nil? ? [] : service.list_vm_nvme_controllers(id)
         end
 
         def scsi_controller

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

@@ -136,7 +136,7 @@ module Fog
         def device_change(attributes)
           devices = []
           if (nics = attributes[:interfaces])
-            devices << nics.map { |nic| create_interface(nic, nics.index(nic), :add, attributes) }
+            devices << nics.each_with_index.map { |nic, index| create_interface(nic, index, :add, attributes) }
           end
 
           if (scsi_controllers = attributes[:scsi_controllers] || attributes['scsi_controller'])
@@ -152,7 +152,7 @@ module Fog
           end
 
           if (cdroms = attributes[:cdroms])
-            devices << cdroms.map { |cdrom| create_cdrom(cdrom, cdroms.index(cdrom)) }
+            devices << cdroms.each_with_index.map { |cdrom, index| create_cdrom(cdrom, index) }
           end
 
           devices << create_virtual_tpm if attributes[:virtual_tpm]
@@ -189,9 +189,9 @@ module Fog
               if nics = attributes[:interfaces]
                 # key is based on 4000 + the interface index
                 # we allow booting from all network interfaces, the first interface has the highest priority
-                nics.each do |nic|
+                nics.each_with_index do |_nic, index|
                   boot_order << RbVmomi::VIM::VirtualMachineBootOptionsBootableEthernetDevice.new(
-                    deviceKey: 4000 + nics.index(nic)
+                    deviceKey: 4000 + index
                   )
                 end
               end

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

@@ -0,0 +1,65 @@
+module Fog
+  module Vsphere
+    class Compute
+      class Real
+        def destroy_iso(options = {})
+          # Keep using the same validation helper for required keys, etc.
+          options = destroy_iso_check_options(options)
+
+          datastore  = get_raw_datastore(options['datastore'], options['datacenter'])
+          datacenter = get_raw_datacenter(options['datacenter'])
+
+          filename   = options['filename'] || File.basename(options['local_path'])
+          remote_rel = File.join(options['upload_directory'].to_s, filename).sub(%r{\A/+}, '')
+          remote_ds  = "[#{options['datastore']}] #{remote_rel}"
+
+          task = connection.serviceContent.fileManager.DeleteDatastoreFile_Task(
+            name: remote_ds,
+            datacenter: datacenter
+          )
+          task.wait_for_completion
+
+          # Return true if it is gone
+          !datastore.exists?(remote_rel)
+        end
+
+        private
+
+        def destroy_iso_check_options(options)
+          default_options = {
+            'upload_directory' => 'isos'
+          }
+          options = default_options.merge(options)
+          required_options = %w[datacenter datastore local_path]
+          required_options.each do |param|
+            raise ArgumentError, "#{required_options.join(', ')} are required" unless options.key? param
+          end
+          raise Fog::Vsphere::Compute::NotFound, "Datacenter #{options['datacenter']} doesn't exist!" unless get_datacenter(options['datacenter'])
+          raise Fog::Vsphere::Compute::NotFound, "Datastore #{options['datastore']} doesn't exist!" unless get_raw_datastore(options['datastore'], options['datacenter'])
+          options
+        end
+      end
+
+      class Mock
+        def destroy_iso(options = {})
+          destroy_iso_check_options(options)
+          true
+        end
+
+        private
+
+        def destroy_iso_check_options(options)
+          default_options = {
+            'upload_directory' => 'isos'
+          }
+          options = default_options.merge(options)
+          required_options = %w[datacenter datastore local_path]
+          required_options.each do |param|
+            raise ArgumentError, "#{required_options.join(', ')} are required" unless options.key? param
+          end
+          options
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
         def get_virtual_machine(id, datacenter_name = nil, folder = nil, recursive = false)
+          raise(Fog::Vsphere::Compute::NotFound, "The id of the virtual machine can't be nil") if id.nil?
+
           # The larger the VM list the longer it will take if not searching based on UUID.
           convert_vm_mob_ref_to_attr_hash(get_vm_ref(id, datacenter_name, folder, recursive))
         end
@@ -10,6 +12,8 @@ module Fog
         protected
 
         def get_vm_ref(id, dc = nil, folder = nil, recursive = false)
+          raise(Fog::Vsphere::Compute::NotFound, "The id of the virtual machine can't be nil") if id.nil?
+
           raw_datacenter = find_raw_datacenter(dc) if dc
           vm = case is_uuid?(id)
                  # UUID based

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

@@ -2,6 +2,22 @@ module Fog
   module Vsphere
     class Compute
       class Real
+        def upload_iso(options = {})
+          options = upload_iso_check_options(options)
+          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'])
+            connection.serviceContent.fileManager.MakeDirectory name: "[#{options['datastore']}] #{options['upload_directory']}",
+                                                                datacenter: datacenter,
+                                                                createParentDirectories: false
+          end
+          datastore.upload options['upload_directory'] + '/' + filename, options['local_path']
+          datastore.exists? options['upload_directory'] + '/' + filename
+        end
+
+        private
+
         def upload_iso_check_options(options)
           default_options = {
             'upload_directory' => 'isos'
@@ -11,23 +27,30 @@ module Fog
           required_options.each do |param|
             raise ArgumentError, "#{required_options.join(', ')} are required" unless options.key? param
           end
-          raise Fog::Vsphere::Compute::NotFound, "Datacenter #{options['datacenter']} Doesn't Exist!" unless get_datacenter(options['datacenter'])
-          raise Fog::Vsphere::Compute::NotFound, "Datastore #{options['datastore']} Doesn't Exist!" unless get_raw_datastore(options['datastore'], options['datacenter'])
+          raise Fog::Vsphere::Compute::NotFound, "Datacenter #{options['datacenter']} doesn't exist!" unless get_datacenter(options['datacenter'])
+          raise Fog::Vsphere::Compute::NotFound, "Datastore #{options['datastore']} doesn't exist!" unless get_raw_datastore(options['datastore'], options['datacenter'])
           options
         end
+      end
 
+      class Mock
         def upload_iso(options = {})
-          options = upload_iso_check_options(options)
-          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'])
-            connection.serviceContent.fileManager.MakeDirectory name: "[#{options['datastore']}] #{options['upload_directory']}",
-                                                                datacenter: datacenter,
-                                                                createParentDirectories: false
+          upload_iso_check_options(options)
+          true
+        end
+
+        private
+
+        def upload_iso_check_options(options)
+          default_options = {
+            'upload_directory' => 'isos'
+          }
+          options = default_options.merge(options)
+          required_options = %w[datacenter datastore local_path]
+          required_options.each do |param|
+            raise ArgumentError, "#{required_options.join(', ')} are required" unless options.key? param
           end
-          datastore.upload options['upload_directory'] + '/' + filename, options['local_path']
-          datastore.exists? options['upload_directory'] + '/' + filename
+          options
         end
       end
     end

data/lib/fog/vsphere/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Vsphere
-    VERSION = '3.7.1'.freeze
+    VERSION = '3.7.3'.freeze
   end
 end

data/tests/helper.rb

@@ -1,6 +1,5 @@
-require 'mocha/api'
-Shindo::Tests.send(:include, Mocha::API)
-
 require 'minitest/autorun'
+require 'mocha/minitest'
+Shindo::Tests.send(:include, Mocha::API)
 
 require File.expand_path('../../lib/fog/vsphere', __FILE__)

data/tests/requests/compute/destroy_iso_tests.rb

@@ -0,0 +1,16 @@
+Shindo.tests('Fog::Compute[:vsphere] | destroy_iso request', ['vsphere']) do
+  compute = Fog::Compute[:vsphere]
+
+  tests('The response should') do
+    response = compute.destroy_iso(
+      'datacenter' => 'dc1',
+      'datastore' => 'datastore-1',
+      'local_path' => '/tmp/test.iso'
+    )
+    test('be true') { response == true }
+  end
+
+  tests('The expected options') do
+    raises(ArgumentError, 'raises ArgumentError when required options are missing') { compute.destroy_iso }
+  end
+end

data/tests/requests/compute/update_vm_tests.rb

@@ -1,5 +1,3 @@
-require 'ostruct'
-
 Shindo.tests('Fog::Compute[:vsphere] | update_vm request', 'vsphere') do
   compute = Fog::Compute[:vsphere]
   server = Fog::Vsphere::Compute::Server.new

data/tests/requests/compute/upload_iso_tests.rb

@@ -0,0 +1,16 @@
+Shindo.tests('Fog::Compute[:vsphere] | upload_iso request', ['vsphere']) do
+  compute = Fog::Compute[:vsphere]
+
+  tests('The response should') do
+    response = compute.upload_iso(
+      'datacenter' => 'dc1',
+      'datastore' => 'datastore-1',
+      'local_path' => '/tmp/test.iso'
+    )
+    test('be true') { response == true }
+  end
+
+  tests('The expected options') do
+    raises(ArgumentError, 'raises ArgumentError when required options are missing') { compute.upload_iso }
+  end
+end

data/tests/test_helper.rb

@@ -1,3 +1,4 @@
+require 'minitest'
 require 'mocha/minitest'
 require 'vcr'
 require 'webmock/minitest'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.3
 platform: ruby
 authors:
 - J.R. Garcia
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -38,6 +37,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +303,7 @@ files:
 - 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_iso.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
@@ -382,6 +410,7 @@ files:
 - tests/models/compute/tickets_tests.rb
 - tests/requests/compute/create_folder_tests.rb
 - tests/requests/compute/current_time_tests.rb
+- tests/requests/compute/destroy_iso_tests.rb
 - tests/requests/compute/folder_destroy_tests.rb
 - tests/requests/compute/get_cluster_tests.rb
 - tests/requests/compute/get_compute_resource_tests.rb
@@ -408,6 +437,7 @@ files:
 - tests/requests/compute/revert_to_snapshot_tests.rb
 - tests/requests/compute/set_vm_customvalue_tests.rb
 - tests/requests/compute/update_vm_tests.rb
+- tests/requests/compute/upload_iso_tests.rb
 - tests/requests/compute/vm_clone_tests.rb
 - tests/requests/compute/vm_config_vnc_tests.rb
 - tests/requests/compute/vm_destroy_tests.rb
@@ -426,7 +456,6 @@ homepage: https://github.com/fog/fog-vsphere
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -441,8 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key:
+rubygems_version: 3.8.0.dev
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.
 test_files:
@@ -475,6 +503,7 @@ test_files:
 - tests/models/compute/tickets_tests.rb
 - tests/requests/compute/create_folder_tests.rb
 - tests/requests/compute/current_time_tests.rb
+- tests/requests/compute/destroy_iso_tests.rb
 - tests/requests/compute/folder_destroy_tests.rb
 - tests/requests/compute/get_cluster_tests.rb
 - tests/requests/compute/get_compute_resource_tests.rb
@@ -501,6 +530,7 @@ test_files:
 - tests/requests/compute/revert_to_snapshot_tests.rb
 - tests/requests/compute/set_vm_customvalue_tests.rb
 - tests/requests/compute/update_vm_tests.rb
+- tests/requests/compute/upload_iso_tests.rb
 - tests/requests/compute/vm_clone_tests.rb
 - tests/requests/compute/vm_config_vnc_tests.rb
 - tests/requests/compute/vm_destroy_tests.rb