foreman_fog_proxmox 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a437699869ae38137e94761791e2a01d741e9dd36f924c286bfaa9afc139f9e7
-  data.tar.gz: 5698645c6f2a3a3278959989e5214357263f3ba7c0091830d1f41205033582ea
+  metadata.gz: 494d9e13c53b6e6e1a4821d8c046d145060bac1058f9285763661bd935e5a4ef
+  data.tar.gz: ba0639aa5659316381788213a3d6049ae98a8238a1612dd1dc8db7eed583d11f
 SHA512:
-  metadata.gz: 1d29712272ab785a33e4bdc70f345b0da96ff22d020820bbefc27c14302c24c1207d198d6ec742562a4d30a84083b1e081b43bb6a855c432e5a67ce60ca8a5b9
-  data.tar.gz: 9f3c39bbeca9d7364f4ee92cef02cc6fc7c398692cbc12f03a7c581324a9c21ca65ef1af33fcc892b1da02e3378f3f7c214fad2fb79bded7cfb028d55f5e5827
+  metadata.gz: 4d7e5fc3d3bff0e58256217b5f69910dc03d0f08662dcc2ef1af35e242e5115f4e8023c565afa99cd83821dea73018d66b235354106766a4dbed351266c165ce
+  data.tar.gz: 6ec6c8942c3e58cc7b3a05be5f2c0131bc47a0fb3cb9a4948d46cea8b51610ee33b7b6f0cbd8a08eac66818e7e83a2f0f51e3dca2ce8d0a9c051092d84c21c81

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_compute_resource.js

@@ -23,11 +23,14 @@ $(document).ready(function () {
 function sslVerifyPeerSelected() {
   var selected = $("#compute_resource_ssl_verify_peer").is(':checked');
   var ssl_certs_block = $('#compute_resource_ssl_certs').parents('.clearfix');
+  var ssl_certs_group = $('#compute_resource_ssl_certs').parents('.form-group');
   var ssl_certs_textarea = $('#compute_resource_ssl_certs');
   if (selected) {
+    ssl_certs_group.removeClass('hide');
     ssl_certs_block.show();
     ssl_certs_textarea.show();
   } else {
+    ssl_certs_group.addClass('hide');
     ssl_certs_block.hide();
     ssl_certs_textarea.text('');
     ssl_certs_textarea.hide();
@@ -62,4 +65,11 @@ function authMethodSelected() {
   authMethods().forEach(function(method){
     toggleFieldset(method, selected);
   });
-}
+}
+
+window.tfm = window.tfm || {};
+window.tfm.computeResource = window.tfm.computeResource || {};
+window.tfm.computeResource.proxmox = {
+  authMethodSelected: authMethodSelected,
+  sslVerifyPeerSelected: sslVerifyPeerSelected,
+};

data/app/controllers/concerns/foreman_fog_proxmox/controller/parameters/compute_resource.rb

@@ -27,7 +27,8 @@ module ForemanFogProxmox
           def compute_resource_params_filter
             super.tap do |filter|
               filter.permit :ssl_verify_peer,
-                :ssl_certs, :disable_proxy, :auth_method, :token_id, :token
+                :ssl_certs, :disable_proxy, :auth_method, :token_id, :token,
+                :caching_enabled
             end
           end
 

data/app/controllers/foreman_fog_proxmox/compute_resources_controller.rb

@@ -84,7 +84,8 @@ module ForemanFogProxmox
       node_id = params[:node_id]
       storage = params[:storage]
 
-      vols = cr.storages(node_id).find { |s| s.storage == storage }&.volumes || []
+      node = cr.send(:client).nodes.get(node_id)
+      vols = node&.storages&.get(storage)&.volumes || []
 
       render json: Array(vols).map { |v|
         h = v.respond_to?(:as_json) ? v.as_json : v

data/app/helpers/proxmox_form_helper.rb

@@ -130,8 +130,11 @@ module ProxmoxFormHelper
   def proxmox_valid_interface_compute_attributes?(compute_attributes, vm_type)
     return false unless compute_attributes.respond_to?(:keys)
 
-    valid_keys = interface_compute_attributes_typed_keys(vm_type)
-    compute_attributes.keys.map(&:to_s).all? { |key| valid_keys.include?(key) }
+    compute_attribute_keys = compute_attributes.keys.map(&:to_s)
+    required_keys = interface_compute_attributes_required_typed_keys(vm_type)
+    missing_keys = required_keys - compute_attribute_keys
+
+    required_keys.any? && missing_keys.empty?
   end
 
   def extract_attr(attrs, key)

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_interfaces_helper.rb

@@ -55,6 +55,17 @@ module ProxmoxVMInterfacesHelper
     keys
   end
 
+  def interface_compute_attributes_required_typed_keys(type)
+    case type
+    when 'qemu'
+      ['model']
+    when 'lxc'
+      ['name']
+    else
+      []
+    end
+  end
+
   def interface_common_typed_keys(type)
     ['id', (type == 'qemu') ? 'macaddr' : 'hwaddr']
   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/compute_attributes_update_detector.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# Copyright 2026
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module ForemanFogProxmox
+  module ComputeAttributesUpdateDetector
+    def update_required?(old_attrs, new_attrs)
+      old_attrs = old_attrs.deep_symbolize_keys
+      new_attrs = new_attrs.deep_symbolize_keys
+      new_attrs.each do |key, new_v|
+        old_v = old_attrs[key]
+        if new_v.is_a?(Hash)
+          unless old_v.is_a?(Hash)
+            logger.debug "Scheduling compute instance update because #{key} changed it's value from '#{old_v}' (#{old_v.class}) to '#{new_v}' (#{new_v.class})"
+            return true
+          end
+          return true if update_required?(old_v, new_v)
+        elsif old_v.to_s != new_v.to_s
+          logger.debug "Scheduling compute instance update because #{key} changed it's value from '#{old_v}' (#{old_v.class}) to '#{new_v}' (#{new_v.class})"
+          return true
+        end
+      end
+      false
+    end
+  end
+end

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -35,6 +35,9 @@ module ForemanFogProxmox
     include ProxmoxOperatingSystems
     include ProxmoxVersion
     include ProxmoxConsole
+    include ComputeAttributesUpdateDetector
+    include ComputeResourceCaching
+
     validates :url, :format => { :with => URI::DEFAULT_PARSER.make_regexp }, :presence => true
     validates :auth_method, :presence => true, :inclusion => { in: ['access_ticket', 'user_token'],
       message: ->(value) do format('%<value>s is not a valid authentication method', { value: value }) end }
@@ -128,6 +131,14 @@ module ForemanFogProxmox
 
     private
 
+    def structs_from_cache(items)
+      Array(items).map { |item| OpenStruct.new(item) }
+    end
+
+    def extract_attributes(resource, fields)
+      slice_vm_attributes(fields.index_with { |field| resource.try(field) }, fields)
+    end
+
     def fog_credentials
       hash = {
         proxmox_url: url,

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_images.rb

@@ -24,11 +24,18 @@ module ForemanFogProxmox
     end
 
     def images_by_storage(node_id, storage_id, type = 'iso')
-      node = client.nodes.get node_id
-      node ||= default_node
-      storage = node.storages.get storage_id if storage_id
-      logger.debug("images_by_storage(): node_id #{node_id} storage_id #{storage_id} type #{type}")
-      storage.volumes.list_by_content_type(type).sort_by(&:volid) if storage
+      cached_images = cache.cache(:"images_by_storage-#{node_id}-#{storage_id}-#{type}") do
+        node = client.nodes.get(node_id) || default_node
+        storage = node.storages.get storage_id if storage_id
+        logger.debug("images_by_storage(): node_id #{node_id} storage_id #{storage_id} type #{type}")
+        next [] unless storage
+
+        storage.volumes.list_by_content_type(type).sort_by(&:volid).map do |volume|
+          extract_attributes(volume, [:volid, :content, :format, :size, :used])
+        end
+      end
+
+      structs_from_cache(cached_images)
     end
 
     def template_name(template)
@@ -45,25 +52,31 @@ module ForemanFogProxmox
     end
 
     def templates
-      volumes = []
-      nodes.each do |node|
-        storages(node.node).each do |storage|
-          # Skip disabled storages (enabled == 0 or nil)
-          unless storage.enabled.to_i == 1
-            logger.warn("Skipping disabled storage #{storage.identity} on #{node.node}")
-            next
+      cached_templates = cache.cache(:templates) do
+        volumes = fog_nodes.flat_map do |node|
+          storages = node.storages.list_by_content_type 'images'
+          logger.debug("storages(): node_id #{node.node} type images")
+          storages.reject { |storage| storage.active.to_i.zero? }.sort_by(&:storage).flat_map do |storage|
+            # Skip disabled storages (enabled == 0 or nil)
+            unless storage.enabled.to_i == 1
+              logger.warn("Skipping disabled storage #{storage.identity} on #{node.node}")
+              next []
+            end
+
+            # Fetch QEMU and LXC template images
+            storage.volumes.list_by_content_type('images') + storage.volumes.list_by_content_type('rootdir')
+          rescue StandardError => e
+            logger.error("Failed to fetch volumes for storage #{storage.identity} on #{node.node}: #{e.message}")
+            []
           end
+        end
 
-          # Fetch QEMU and LXC template images
-          volumes += storage.volumes.list_by_content_type('images')
-          volumes += storage.volumes.list_by_content_type('rootdir')
-        rescue StandardError => e
-          logger.error("Failed to fetch volumes for storage #{storage.identity} on #{node.node}: #{e.message}")
-          next
+        volumes.select(&:template?).map do |volume|
+          extract_attributes(volume, [:vmid, :name, :volid, :node_id]).merge(template: true)
         end
       end
-      # for creating image, only list volumes which are templated
-      volumes.select(&:template?)
+
+      structs_from_cache(cached_templates)
     end
 
     def template(uuid)

data/app/models/foreman_fog_proxmox/proxmox_pools.rb

@@ -20,8 +20,25 @@
 module ForemanFogProxmox
   module ProxmoxPools
     def pools
-      pools = identity_client.pools.all
-      pools.sort_by(&:poolid)
+      cached_pools = cache.cache(:pools) do
+        pools = identity_client.pools.all
+        pools.sort_by(&:poolid).map do |pool|
+          extract_attributes(pool, [:poolid, :comment]).merge(
+            members: Array(pool.try(:members)).map do |member|
+              { vmid: member['vmid'] }
+            end
+          )
+        end
+      end
+
+      # Store only serializable hashes in the cache. After retrieval we recreate the pool objects and reattach the `has_server?` helper method.
+      Array(cached_pools).map do |pool|
+        OpenStruct.new(pool).tap do |pool_object|
+          pool_object.define_singleton_method(:has_server?) do |vmid|
+            Array(members).any? { |member| member[:vmid].to_s == vmid.to_s || member['vmid'].to_s == vmid.to_s }
+          end
+        end
+      end
     end
 
     def pool_owner(vm)

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -113,7 +113,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

@@ -97,7 +97,7 @@ module ForemanFogProxmox
     end
 
     def default_node
-      nodes.first
+      fog_nodes.first
     end
 
     def default_node_id

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -23,29 +23,47 @@ module ForemanFogProxmox
     include ProxmoxVMUuidHelper
 
     def nodes
-      nodes = client.nodes.all if client
-      nodes&.sort_by(&:node)
+      cached_nodes = cache.cache(:nodes) do
+        nodes = client.nodes.all if client
+        nodes&.sort_by(&:node)&.map do |node|
+          { node: node.node }
+        end
+      end
+
+      structs_from_cache(cached_nodes)
     end
 
     def storages(node_id = default_node_id, type = 'images')
-      node = client.nodes.get node_id
-      node ||= default_node
-      storages = node.storages.list_by_content_type type
-      logger.debug("storages(): node_id #{node_id} type #{type}")
-      storages.reject { |s| s.enabled.to_i.zero? || s.active.to_i.zero? }.sort_by(&:storage)
+      cached_storages = cache.cache(:"storages-#{node_id}-#{type}") do
+        node = client.nodes.get(node_id) || default_node
+        storages = node.storages.list_by_content_type type
+        logger.debug("storages(): node_id #{node_id} type #{type}")
+        storages.reject { |s| s.enabled.to_i.zero? || s.active.to_i.zero? }.sort_by(&:storage).map do |storage|
+          fields = [:storage, :enabled, :active, :content, :node_id, :avail, :used, :total]
+          extract_attributes(storage, fields).merge(identity: storage.storage)
+        end
+      end
+
+      structs_from_cache(cached_storages)
     end
 
     def bridges(node_id = default_node_id)
-      node = network_client.nodes.get node_id
-      node ||= network_client.nodes.first
-      bridges = node.networks.all(type: 'any_bridge')
-      bridges.sort_by(&:iface)
+      cached_bridges = cache.cache(:"bridges-#{node_id}") do
+        node = network_client.nodes.get node_id
+        node ||= network_client.nodes.first
+        bridges = node.networks.all(type: 'any_bridge')
+        bridges.sort_by(&:iface).map do |bridge|
+          extract_attributes(bridge, [:iface, :node_id]).merge(identity: bridge.iface)
+        end
+      end
+
+      structs_from_cache(cached_bridges)
     end
 
     # TODO: Pagination with filters
     def vms(opts = {})
       vms = []
-      nodes.each { |node| vms += node.servers.all + node.containers.all }
+      fog_nodes.each { |node| vms += node.servers.all + node.containers.all }
       vms.each { |vm| attach_compute_resource_id(vm) }
       if opts.key?(:eager_loading) && opts[:eager_loading]
         vms_eager = []
@@ -59,7 +77,7 @@ module ForemanFogProxmox
       # look for the uuid on all known nodes
       vm = nil
       vmid = extract_vmid(uuid)
-      nodes.each do |node|
+      fog_nodes.each do |node|
         vm = find_vm_in_servers_by_vmid(node.servers, vmid)
         vm ||= find_vm_in_servers_by_vmid(node.containers, vmid)
         next if vm.nil?
@@ -82,6 +100,11 @@ module ForemanFogProxmox
 
     private
 
+    def fog_nodes
+      nodes = client.nodes.all if client
+      nodes&.sort_by(&:node) || []
+    end
+
     def attach_compute_resource_id(virtual_machine)
       return virtual_machine if virtual_machine.nil?
 

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/api/v2/compute_resources/proxmox.json.rabl

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-attributes :url, :user, :ssl_verify_peer, :ssl_certs, :renew
+attributes :url, :user, :ssl_verify_peer, :ssl_certs, :renew, :caching_enabled

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

@@ -15,12 +15,10 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
-<%= javascript_include_tag 'foreman_fog_proxmox/proxmox_compute_resource', "data-turbolinks-track" => true %>
-
 <% user_token = f.object.auth_method == 'user_token' %>
 <% access_ticket = f.object.auth_method == 'access_ticket' %>
-<% ssl_verify_peer = f.object.ssl_verify_peer == '1' %>
-<%= select_f f, :auth_method, proxmox_auth_methods_map, :id, :name, { }, :label_help => _("Click Test connection button before changing it"), :label => _('Authentication method'), :label_size => "col-md-2", :required => true, :onchange => 'authMethodSelected();' %>
+<% ssl_verify_peer = f.object.ssl_verify_peer %>
+<%= select_f f, :auth_method, proxmox_auth_methods_map, :id, :name, { }, :label_help => _("Click Test connection button before changing it"), :label => _('Authentication method'), :label_size => "col-md-2", :required => true, :onchange => 'tfm.computeResource.proxmox.authMethodSelected();' %>
 <%= field_set_tag _("Common fields"), :id => "compute_ressource_common_field_set" do %>
   <%= text_f f, :url, :help_block => _("e.g. https://127.0.0.1:8006/api2/json") %>
   <%= text_f f, :user , :help_block => _("e.g. root@pam") %>
@@ -33,10 +31,13 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= password_f f, :password, :keep_value => true, :unset => unset_password?, :required => access_ticket %>
 <% end %>
 <%= field_set_tag _("SSL fields"), :id => "compute_ressource_ssl_field_set" do %>  
-  <%= checkbox_f f, :ssl_verify_peer, :label => _("SSL verify peer"), :label_help => _("Click Test connection button before changing it"), :checked_value => '1', :onchange => 'sslVerifyPeerSelected();' %>
+  <%= checkbox_f f, :ssl_verify_peer, :label => _("SSL verify peer"), :label_help => _("Click Test connection button before changing it"), :checked_value => '1', :onchange => 'tfm.computeResource.proxmox.sslVerifyPeerSelected();' %>
   <%= textarea_f f, :ssl_certs, :label => _("X509 Certification Authorities"), :size => "col-md-4",
+    :wrapper_class => "form-group #{'hide' unless ssl_verify_peer}",
     :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer.") %>
 <% end %>
+<%= checkbox_f f, :caching_enabled, :label => _("Enable Caching"),
+  :help_inline => _("Cache Proxmox resources.") %>
 <div class="col-md-offset-2">
   <%= test_connection_button_f(f, (f.object.nodes rescue true)) %>
 </div>

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

@@ -27,6 +27,10 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <td><%= _("Authentication method") %></td>
   <td><%= @compute_resource.auth_method %></td>
 </tr>
+<tr>
+  <td><%= _("Caching") %></td>
+  <td><%= @compute_resource.caching_enabled ? _("Enabled") : _("Disabled") %></td>
+</tr>
 <tr>
   <td><%= _("User token expires") %></td>
   <td><%= user_token_expiration_date(@compute_resource) %></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

@@ -54,6 +54,8 @@ module ForemanFogProxmox
                :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.0'
+  VERSION = '0.24.0'
 end

data/test/functional/compute_resources_controller_test.rb

@@ -69,6 +69,18 @@ module ForemanFogProxmox
       assert_not show_response.empty?
     end
     test 'should get volumes by node and storage' do
+      mock_storage = mock('storage')
+      mock_storage.stubs(:volumes).returns([])
+      mock_storages = mock('storages')
+      mock_storages.stubs(:get).with('local').returns(mock_storage)
+      mock_node = mock('node')
+      mock_node.stubs(:storages).returns(mock_storages)
+      mock_nodes = mock('nodes')
+      mock_nodes.stubs(:get).with('proxmox').returns(mock_node)
+      mock_client = mock('client')
+      mock_client.stubs(:nodes).returns(mock_nodes)
+      @compute_resource.stubs(:client).returns(mock_client)
+
       get :volumes_by_node_and_storage,
         params: { :compute_resource_id => @compute_resource.id, :node_id => 'proxmox', :storage => 'local' },
         session: set_session_user