fog-vsphere 3.6.5 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a169539c87e9059730923e051d3e08ef56a1d376d44a79cc95d13a8fe10756f2
-  data.tar.gz: bc058ee169f529dbd0d5ee6110fa1e08e2ee9d885f8e4b0ecf119af4a69fde94
+  metadata.gz: 819e41def6f26e5e5c0b8da2e15fbd84afd9d4ff2d32b566fd67edc616e5d765
+  data.tar.gz: 305ceccf0f1718b079d7082723b0d760ff3738033e4f1492719be75d301f96ea
 SHA512:
-  metadata.gz: ce176624f1d5e490a885548c6bea5b6e19badc4f23316edb499ff521ebc251bac6a281ffea719301b0af5139d01e639b10dbbae6fe0883f24b33522b29685110
-  data.tar.gz: 67aafb6d34c2764899b3ccb3b88bb17f5334094df9483e288d1970950a88f38aa152dc7926a0b1c04beb01337032cac520586b8788da7d36fd55288e82c7c542
+  metadata.gz: 979f8ff4d77c5dd92bbe2f404308c4100db6f5d59ba8ea0ac382b4e578e8ee775c5eb5d1355ebe43b035537aaf295e55dfb7a1a5e58da58cefc6a05d4ebe3eb4
+  data.tar.gz: 81742888f852d0d898d0d61105552eca3380d23af4da0b8600c142976311eba0735fdfb13eef9326e79ffcaf26b87e5a9b338bb7f65f4e6791d81d29676f5643

data/lib/fog/vsphere/compute.rb

@@ -43,6 +43,7 @@ module Fog
       model :customfield
       collection :customfields
       model :scsicontroller
+      model :nvmecontroller
       model :process
       model :cdrom
       collection :cdroms
@@ -111,6 +112,7 @@ module Fog
       request :list_customfields
       request :get_vm_first_scsi_controller
       request :list_vm_scsi_controllers
+      request :list_vm_nvme_controllers
       request :set_vm_customvalue
       request :vm_take_snapshot
       request :list_vm_snapshots
@@ -136,6 +138,7 @@ module Fog
       request :host_start_maintenance
       request :host_finish_maintenance
       request :get_vm_first_sata_controller
+      request :get_vm_first_nvme_controller
 
       module Shared
         attr_reader :vsphere_is_vcenter
@@ -346,10 +349,12 @@ module Fog
         end
       end
 
+      # rubocop:disable Metrics/ClassLength
       class Mock
         include Shared
         # rubocop:disable Metrics/MethodLength
         def self.data
+          # rubocop:disable Metrics/BlockLength
           @data ||= Hash.new do |hash, key|
             hash[key] = {
               servers: {
@@ -380,6 +385,11 @@ module Fog
                        'type'        => 'VirtualLsiLogicController',
                        'unit_number' => 7,
                        'key'         => 1000 }],
+                  'nvme_controllers' =>
+                       [{
+                         'type'        => 'VirtualNVMEController',
+                          'key'         => 2000
+                       }],
                   'interfaces'       =>
                     [{ 'mac' => '00:50:56:a9:00:28',
                        'network' => 'dvportgroup-123456',
@@ -616,6 +626,7 @@ module Fog
               }
             }
           end
+          # rubocop:enable Metrics/BlockLength
         end
 
         # rubocop:enable Metrics/MethodLength
@@ -637,6 +648,7 @@ module Fog
           self.class.data.delete(@vsphere_username)
         end
       end
+      # rubocop:enable Metrics/ClassLength
 
       class Real
         include Shared

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

@@ -0,0 +1,24 @@
+module Fog
+  module Vsphere
+    class Compute
+      class NVMEController < Fog::Model
+        attribute :type
+        attribute :unit_number
+        attribute :key, type: :integer
+        attribute :server_id
+        DEFAULT_KEY = 2000
+        DEFAULT_TYPE = "VirtualNVMEController".freeze
+
+        def initialize(attributes = {})
+          super
+          self.key ||= DEFAULT_KEY
+          self.type ||= DEFAULT_TYPE
+        end
+
+        def to_s
+          "#{type} ##{key}:, unit_number: #{unit_number}"
+        end
+      end
+    end
+  end
+end

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

@@ -8,9 +8,13 @@ module Fog
         attribute :key, type: :integer
         attribute :server_id
 
+        DEFAULT_KEY = 1000
+        DEFAULT_TYPE = "VirtualLsiLogicController".freeze
+
         def initialize(attributes = {})
           super
-          self.key ||= 1000
+          self.key ||= DEFAULT_KEY
+          self.type ||= DEFAULT_TYPE
         end
 
         def to_s

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

@@ -3,7 +3,7 @@ require 'fog/compute/models/server'
 module Fog
   module Vsphere
     class Compute
-      class Server < Fog::Compute::Server
+      class Server < Fog::Compute::Server # rubocop:disable Metrics/ClassLength
         extend Fog::Deprecation
         deprecate(:ipaddress, :public_ip_address)
         deprecate(:scsi_controller, :scsi_controllers)
@@ -49,6 +49,7 @@ module Fog
         attribute :guest_id
         attribute :hardware_version
         attribute :scsi_controllers, type: :array
+        attribute :nvme_controllers, type: :array
         attribute :cpuHotAddEnabled
         attribute :memoryHotAddEnabled
         attribute :firmware
@@ -60,9 +61,10 @@ module Fog
           super defaults.merge(attributes)
           self.instance_uuid ||= id # TODO: remvoe instance_uuid as it can be replaced with simple id
           initialize_interfaces
-          initialize_volumes
           initialize_customvalues
           initialize_scsi_controllers
+          initialize_nvme_controllers
+          initialize_volumes
         end
 
         # Lazy Loaded Attributes
@@ -289,6 +291,10 @@ module Fog
           attributes[:scsi_controllers] ||= service.list_vm_scsi_controllers(id)
         end
 
+        def nvme_controllers
+          attributes[:nvme_controllers] ||= service.list_vm_nvme_controllers(id)
+        end
+
         def scsi_controller
           scsi_controllers.first
         end
@@ -348,16 +354,21 @@ module Fog
           end
         end
 
+        def unassigned_volumes?
+          attributes[:volumes]&.any? { |vol| !vol.key?(:controller_key) } || false
+        end
+
+        def update_controller_key(vol)
+          vol.controller_key ||= attributes[:scsi_controllers].first&.key || 1000
+        end
+
         def initialize_volumes
-          if attributes[:volumes] && attributes[:volumes].is_a?(Array)
-            attributes[:volumes].map! do |vol|
-              if vol.is_a?(Hash)
-                service.volumes.new({ server: self }.merge(vol))
-              else
-                vol.server = self
-                vol
-              end
-            end
+          return unless attributes[:volumes].is_a?(Array)
+          attributes[:volumes].map! do |vol|
+            vol = service.volumes.new({ server: self }.merge(vol)) if vol.is_a?(Hash)
+            vol.server = self
+            update_controller_key(vol)
+            vol
           end
         end
 
@@ -368,19 +379,23 @@ module Fog
         end
 
         def initialize_scsi_controllers
-          if attributes[:scsi_controllers] && attributes[:scsi_controllers].is_a?(Array)
+          if attributes[:scsi_controllers].is_a?(Array) && !attributes[:scsi_controllers].empty?
             attributes[:scsi_controllers].map! do |controller|
               controller.is_a?(Hash) ? Fog::Vsphere::Compute::SCSIController.new(controller) : controller
             end
-          elsif attributes[:scsi_controller] && attributes[:scsi_controller].is_a?(Hash)
+          elsif attributes[:scsi_controller].is_a?(Hash) && !attributes[:scsi_controller].empty?
             attributes[:scsi_controllers] = [
               Fog::Vsphere::Compute::SCSIController.new(attributes[:scsi_controller])
             ]
-          elsif attributes[:volumes] && attributes[:volumes].is_a?(Array) && !attributes[:volumes].empty?
-            # Create a default scsi controller if there are any disks but no controller defined
-            attributes[:scsi_controllers] = [
-              Fog::Vsphere::Compute::SCSIController.new
-            ]
+          end
+          attributes[:scsi_controllers] = [Fog::Vsphere::Compute::SCSIController.new] if !attributes[:scsi_controllers]&.any? && unassigned_volumes?
+        end
+
+        def initialize_nvme_controllers
+          if attributes[:nvme_controllers].is_a?(Array)
+            attributes[:nvme_controllers].map! do |controller|
+              controller.is_a?(Hash) ? Fog::Vsphere::Compute::NVMEController.new(controller) : controller
+            end
           end
         end
       end

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

@@ -126,8 +126,7 @@ module Fog
           {
             thin: true,
             name: 'Hard disk',
-            mode: 'persistent',
-            controller_key: 1000
+            mode: 'persistent'
           }
         end
 

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

@@ -138,10 +138,14 @@ module Fog
             devices << nics.map { |nic| create_interface(nic, nics.index(nic), :add, attributes) }
           end
 
-          if (scsi_controllers = (attributes[:scsi_controllers] || attributes['scsi_controller']))
+          if (scsi_controllers = attributes[:scsi_controllers] || attributes['scsi_controller'])
             devices << scsi_controllers.each_with_index.map { |controller, index| create_controller(controller, index) }
           end
 
+          if (nvme_controllers = attributes[:nvme_controllers])
+            devices << nvme_controllers.each_with_index.map { |controller, index| create_controller(controller, index) }
+          end
+
           if (disks = attributes[:volumes])
             devices << disks.map { |disk| create_disk(disk, :add, storage_pod: get_storage_pod_from_volumes(attributes)) }
           end
@@ -241,11 +245,15 @@ module Fog
         end
 
         def create_controller(controller = nil, index = 0)
+          device_options = {}
           options = if controller
                       controller_default_options.merge(controller.attributes)
                     else
                       controller_default_options
-                  end
+                    end
+          unless [RbVmomi::VIM::VirtualAHCIController, RbVmomi::VIM::VirtualNVMEController, "VirtualNVMEController"].include?(options[:type])
+            device_options[:sharedBus] = controller_get_shared_from_options(options)
+          end
           controller_class = if options[:type].is_a? String
                                Fog::Vsphere.class_from_string options[:type], 'RbVmomi::VIM'
                              else
@@ -254,8 +262,7 @@ module Fog
           {
             operation: options[:operation],
             device: controller_class.new(key: options[:key] || (1000 + index),
-                                         busNumber: options[:bus_id] || index,
-                                         **(options[:type] == RbVmomi::VIM::VirtualAHCIController ? {} : {sharedBus: controller_get_shared_from_options(options)}))
+                                         busNumber: options[:bus_id] || index, **device_options)
           }
         end
 

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

@@ -0,0 +1,21 @@
+module Fog
+  module Vsphere
+    class Compute
+      class Real
+        def get_vm_first_nvme_controller(vm_id)
+          ctrl = get_vm_ref(vm_id).config.hardware.device.find { |device| device.is_a?(RbVmomi::VIM::VirtualNVMEController) }
+          raise Fog::Vsphere::Compute::NotFound, "No NVME controller found for #{vm_id}" unless ctrl
+          {
+            type: ctrl&.class.to_s,
+            device_info: ctrl&.deviceInfo,
+            bus_number: ctrl&.busNumber,
+            key: ctrl&.key
+          }
+        end
+      end
+      class Mock
+        def get_vm_first_nvme_controller(vm_id); end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Vsphere
+    class Compute
+      class Real
+        def list_vm_nvme_controllers(vm_id)
+          list_vm_nvme_controllers_raw(vm_id).map do |raw_controller|
+            Fog::Vsphere::Compute::NVMEController.new(raw_controller)
+          end
+        end
+
+        def list_vm_nvme_controllers_raw(vm_id)
+          get_vm_ref(vm_id).config.hardware.device.grep(RbVmomi::VIM::VirtualNVMEController).map do |ctrl|
+            {
+              type: ctrl.class.to_s,
+              key: ctrl.key
+            }
+          end
+        end
+      end
+      class Mock
+        def list_vm_nvme_controllers(vm_id)
+          raise Fog::Vsphere::Compute::NotFound, 'VM not Found' unless data[:servers].key?(vm_id)
+          return [] unless data[:servers][vm_id].key?('nvme_controllers')
+          data[:servers][vm_id]['nvme_controllers'].map { |h| h.merge(server_id: vm_id) }
+        end
+      end
+    end
+  end
+end

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

@@ -886,8 +886,8 @@ module Fog
           )
         end
       end
-
       # rubocop:enable Metrics/ClassLength
+
       class Mock
         include Shared
         def vm_clone(options = {})

data/lib/fog/vsphere/version.rb

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

data/tests/class_from_string_tests.rb

@@ -0,0 +1,33 @@
+require_relative './helper'
+
+class A; class B; class C; end; end; end
+
+class TestClassFromString < Minitest::Test
+  def test_empty_string
+    assert_nil(Fog::Vsphere.class_from_string(''))
+  end
+
+  def test_nil
+    assert_nil(Fog::Vsphere.class_from_string(nil))
+  end
+
+  def test_name_as_class
+    assert_equal(A, Fog::Vsphere.class_from_string(A))
+  end
+
+  def test_name_as_string
+    assert_equal(A, Fog::Vsphere.class_from_string('A'))
+  end
+
+  def test_unexpected_input
+    assert_nil(Fog::Vsphere.class_from_string(8))
+  end
+
+  def test_nested_class_without_default_path
+    assert_equal(A::B::C, Fog::Vsphere.class_from_string(A::B::C))
+  end
+
+  def test_nested_class_with_default_path
+    assert_equal(A::B::C, Fog::Vsphere.class_from_string('C', 'A::B'))
+  end
+end

data/tests/compute_tests.rb

@@ -0,0 +1,53 @@
+Shindo.tests('Fog::Compute[:vsphere]', ['vsphere']) do
+  compute = Fog::Compute[:vsphere]
+
+  tests('| convert_vm_mob_ref_to_attr_hash') do
+    # Mock the RbVmomi::VIM::ManagedObject class
+    class MockManagedObject
+      attr_reader :parent, :_ref
+
+      def initialize
+        @parent = @_ref = 'vm-123'
+      end
+
+      # rubocop:disable Naming/VariableName
+      def collect!(*_pathSet)
+        { '_ref' => 'vm-123', 'name' => 'fakevm' }
+      end
+    end
+
+    fake_vm_mob_ref = MockManagedObject.new
+
+    tests('When converting an incomplete vm object') do
+      test('it should return a Hash') do
+        compute.send(:convert_vm_mob_ref_to_attr_hash, fake_vm_mob_ref).is_a? Hash
+      end
+      tests('The converted Hash should') do
+        attr_hash = compute.send(:convert_vm_mob_ref_to_attr_hash, fake_vm_mob_ref)
+        test('have a name') { attr_hash['name'] == 'fakevm' }
+        test('have a mo_ref') { attr_hash['mo_ref'] == 'vm-123' }
+        test('have an id') { attr_hash['id'] == 'vm-123' }
+        test('not have a instance_uuid') { attr_hash['instance_uuid'].nil? }
+      end
+    end
+
+    tests('When passed a nil object') do
+      attr_hash = compute.send :convert_vm_mob_ref_to_attr_hash, nil
+      test('it should return a nil object') do
+        attr_hash.nil?
+      end
+    end
+  end
+
+  tests('Compute attributes') do
+    %w[vsphere_is_vcenter vsphere_rev vsphere_username vsphere_server].each do |attr|
+      test("it should respond to #{attr}") { compute.respond_to? attr }
+    end
+  end
+
+  tests('Compute collections') do
+    %w[servers].each do |collection|
+      test("it should respond to #{collection}") { compute.respond_to? collection }
+    end
+  end
+end