foreman_fog_proxmox 0.23.1 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f08732412c42423f30a2f448a7bc48c6249bbf0a62050b28e43a56f4a774caac
-  data.tar.gz: ffecc9919a3f2c64f200b272a7e33065f43584f6734be25c74f794585beed665
+  metadata.gz: 329a340fdfd2b5e117a05a227477e29108df61d303a5ce5a5a2dc148ae41ec7c
+  data.tar.gz: '08b9aa3dca59fb2b7a80c2f1e6b0b59c9931f0d974e8d9849a720d6d37a819be'
 SHA512:
-  metadata.gz: d54a0db2ef661feeffb82d8002f7466bd1a8eb1d3b0b3d11215928b07600fbe591d9ca5cffeb36ff2d293e82523509406b949c8d81a8c2ab80ebdcf83bf95295
-  data.tar.gz: '0740284790c3189d29502bae8359fbf57faace0e1d27bc0e625b37ff17d0d93b31dfbd213f803e5ff2afcacb3726630cfb7176aa2d8c753ac0d31f7f0836393a'
+  metadata.gz: '094a19a8592b2ed3ad7a88c637c7859f3bbc631a4f08f2fb781ec21a8b9620789fb701dbab917973ee122fb2ead5a44d6af12a28fe6dd2d99dad2267c8d051a7'
+  data.tar.gz: ce956eaac9a5faf92f2decd8721910dd72fd9a0e7f0ccfbeab40462c1cfc7892897235e7d2fef925405abf993b85f902edac0f4afcb1ec685649d27df0e61168

data/app/helpers/proxmox_vm_attrs_helper.rb

@@ -76,7 +76,7 @@ module ProxmoxVMAttrsHelper
         keys = ['id', 'volid', 'storage_type', 'storage', 'controller', 'device', 'cache', 'size', '_delete', 'backup']
         type = 'hard_disk'
       elsif  vol.cdrom?
-        keys = ['id', 'storage_type', 'cdrom', 'storage', 'volid']
+        keys = ['id', 'storage_type', 'cdrom', 'storage', 'volid', '_delete']
         type = 'cdrom'
       elsif vol.cloud_init?
         keys = ['id', 'volid', 'storage_type', 'storage', 'controller', 'device']

data/app/helpers/proxmox_vm_cdrom_helper.rb

@@ -26,8 +26,15 @@ require 'foreman_fog_proxmox/hash_collection'
 module ProxmoxVMCdromHelper
   def parse_server_cdrom(args)
     cdrom_media = args['cdrom'] if args.key?('cdrom')
-    cdrom_image = args['volid'] if args.key?('volid')
-    volid = cdrom_image.empty? ? cdrom_media : cdrom_image
+    return {} unless cdrom_media
+    cdrom_image = args['volid'] if args.key?('volid') && cdrom_media == 'image'
+    volid = if cdrom_image.present?
+              cdrom_image
+            elsif cdrom_media == 'none'
+              'none'
+            elsif ['physical', 'cdrom'].include?(cdrom_media)
+              'cdrom'
+            end
     return {} unless volid
 
     { id: 'ide2', volid: volid, media: 'cdrom' }

data/app/helpers/proxmox_vm_cloudinit_helper.rb

@@ -111,8 +111,14 @@ module ProxmoxVMCloudinitHelper
   end
 
   def attach_cloudinit_iso(node, iso)
-    storage = storages(node, 'iso')[0]
-    volume = storage.volumes.detect { |v| v.volid.include? File.basename(iso) }
+    volume = nil
+    storages(node, 'iso').each do |storage|
+      volume = storage.volumes.detect { |v| v.volid.include? File.basename(iso) }
+      break if volume
+    end
+
+    raise ::Foreman::Exception, "Could not find generated cloud-init ISO #{File.basename(iso)} on any ISO storage for node #{node}" unless volume
+
     { ide2: "#{volume.volid},media=cdrom" }
   end
 

data/app/helpers/proxmox_vm_volumes_helper.rb

@@ -86,15 +86,29 @@ module ProxmoxVMVolumesHelper
     if args.key?('storage_type')
       args['storage_type'] == type
     else
+      return true if type == 'cdrom' && args.key?('cdrom')
+
       Fog::Proxmox::DiskHelper.cloud_init?(args['volid']) if type == 'cloud_init'
       Fog::Proxmox::DiskHelper.cdrom?(args['volid']) if type == 'cdrom'
       Fog::Proxmox::DiskHelper.disk?(args['id']) if ['hard_disk', 'rootfs', 'mp'].include?(type)
     end
   end
 
+  def validate_cdrom_image_permission!(volume_attributes)
+    volume_attributes = volume_attributes.with_indifferent_access
+
+    return unless volume_type?(volume_attributes, 'cdrom')
+    return unless volume_attributes[:cdrom].to_s == 'image'
+    return if User.current&.can?(:attach_cdrom_image, self)
+
+    raise ::Foreman::Exception,
+      _('You are not authorized to attach or change CD-ROM ISO images.')
+  end
+
   def parse_typed_volume(args, type)
     return if Foreman::Cast.to_bool(args['_delete'])
     logger.debug("parse_typed_volume(#{type}): args=#{args}")
+    validate_cdrom_image_permission!(args)
     disk = parse_hard_disk_volume(args) if volume_type?(args,
       'hard_disk') || volume_type?(args, 'mp') || volume_type?(args, 'rootfs')
     disk = parse_server_cloudinit(args) if volume_type?(args, 'cloud_init')

data/app/models/concerns/orchestration/proxmox/compute.rb

@@ -63,7 +63,14 @@ module Orchestration
 
       def computeValue(foreman_attr, fog_attr)
         value = ''
-        value += compute_resource.id.to_s + '_' if foreman_attr == :uuid
+
+        if foreman_attr == :uuid
+          vm_value = vm.send(fog_attr).to_s
+          return vm_value if vm_value.match?(/\A\d+_\d+\z/)
+
+          value += compute_resource.id.to_s + '_'
+        end
+
         value += vm.send(fog_attr).to_s
         value
       end

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -64,8 +64,15 @@ module ForemanFogProxmox
       vm_attrs
     end
 
+    def cdrom_compute_attributes(attrs)
+      return unless attrs[:storage_type].to_s == 'cdrom' || attrs[:media].to_s == 'cdrom'
+
+      { cdrom: attrs[:volid].to_s }
+    end
+
     def volume_compute_attributes(volume_attributes)
-      volume_attributes.merge(_delete: '0')
+      attrs = volume_attributes.merge(_delete: '0')
+      cdrom_compute_attributes(attrs) || attrs
     end
 
     def vm_compute_attributes(vm)

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -36,8 +36,6 @@ module ForemanFogProxmox
       type = args[:type]
       node = client.nodes.get(args[:node_id])
       vmid = args[:vmid] = assign_vmid(args[:vmid].to_i, node)
-      raise ::Foreman::Exception, format(N_('invalid vmid=%<vmid>s'), vmid: vmid) unless node.servers.id_valid?(vmid)
-
       image_id = args[:image_id]
       remove_volume_keys(args)
       if image_id
@@ -55,8 +53,15 @@ module ForemanFogProxmox
       raise e
     end
 
-    def assign_vmid(vmid, node)
-      (vmid < 1) ? node.servers.next_id : vmid
+    def assign_vmid(vmid, node, log: true)
+      vmid = node.servers.next_id if vmid < 1
+
+      unless node.servers.id_valid?(vmid)
+        logger.warn("Requested VMID #{vmid} is occupied or out of range, requesting a new VMID") if log
+        vmid = node.servers.next_id
+      end
+
+      vmid
     end
 
     def compute_clone_attributes(args, container, type)
@@ -113,7 +118,10 @@ module ForemanFogProxmox
 
         volumes_attributes = new_attributes['volumes_attributes']
         logger.debug("save_vm(#{uuid}) volumes_attributes=#{volumes_attributes}")
-        volumes_attributes&.each_value { |volume_attributes| save_volume(vm, volume_attributes) }
+        volumes_attributes&.each_value do |volume_attributes|
+          validate_cdrom_image_permission!(volume_attributes)
+          save_volume(vm, volume_attributes)
+        end
 
         efidisk_attributes = new_attributes['efidisk_attributes']
         if vm.config.efidisk.present? && efidisk_attributes.empty?

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ModuleLength
+
 # Copyright 2019 Tristan Robert
 
 # This file is part of ForemanFogProxmox.
@@ -182,10 +184,17 @@ module ForemanFogProxmox
       config_attributes.delete_if { |key, _value| ['disks', 'interfaces'].include?(key) }
     end
 
+    def assign_available_vmid(new_attr, node)
+      return if new_attr['vmid'].blank? || new_attr['node_id'].blank?
+
+      new_attr['vmid'] = assign_vmid(new_attr['vmid'].to_i, node, log: false)
+    end
+
     def new_typed_vm(new_attr, type)
       convert_config_attributes(new_attr) if new_attr.key?(:config_attributes)
       node_id = new_attr['node_id']
       node = node_id ? client.nodes.get(node_id) : default_node
+      assign_available_vmid(new_attr, node)
       new_attr_type = new_attr['type']
       new_attr_type ||= new_attr['config_attributes']['type'] if new_attr.key?('config_attributes')
       new_attr_type ||= type
@@ -201,3 +210,5 @@ module ForemanFogProxmox
     end
   end
 end
+
+# rubocop:enable Metrics/ModuleLength

data/app/models/foreman_fog_proxmox/proxmox_volumes.rb

@@ -47,7 +47,7 @@ module ForemanFogProxmox
     def update_volume_required?(old_volume_attributes, new_volume_attributes)
       old_h = ForemanFogProxmox::HashCollection.new_hash_reject_empty_values(old_volume_attributes)
       new_h = ForemanFogProxmox::HashCollection.new_hash_reject_empty_values(new_volume_attributes)
-      new_h = ForemanFogProxmox::HashCollection.new_hash_reject_keys(new_h, ['cdrom', 'cloudinit', 'storage_type'])
+      new_h = ForemanFogProxmox::HashCollection.new_hash_reject_keys(new_h, ['cloudinit', 'storage_type'])
       !ForemanFogProxmox::HashCollection.equals?(old_h.with_indifferent_access, new_h.with_indifferent_access)
     end
 
@@ -112,6 +112,8 @@ module ForemanFogProxmox
     end
 
     def volume_exists?(vm, volume_attributes)
+      return vm.config.disks.get('ide2').present? if volume_type?(volume_attributes, 'cdrom')
+
       disk = vm.config.disks.get(volume_attributes['id'])
       return false unless disk
 
@@ -128,14 +130,14 @@ module ForemanFogProxmox
     end
 
     def extract_id(vm, volume_attributes)
-      id = ''
+      return 'ide2' if volume_type?(volume_attributes, 'cdrom')
+
       if volume_exists?(vm, volume_attributes)
-        id = volume_attributes['id']
+        volume_attributes['id']
       else
         device = vm.container? ? 'mp' : volume_attributes['controller']
-        id = volume_type?(volume_attributes, 'cdrom') ? 'ide2' : device + volume_attributes['device']
+        device + volume_attributes['device']
       end
-      id
     end
 
     def add_volume(vm, id, volume_attributes)
@@ -145,7 +147,10 @@ module ForemanFogProxmox
         disk_attributes[:storage] = volume_attributes['storage']
         disk_attributes[:size] = volume_attributes['size']
       elsif volume_type?(volume_attributes, 'cdrom')
-        disk_attributes[:volid] = volume_attributes[:iso]
+        cdrom_attributes = parse_server_cdrom(volume_attributes)
+        return if cdrom_attributes.empty?
+
+        disk_attributes.merge!(cdrom_attributes)
       elsif volume_type?(volume_attributes, 'cloud_init')
         disk_attributes[:storage] = volume_attributes['storage']
         disk_attributes[:volid] = "#{volume_attributes['storage']}:cloudinit"
@@ -164,7 +169,11 @@ module ForemanFogProxmox
         else
           disk = vm.config.disks.get(id)
           normalized_volume_attributes = normalize_existing_volume_attributes(disk, volume_attributes)
-          update_volume(vm, disk, normalized_volume_attributes) if update_volume_required?(disk.attributes, normalized_volume_attributes)
+          if volume_type?(volume_attributes, 'cdrom')
+            update_volume(vm, disk, normalized_volume_attributes)
+          elsif update_volume_required?(disk.attributes, normalized_volume_attributes)
+            update_volume(vm, disk, normalized_volume_attributes)
+          end
         end
       else
         add_volume(vm, id, volume_attributes)

data/app/views/compute_resources/show/_proxmox.html.erb

@@ -19,6 +19,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <td><%= _("URL") %></td>
   <td><%= @compute_resource.url %></td>
 </tr>
+<tr>
+  <td><%= _("Username") %></td>
+  <td><%= @compute_resource.user %></td>
+</tr>
 <tr>
   <td><%= _("Version") %></td>
   <td><%= @compute_resource.version %></td>

data/app/views/compute_resources_vms/form/proxmox/_base.html.erb

@@ -44,6 +44,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   props = {
     vmAttrs: vm_attrs,
     computeResourceId: compute_resource.id,
+    canAttachCdromImage: User.current.can?(:attach_cdrom_image, compute_resource),
     propsLoaded: false,
     fromProfile: from_profile,
     newVm: new_vm,

data/lib/foreman_fog_proxmox/engine.rb

@@ -43,17 +43,22 @@ module ForemanFogProxmox
           parameter_filter(ComputeResource, :uuid)
           # add dashboard widget
           widget 'foreman_fog_proxmox_widget', name: N_('Foreman Fog Proxmox widget'), sizex: 8, sizey: 1
+
+          p = Foreman::AccessControl.permission(:view_compute_resources)
+          p.actions.concat(%w[foreman_fog_proxmox/compute_resources/ostemplates_by_id_and_node_and_storage
+                              foreman_fog_proxmox/compute_resources/isos_by_id_and_node_and_storage
+                              foreman_fog_proxmox/compute_resources/ostemplates_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/isos_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/storages_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/iso_storages_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/bridges_by_id_and_node
+                              foreman_fog_proxmox/compute_resources/volumes_by_node_and_storage
+                              foreman_fog_proxmox/compute_resources/metadata])
+          p.actions.uniq!
+
           security_block :foreman_fog_proxmox do
-            permission :view_compute_resources, { :'foreman_fog_proxmox/compute_resources' =>
-              [:ostemplates_by_id_and_node_and_storage,
-               :isos_by_id_and_node_and_storage,
-               :ostemplates_by_id_and_node,
-               :isos_by_id_and_node,
-               :storages_by_id_and_node,
-               :iso_storages_by_id_and_node,
-               :bridges_by_id_and_node,
-               :volumes_by_node_and_storage,
-               :metadata] }
+            permission :attach_cdrom_image, {},
+              :resource_type => 'ComputeResource'
           end
         end
       end

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.23.1'
+  VERSION = '0.25.0'
 end

data/test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb

@@ -107,6 +107,16 @@ module ForemanFogProxmox
         assert_equal 'cdrom', cdrom[:media]
       end
 
+      test '#cdrom physical' do
+        cdrom = parse_server_cdrom('cdrom' => 'physical')
+        assert cdrom.key?(:id)
+        assert_equal 'ide2', cdrom[:id]
+        assert cdrom.key?(:volid)
+        assert_equal 'cdrom', cdrom[:volid]
+        assert cdrom.key?(:media)
+        assert_equal 'cdrom', cdrom[:media]
+      end
+
       test '#vm' do
         expected_vm = ActiveSupport::HashWithIndifferentAccess.new(
           {

data/test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb

@@ -150,6 +150,13 @@ module ForemanFogProxmox
         assert_not vm_attrs[:compute_attributes].key?(:macaddr)
       end
 
+      it 'normalizes cdrom volume attributes to form shape' do
+        assert_equal({ cdrom: 'none' }, @cr.volume_compute_attributes({ storage_type: 'cdrom', volid: 'none', media: 'cdrom' }))
+        assert_equal({ cdrom: 'cdrom' }, @cr.volume_compute_attributes({ storage_type: 'cdrom', volid: 'cdrom', media: 'cdrom' }))
+        assert_equal({ cdrom: 'local-lvm:iso/debian-netinst.iso' },
+          @cr.volume_compute_attributes({ storage_type: 'cdrom', volid: 'local-lvm:iso/debian-netinst.iso', media: 'cdrom' }))
+      end
+
       it 'converts a server to hash' do
         vm, config_attributes, volume_attributes, interface_attributes = mock_server_vm
         vm_attrs = @cr.vm_compute_attributes(vm)

data/test/unit/foreman_fog_proxmox/proxmox_orchestration_compute_test.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanFogProxmox
+  class ProxmoxOrchestrationComputeTest < ActiveSupport::TestCase
+    class ComputeValueHost
+      include Orchestration::Proxmox::Compute
+
+      attr_accessor :compute_resource, :vm
+    end
+
+    test '#computeValue prefixes raw vmid for uuid' do
+      host = host_with_vm_value('113')
+
+      assert_equal '4_113', host.computeValue(:uuid, :foreman_uuid)
+    end
+
+    test '#computeValue does not prefix existing proxmox uuid' do
+      host = host_with_vm_value('4_113')
+
+      assert_equal '4_113', host.computeValue(:uuid, :foreman_uuid)
+    end
+
+    private
+
+    def host_with_vm_value(value)
+      host = ComputeValueHost.new
+      host.compute_resource = OpenStruct.new(id: 4)
+      host.vm = OpenStruct.new(foreman_uuid: value)
+      host
+    end
+  end
+end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_create_test.rb

@@ -31,15 +31,18 @@ module ForemanFogProxmox
     include ProxmoxVMHelper
 
     describe 'create_vm' do
-      it 'raises Foreman::Exception when vmid <= 100 and vmid > 0' do
-        args = { vmid: '100' }
+      it 'uses next vmid when requested vmid is occupied or out of range' do
+        args = { vmid: '100', type: 'qemu', node_id: 'proxmox', start_after_create: '0' }
         servers = mock('servers')
-        servers.stubs(:id_valid?).returns(false)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
         cr = mock_node_servers(ForemanFogProxmox::Proxmox.new, servers)
-        err = assert_raises Foreman::Exception do
-          cr.create_vm(args)
-        end
-        assert err.message.end_with?('invalid vmid=100')
+        cr.stubs(:parse_typed_vm).with(args, 'qemu').returns(args)
+        vm = mock('vm')
+        servers.expects(:create).with(args).returns(vm)
+        cr.create_vm(args)
+
+        assert_equal '101', args[:vmid]
       end
 
       it 'computes next vmid when vmid == 0 and creates server' do
@@ -107,6 +110,37 @@ module ForemanFogProxmox
         vm.expects(:update).with(expected_args)
         cr.create_vm(args)
       end
+
+      it 'attaches generated cloud-init ISO from a later ISO storage' do
+        cr = ForemanFogProxmox::Proxmox.new
+        first_storage = mock('first_storage')
+        second_storage = mock('second_storage')
+        volume = mock('volume')
+
+        first_storage.stubs(:volumes).returns([])
+        volume.stubs(:volid).returns('local:iso/name_cloudinit.iso')
+        second_storage.stubs(:volumes).returns([volume])
+        cr.stubs(:storages).with('proxmox', 'iso').returns([first_storage, second_storage])
+
+        assert_equal({ ide2: 'local:iso/name_cloudinit.iso,media=cdrom' },
+          cr.attach_cloudinit_iso('proxmox', '/var/lib/vz/template/iso/name_cloudinit.iso'))
+      end
+
+      it 'raises Foreman::Exception when generated cloud-init ISO is not on any ISO storage' do
+        cr = ForemanFogProxmox::Proxmox.new
+        storage = mock('storage')
+        other_volume = mock('other_volume')
+
+        other_volume.stubs(:volid).returns('local:iso/other.iso')
+        storage.stubs(:volumes).returns([other_volume])
+        cr.stubs(:storages).with('proxmox', 'iso').returns([storage])
+
+        err = assert_raises Foreman::Exception do
+          cr.attach_cloudinit_iso('proxmox', '/var/lib/vz/template/iso/name_cloudinit.iso')
+        end
+
+        assert err.message.end_with?('Could not find generated cloud-init ISO name_cloudinit.iso on any ISO storage for node proxmox')
+      end
     end
   end
 end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb

@@ -35,7 +35,8 @@ module ForemanFogProxmox
         @cr = FactoryBot.build_stubbed(:proxmox_cr)
       end
 
-      it 'saves modified server config with added cdrom' do
+      it 'saves modified server config with added cdrom image when user has permission' do
+        User.current = users(:admin)
         uuid = '100'
         config = mock('config')
         disks = mock('disks')
@@ -58,6 +59,7 @@ module ForemanFogProxmox
         vm.stubs(:type).returns('qemu')
         vm.stubs(:node_id).returns('proxmox')
         @cr.stubs(:find_vm_by_uuid).returns(vm)
+        User.current.stubs(:can?).with(:attach_cdrom_image, @cr).returns(true)
         new_attributes = {
           'templated' => '0',
           'node_id' => 'proxmox',
@@ -88,6 +90,54 @@ module ForemanFogProxmox
         @cr.save_vm(uuid, new_attributes)
       end
 
+      it 'rejects added cdrom image when user has no permission' do
+        User.current = users(:admin)
+        uuid = '100'
+        config = mock('config')
+        disks = mock('disks')
+        disks.stubs(:get).returns
+        config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
+        config.stubs(:attributes).returns(:cores => '')
+        vm = mock('vm')
+        vm.stubs(:identity).returns(uuid)
+        vm.stubs(:attributes).returns('' => '')
+        vm.stubs(:config).returns(config)
+        vm.stubs(:container?).returns(false)
+        vm.stubs(:type).returns('qemu')
+        vm.stubs(:node_id).returns('proxmox')
+        @cr.stubs(:find_vm_by_uuid).returns(vm)
+        User.current.stubs(:can?).with(:attach_cdrom_image, @cr).returns(false)
+        new_attributes = {
+          'templated' => '0',
+          'node_id' => 'proxmox',
+          'config_attributes' => {
+            'cores' => '1',
+            'cpulimit' => '1',
+          },
+          'volumes_attributes' => {
+            '0' => {
+              'id' => 'ide2',
+              '_delete' => '',
+              'device' => '2',
+              'controller' => 'ide',
+              'storage_type' => 'cdrom',
+              'storage' => 'local-lvm',
+              'cdrom' => 'image',
+              'volid' => 'local-lvm:iso/ubuntu-20_4.iso',
+            },
+          },
+        }.with_indifferent_access
+        @cr.stubs(:parse_server_vm).returns('vmid' => '100', 'node_id' => 'proxmox', 'type' => 'qemu', 'cores' => '1',
+          'cpulimit' => '1', 'onboot' => '0')
+        vm.expects(:attach).never
+        vm.expects(:update).never
+
+        assert_raises(::Foreman::Exception) do
+          @cr.save_vm(uuid, new_attributes)
+        end
+      end
+
       it 'saves modified server config with removed cdrom' do
         uuid = '100'
         config = mock('config')

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_test.rb

@@ -39,5 +39,30 @@ module ForemanFogProxmox
         assert cr.destroy_vm('abc')
       end
     end
+
+    describe 'assign_vmid' do
+      it 'uses next vmid when requested vmid is already occupied' do
+        cr = ForemanFogProxmox::Proxmox.new
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
+
+        assert_equal '101', cr.assign_vmid(100, node)
+      end
+
+      it 'does not log when logging is disabled' do
+        cr = ForemanFogProxmox::Proxmox.new
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
+        cr.logger.expects(:warn).never
+
+        assert_equal '101', cr.assign_vmid(100, node, log: false)
+      end
+    end
   end
 end

data/test/unit/foreman_fog_proxmox/proxmox_vm_new_test.rb

@@ -111,5 +111,51 @@ module ForemanFogProxmox
         assert_equal vm, @cr.new_vm(attr)
       end
     end
+
+    describe 'assign_available_vmid' do
+      before do
+        @cr = FactoryBot.build_stubbed(:proxmox_cr)
+      end
+
+      it 'uses next vmid when requested vmid is already occupied' do
+        attr = { 'vmid' => '100', 'node_id' => 'proxmox' }.with_indifferent_access
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(false)
+        servers.expects(:next_id).returns('101')
+        @cr.logger.expects(:warn).never
+
+        @cr.assign_available_vmid(attr, node)
+
+        assert_equal '101', attr['vmid']
+      end
+
+      it 'keeps requested vmid when it is available' do
+        attr = { 'vmid' => '100', 'node_id' => 'proxmox' }.with_indifferent_access
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).with(100).returns(true)
+        servers.expects(:next_id).never
+
+        @cr.assign_available_vmid(attr, node)
+
+        assert_equal 100, attr['vmid']
+      end
+
+      it 'does not assign vmid when requested vmid is blank' do
+        attr = { 'vmid' => '', 'node_id' => 'proxmox' }.with_indifferent_access
+        servers = mock('servers')
+        node = mock('node')
+        node.stubs(:servers).returns(servers)
+        servers.expects(:id_valid?).never
+        servers.expects(:next_id).never
+
+        @cr.assign_available_vmid(attr, node)
+
+        assert_equal '', attr['vmid']
+      end
+    end
   end
 end

data/webpack/components/ProxmoxServer/ProxmoxServerStorage.js

@@ -33,6 +33,7 @@ const ProxmoxServerStorage = ({
   isTabActive,
   selectedImage,
   provisionMethodState,
+  canAttachCdromImage,
 }) => {
   const bootDiskId = React.useMemo(() => {
     if (!bootOrder) return null;
@@ -70,6 +71,8 @@ const ProxmoxServerStorage = ({
   const [nextId, setNextId] = useState(0);
   const [cdRom, setCdRom] = useState(false);
   const [cdRomData, setCdRomData] = useState(null);
+  const [cdRomHidden, setCdRomHidden] = useState(false);
+  const [cdRomIsNew, setCdRomIsNew] = useState(false);
   const [efiDisk, setEfiDisk] = useState(false);
   const [efiDiskData, setEfiDiskData] = useState(null);
   const [nextDeviceNumbers, setNextDeviceNumbers] = useState({
@@ -309,7 +312,7 @@ const ProxmoxServerStorage = ({
           value: '',
         },
         storageType: {
-          name: `${paramScope}[volumes_attributes][${nextId}][storageType]`,
+          name: `${paramScope}[volumes_attributes][${nextId}][storage_type]`,
           value: 'cdrom',
         },
         storage: {
@@ -318,17 +321,29 @@ const ProxmoxServerStorage = ({
         },
         cdrom: {
           name: `${paramScope}[volumes_attributes][${nextId}][cdrom]`,
-          value: '',
+          value: 'none',
+        },
+        _delete: {
+          name: `${paramScope}[volumes_attributes][${nextId}][_delete]`,
         },
       };
 
       setCdRom(true);
       setCdRomData(initCDRom);
+      setCdRomHidden(false);
+      setCdRomIsNew(!isPreExisting);
     },
     [cdRom, nextId, paramScope, createUniqueDevice]
   );
 
-  const removeCDRom = () => setCdRom(false);
+  const removeCDRom = () => {
+    if (cdRomIsNew) {
+      setCdRom(false);
+      setCdRomData(null);
+    } else {
+      setCdRomHidden(true);
+    }
+  };
 
   const addEfiDisk = useCallback(
     (event, initialData = null, isPreExisting = false) => {
@@ -432,14 +447,18 @@ const ProxmoxServerStorage = ({
           </FormHelperText>
         )}
         {cdRom && cdRomData && (
-          <CDRom
-            onRemove={removeCDRom}
-            data={cdRomData}
-            storages={storages}
-            nodeId={nodeId}
-            computeResourceId={computeResourceId}
-            isTabActive={isTabActive}
-          />
+          <div style={{ display: cdRomHidden ? 'none' : 'block' }}>
+            <CDRom
+              onRemove={removeCDRom}
+              data={cdRomData}
+              storages={storages}
+              nodeId={nodeId}
+              computeResourceId={computeResourceId}
+              isTabActive={isTabActive}
+              canAttachCdromImage={canAttachCdromImage}
+              hidden={cdRomHidden}
+            />
+          </div>
         )}
         {efiDisk && efiDiskData && (
           <EFIDisk
@@ -537,6 +556,7 @@ ProxmoxServerStorage.propTypes = {
   isTabActive: PropTypes.bool,
   selectedImage: PropTypes.object,
   provisionMethodState: PropTypes.string,
+  canAttachCdromImage: PropTypes.bool,
 };
 
 ProxmoxServerStorage.defaultProps = {
@@ -553,6 +573,7 @@ ProxmoxServerStorage.defaultProps = {
   isTabActive: false,
   selectedImage: null,
   provisionMethodState: '',
+  canAttachCdromImage: false,
 };
 
 export default ProxmoxServerStorage;

data/webpack/components/ProxmoxServer/components/CDRom.js

@@ -6,6 +6,9 @@ import {
   PageSection,
   Radio,
   Spinner,
+  FormHelperText,
+  HelperText,
+  HelperTextItem,
 } from '@patternfly/react-core';
 import { TimesIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -13,7 +16,15 @@ import { createStoragesMap } from '../../ProxmoxStoragesUtils';
 import InputField from '../../common/FormInputs';
 import useVolumes from '../../hooks/useVolumes';
 
-const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
+const CDRom = ({
+  onRemove,
+  data,
+  storages,
+  nodeId,
+  computeResourceId,
+  canAttachCdromImage,
+  hidden,
+}) => {
   const [cdrom, setCdrom] = useState(data);
 
   const storagesMap = useMemo(
@@ -85,13 +96,20 @@ const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
   const imagesMap = useMemo(
     () => [
       { value: '', label: '' },
-      ...volumes.map(v => ({ value: v.volid, label: v.volid })),
+      ...volumes
+        .filter(v => v.content === 'iso')
+        .map(v => ({ value: v.volid, label: v.volid })),
     ],
     [volumes]
   );
 
   return (
     <div style={{ position: 'relative' }}>
+      <input
+        name={cdrom?._delete?.name}
+        type="hidden"
+        value={hidden ? '1' : '0'}
+      />
       <div
         style={{
           display: 'flex',
@@ -130,7 +148,7 @@ const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
           name={cdrom?.cdrom?.name}
           label={__('None')}
           value="none"
-          isChecked={cdrom?.cdrom?.value === 'none'}
+          isChecked={mediaValue === 'none'}
           onChange={(e, _) => handleMediaChange(_, e)}
         />
         <Radio
@@ -138,8 +156,8 @@ const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
           id="radio-physical"
           name={cdrom?.cdrom?.name}
           label={__('Physical')}
-          value="physical"
-          isChecked={cdrom?.cdrom?.value === 'physical'}
+          value="cdrom"
+          isChecked={mediaValue === 'cdrom'}
           onChange={(e, _) => handleMediaChange(_, e)}
         />
         <Radio
@@ -148,12 +166,25 @@ const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
           name={cdrom?.cdrom?.name}
           label={__('Image')}
           value="image"
-          isChecked={cdrom?.cdrom?.value === 'image'}
+          isChecked={mediaValue === 'image'}
           onChange={(e, _) => handleMediaChange(_, e)}
+          isDisabled={!canAttachCdromImage}
         />
       </div>
 
-      {cdrom?.cdrom?.value === 'image' && (
+      {!canAttachCdromImage && (
+        <FormHelperText>
+          <HelperText id="helper-cdrom-image-permission">
+            <HelperTextItem variant="warning">
+              {__(
+                'You are not authorized to attach or change CD-ROM ISO images'
+              )}
+            </HelperTextItem>
+          </HelperText>
+        </FormHelperText>
+      )}
+
+      {mediaValue === 'image' && (
         <PageSection padding={{ default: 'noPadding' }}>
           <Title ouiaId="proxmox-server-cdrom-image-title" headingLevel="h5">
             {__('Image')}
@@ -170,6 +201,7 @@ const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
             }
             options={storagesMap}
             onChange={handleChange}
+            disabled={!canAttachCdromImage}
           />
 
           {loadingVolumes ? (
@@ -191,6 +223,7 @@ const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
               value={cdrom?.volid?.value}
               options={imagesMap}
               onChange={handleChange}
+              disabled={!canAttachCdromImage}
               error={
                 volumeError
                   ? __('Failed fetching images ISO please try again.')
@@ -198,8 +231,6 @@ const CDRom = ({ onRemove, data, storages, nodeId, computeResourceId }) => {
               }
             />
           )}
-
-          <input name={cdrom?.storageType?.name} type="hidden" value="cdrom" />
         </PageSection>
       )}
     </div>
@@ -224,10 +255,19 @@ CDRom.propTypes = {
     storageType: PropTypes.shape({
       name: PropTypes.string.isRequired,
     }).isRequired,
+    _delete: PropTypes.shape({
+      name: PropTypes.string.isRequired,
+    }),
   }).isRequired,
   storages: PropTypes.array.isRequired,
   nodeId: PropTypes.string.isRequired,
   computeResourceId: PropTypes.number.isRequired,
+  canAttachCdromImage: PropTypes.bool.isRequired,
+  hidden: PropTypes.bool,
+};
+
+CDRom.defaultProps = {
+  hidden: false,
 };
 
 export default CDRom;

data/webpack/components/ProxmoxStoragesUtils.js

@@ -1,8 +1,12 @@
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 
+// Unit selection uses a 1024 step (binary); the value is scaled by 1000 (decimal).
+const BYTE_UNIT_STEP = 1024;
+const BYTE_UNIT_DIVISOR = 1000;
+
 const humanSize = size => {
-  const i = Math.floor(Math.log(size) / Math.log(1024));
-  return `${(size / 1000 ** i).toFixed(2) * 1} ${
+  const i = Math.floor(Math.log(size) / Math.log(BYTE_UNIT_STEP));
+  return `${(size / BYTE_UNIT_DIVISOR ** i).toFixed(2) * 1} ${
     ['B', 'kB', 'MB', 'GB', 'TB'][i]
   }`;
 };

data/webpack/components/ProxmoxVmType.js

@@ -35,6 +35,7 @@ const ProxmoxVmType = ({
   registerComp,
   untemplatable,
   computeResourceId,
+  canAttachCdromImage,
   propsLoaded,
 }) => {
   const [activeTabKey, setActiveTabKey] = useState(0);
@@ -233,6 +234,7 @@ const ProxmoxVmType = ({
           isLoading={!metaLoaded}
           isTabActive={activeTabKey === 4}
           computeResourceId={computeResourceId}
+          canAttachCdromImage={canAttachCdromImage}
           selectedImage={selectedImage}
           provisionMethodState={provisionMethodState}
         />
@@ -415,6 +417,7 @@ ProxmoxVmType.propTypes = {
   registerComp: PropTypes.bool,
   untemplatable: PropTypes.bool,
   computeResourceId: PropTypes.number,
+  canAttachCdromImage: PropTypes.bool,
   propsLoaded: PropTypes.bool,
 };
 
@@ -426,6 +429,7 @@ ProxmoxVmType.defaultProps = {
   registerComp: false,
   untemplatable: false,
   computeResourceId: null,
+  canAttachCdromImage: false,
   propsLoaded: false,
 };
 

data/webpack/global_test_setup.js

@@ -8,4 +8,5 @@ global.console.error = (error, stack) => {
 };
 
 // Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
-jest.setTimeout(10000);
+const JEST_TIMEOUT_MS = 10000;
+jest.setTimeout(JEST_TIMEOUT_MS);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.25.0
 platform: ruby
 authors:
 - Tristan Robert
@@ -264,6 +264,7 @@ files:
 - test/unit/foreman_fog_proxmox/proxmox_images_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_operating_systems_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_orchestration_compute_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
@@ -324,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
@@ -344,6 +345,7 @@ test_files:
 - test/unit/foreman_fog_proxmox/proxmox_images_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_interfaces_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_operating_systems_test.rb
+- test/unit/foreman_fog_proxmox/proxmox_orchestration_compute_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb