fog-vsphere 3.6.6 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 819e41def6f26e5e5c0b8da2e15fbd84afd9d4ff2d32b566fd67edc616e5d765
-  data.tar.gz: 305ceccf0f1718b079d7082723b0d760ff3738033e4f1492719be75d301f96ea
+  metadata.gz: 6fde8da8e67f090b3268f7c130b48d8730fb7fc1fcd922579c66f1ee67f50b19
+  data.tar.gz: 3fc30e334b66725ab517afc440dbdcbe3804c0565d8ad6e90d396529d9249d03
 SHA512:
-  metadata.gz: 979f8ff4d77c5dd92bbe2f404308c4100db6f5d59ba8ea0ac382b4e578e8ee775c5eb5d1355ebe43b035537aaf295e55dfb7a1a5e58da58cefc6a05d4ebe3eb4
-  data.tar.gz: 81742888f852d0d898d0d61105552eca3380d23af4da0b8600c142976311eba0735fdfb13eef9326e79ffcaf26b87e5a9b338bb7f65f4e6791d81d29676f5643
+  metadata.gz: 8a2c98ab7b82db9587b12cfc7bb06bd23a1346a9048cbf16bfec1d6e20b20ec0b9f39ee2a8912f92f7aec3c1a6e42caef3f37f9af6ddd6527468c572c08b76f0
+  data.tar.gz: c7569f04cade03956f13d637a6cebe77d5cefd97535c62b604b62c115c53cd423548f1379a94c96a7f1c74636f57b3f2d58fc26548b43d66580c6b757b7d53f0

data/Gemfile

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'codeclimate-test-reporter', group: :test, require: nil
+
+gemspec

data/fog-vsphere.gemspec

@@ -0,0 +1,40 @@
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'fog/vsphere/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'fog-vsphere'
+  spec.version       = Fog::Vsphere::VERSION
+  spec.authors       = ['J.R. Garcia']
+  spec.email         = ['jr@garciaole.com']
+
+  spec.summary       = "Module for the 'fog' gem to support VMware vSphere."
+  spec.description   = 'This library can be used as a module for `fog` or as standalone provider to use vSphere in applications.'
+  spec.homepage      = 'https://github.com/fog/fog-vsphere'
+  spec.license       = 'MIT'
+
+  spec.files = Dir['lib/**/*'] +
+               ['LICENSE.md', 'Rakefile', 'README.md', 'CHANGELOG.md', 'CONTRIBUTORS.md', 'Gemfile', 'fog-vsphere.gemspec']
+  spec.test_files = Dir['tests/**/*']
+
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.7'
+
+  spec.add_runtime_dependency 'fog-core'
+  spec.add_runtime_dependency 'rbvmomi2', '~> 3.0'
+
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
+  spec.add_development_dependency 'minitest', '~> 5.22'
+  spec.add_development_dependency 'rubocop', '~> 1.39.0'
+  spec.add_development_dependency 'rubocop-minitest'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'mocha', '~> 2.2'
+  spec.add_development_dependency 'shindo', '~> 0.3'
+  spec.add_development_dependency 'webmock', '~> 3.5'
+  spec.add_development_dependency 'vcr', '~> 6.0'
+end

data/lib/fog/vsphere/compute.rb

@@ -156,6 +156,7 @@ module Fog
           parent: 'parent',
           hostname: 'summary.guest.hostName',
           operatingsystem: 'summary.guest.guestFullName',
+          virtual_tpm: 'summary.config.tpmPresent',
           ipaddress: 'guest.ipAddress',
           power_state: 'runtime.powerState',
           connection_state: 'runtime.connectionState',
@@ -173,6 +174,7 @@ module Fog
           cpuHotAddEnabled: 'config.cpuHotAddEnabled',
           memoryHotAddEnabled: 'config.memoryHotAddEnabled',
           firmware: 'config.firmware',
+          secure_boot: 'config.bootOptions.efiSecureBootEnabled',
           boot_order: 'config.bootOptions.bootOrder',
           annotation: 'config.annotation',
           extra_config: 'config.extraConfig'
@@ -345,7 +347,7 @@ module Fog
         end
 
         def is_uuid?(id)
-          !(id =~ /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/).nil?
+          id.is_a?(String) && /[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}/.match?(id)
         end
       end
 

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

@@ -53,6 +53,8 @@ module Fog
         attribute :cpuHotAddEnabled
         attribute :memoryHotAddEnabled
         attribute :firmware
+        attribute :secure_boot
+        attribute :virtual_tpm
         attribute :boot_order
         attribute :annotation
         attribute :extra_config

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

@@ -1,6 +1,7 @@
 module Fog
   module Vsphere
     class Compute
+      # rubocop:disable Metrics/ClassLength
       class Real
         def create_vm(attributes = {})
           # build up vm configuration
@@ -22,7 +23,7 @@ module Fog
           vm_cfg[:cpuHotAddEnabled] = attributes[:cpuHotAddEnabled] if attributes.key?(:cpuHotAddEnabled)
           vm_cfg[:memoryHotAddEnabled] = attributes[:memoryHotAddEnabled] if attributes.key?(:memoryHotAddEnabled)
           vm_cfg[:firmware] = attributes[:firmware] if attributes.key?(:firmware)
-          vm_cfg[:bootOptions] = boot_options(attributes, vm_cfg) if attributes.key?(:boot_order) || attributes.key?(:boot_retry)
+          vm_cfg[:bootOptions] = boot_options(attributes, vm_cfg)
           resource_pool = if attributes[:resource_pool] && attributes[:resource_pool] != 'Resources'
                             get_raw_resource_pool(attributes[:resource_pool], attributes[:cluster], attributes[:datacenter])
                           else
@@ -153,6 +154,9 @@ module Fog
           if (cdroms = attributes[:cdroms])
             devices << cdroms.map { |cdrom| create_cdrom(cdrom, cdroms.index(cdrom)) }
           end
+
+          devices << create_virtual_tpm if attributes[:virtual_tpm]
+
           devices.flatten
         end
 
@@ -170,6 +174,8 @@ module Fog
             options[:bootRetryDelay]   = attributes[:boot_retry]
           end
 
+          options[:efiSecureBootEnabled] = attributes[:secure_boot] if attributes.key?(:secure_boot)
+
           options.empty? ? nil : RbVmomi::VIM::VirtualMachineBootOptions.new(options)
         end
 
@@ -333,12 +339,20 @@ module Fog
           }
         end
 
+        def create_virtual_tpm
+          {
+            operation: :add,
+            device: RbVmomi::VIM::VirtualTPM.new(key: -1)
+          }
+        end
+
         def extra_config(attributes)
           extra_config = attributes[:extra_config] || { 'bios.bootOrder' => 'ethernet0' }
           extra_config.map { |k, v| { key: k, value: v.to_s } }
         end
       end
 
+      # rubocop:enable Metrics/ClassLength
       class Mock
         def create_vm(attributes = {})
           id = SecureRandom.uuid

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

@@ -173,6 +173,7 @@ module Fog
             device_change.concat(modify_template_volumes_specs(vm_mob_ref, options['volumes']))
             device_change.concat(add_new_volumes_specs(vm_mob_ref, options['volumes'])) unless options['storage_pod']
           end
+          device_change << create_virtual_tpm if options['virtual_tpm'].present?
           virtual_machine_config_spec.deviceChange = device_change if device_change.any?
           # Options['numCPUs'] or Options['memoryMB']
           # Build up the specification for Hardware, for more details see ____________
@@ -216,7 +217,7 @@ module Fog
                 RbVmomi::VIM::VirtualMachineBootOptionsBootableFloppyDevice.new
               end
             end
-            virtual_machine_config_spec.bootOptions = { bootOrder: boot_order }
+            virtual_machine_config_spec.bootOptions = { bootOrder: boot_order, efiSecureBootEnabled: options["secure_boot"] || false }
           end
           # Options['customization_spec']
           # OLD Options still supported

data/lib/fog/vsphere/version.rb

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