fog-vsphere 3.7.2 → 3.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 924b9bbb6dc4715d151b6737ab5a7c29ba114e3c8f3e3d05366d29a5f164c52e
-  data.tar.gz: bca22014a94f40e12301c2f18664242effbd09c984cff91e134947f5a4e799c1
+  metadata.gz: e15bb39e301de755701847ea587fd678e5717fc75408c03ac0ed7d295716f386
+  data.tar.gz: fc273115526f3dd9ebf4d37d83b9f89db85eea61926f24df1227268c959fb3a8
 SHA512:
-  metadata.gz: c7d777833b52e0184c94818bf6876ae3ee518425c57f9ae922b1f66b0f92b20c832e16e358d7e280c91ba2fa12f65c6469a231fe97ee55680c253541c09f817f
-  data.tar.gz: 5006c14b999ba3ee502a423a953407b1cbd5739f2de946adb67026dfadc08a937d7b770839d1110b5792b1a26e0eac8ba83a8f7f455bc8d51e86ec9390b7e6a9
+  metadata.gz: 879ed96c76c460c8872cb4322e7e9daa27ab21e7627f54ffb7776e6724a7938d47c20f47c8a6d0f25accbb5acbe046b6afede16283dd7b793674541f2e61ad3e
+  data.tar.gz: b57fb164b9f54f4fa9b6902c904190166a3cc85e27e970b5fc61874a3df0310edece6fae1ae7add7f52d20f4c7a02fb48607bf13842e919b54ce139ffa6d9e32

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
@@ -384,7 +385,7 @@ module Fog
                     }],
                   'scsi_controllers' =>
                     [{ 'shared_bus' => 'noSharing',
-                       'type'        => 'VirtualLsiLogicController',
+                       'type'        => 'ParaVirtualSCSIController',
                        'unit_number' => 7,
                        'key'         => 1000 }],
                   'nvme_controllers' =>

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

@@ -9,7 +9,7 @@ module Fog
         attribute :server_id
 
         DEFAULT_KEY = 1000
-        DEFAULT_TYPE = "VirtualLsiLogicController".freeze
+        DEFAULT_TYPE = "ParaVirtualSCSIController".freeze
 
         def initialize(attributes = {})
           super

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

@@ -273,7 +273,11 @@ module Fog
         end
 
         def controller_default_options
-          { operation: :add, type: RbVmomi::VIM.VirtualLsiLogicController.class, shared: false }
+          {
+            operation: :add,
+            type: Fog::Vsphere.class_from_string(Fog::Vsphere::Compute::SCSIController::DEFAULT_TYPE, 'RbVmomi::VIM'),
+            shared: false
+          }
         end
 
         def controller_get_shared_from_options(options)

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/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.2'.freeze
+    VERSION = '3.7.4'.freeze
   end
 end

data/tests/models/compute/scsicontroller_tests.rb

@@ -0,0 +1,25 @@
+require_relative '../../helper'
+
+require 'fog/vsphere/models/compute/scsicontroller'
+
+describe Fog::Vsphere::Compute::SCSIController do
+  describe '#type' do
+    it 'defaults to ParaVirtualSCSIController when not given a type' do
+      controller = Fog::Vsphere::Compute::SCSIController.new
+
+      assert_equal('ParaVirtualSCSIController', controller.type)
+    end
+
+    %w[
+      VirtualLsiLogicController
+      VirtualLsiLogicSASController
+      VirtualBusLogicController
+    ].each do |legacy_type|
+      it "preserves an explicitly requested #{legacy_type}" do
+        controller = Fog::Vsphere::Compute::SCSIController.new(:type => legacy_type)
+
+        assert_equal(legacy_type, controller.type)
+      end
+    end
+  end
+end

data/tests/requests/compute/create_controller_tests.rb

@@ -0,0 +1,39 @@
+require_relative '../../helper'
+
+require 'rbvmomi'
+require 'fog/vsphere/models/compute/scsicontroller'
+require 'fog/vsphere/requests/compute/create_vm'
+
+describe Fog::Vsphere::Compute::Real do
+  let(:real) { Fog::Vsphere::Compute::Real.allocate }
+
+  describe '#create_controller' do
+    it 'defaults to ParaVirtualSCSIController when no controller is given' do
+      result = real.send(:create_controller)
+
+      assert_equal(RbVmomi::VIM::ParaVirtualSCSIController, result[:device].class)
+    end
+
+    it 'defaults a freshly built SCSIController model to ParaVirtualSCSIController' do
+      controller = Fog::Vsphere::Compute::SCSIController.new
+
+      result = real.send(:create_controller, controller)
+
+      assert_equal(RbVmomi::VIM::ParaVirtualSCSIController, result[:device].class)
+    end
+
+    %w[
+      VirtualLsiLogicController
+      VirtualLsiLogicSASController
+      VirtualBusLogicController
+    ].each do |legacy_type|
+      it "still builds a #{legacy_type} when explicitly requested" do
+        controller = Fog::Vsphere::Compute::SCSIController.new(:type => legacy_type)
+
+        result = real.send(:create_controller, controller)
+
+        assert_equal(RbVmomi::VIM.const_get(legacy_type), result[:device].class)
+      end
+    end
+  end
+end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-vsphere
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.4
 platform: ruby
 authors:
 - J.R. Garcia
@@ -37,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
@@ -275,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
@@ -374,13 +403,16 @@ files:
 - tests/models/compute/cluster_tests.rb
 - tests/models/compute/hosts_tests.rb
 - tests/models/compute/rules_tests.rb
+- tests/models/compute/scsicontroller_tests.rb
 - tests/models/compute/server_tests.rb
 - tests/models/compute/server_unit_tests.rb
 - tests/models/compute/servers_tests.rb
 - tests/models/compute/ticket_tests.rb
 - tests/models/compute/tickets_tests.rb
+- tests/requests/compute/create_controller_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
@@ -407,6 +439,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
@@ -439,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.8.0.dev
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Module for the 'fog' gem to support VMware vSphere.
 test_files:
@@ -465,13 +498,16 @@ test_files:
 - tests/models/compute/cluster_tests.rb
 - tests/models/compute/hosts_tests.rb
 - tests/models/compute/rules_tests.rb
+- tests/models/compute/scsicontroller_tests.rb
 - tests/models/compute/server_tests.rb
 - tests/models/compute/server_unit_tests.rb
 - tests/models/compute/servers_tests.rb
 - tests/models/compute/ticket_tests.rb
 - tests/models/compute/tickets_tests.rb
+- tests/requests/compute/create_controller_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
@@ -498,6 +534,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