foreman_fog_proxmox 0.19.1 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d33ba66a9b7acebd9d90dcb30dd674ce56b6dc9f163be3058e0638afdcb9d469
-  data.tar.gz: 0dd4eea9468557e5d88f1b30acab223e17a900657a5a3e7ab609fabc4265ae8b
+  metadata.gz: b9245dbe8083dfb0dc96195feaafd9aed1aa448956c2fc497ec5c2c4333bfd2e
+  data.tar.gz: 80631b0e56427938aef3a14a08d47f61a0355d9e1928791d362fdf1ba8fcd3bc
 SHA512:
-  metadata.gz: 879a29517ecaa8129d2253959819fae1b4e203c85b1e28fce114e08a8c248d991ccd125bbb9b9ac49c8e07621b9754dbf5ffdfdcf320edb7019074bddca65b4c
-  data.tar.gz: 4f2a0640189b83fe993d46ded2eb8106fdc86ec69a1e9693bf0830b7cd9486f2d997adcb8265d1f70933cc1d2378831389f50d8ff853914f45ef083380cda32e
+  metadata.gz: 2c0d7df8aa1b9fe9e7efd370e3356abf6331c93ee291d0b3d8698cfc413b50383ef190ae62fe69076a83f42426cdeca1c83649c64558ec956d92e330462bf527
+  data.tar.gz: c920739b5e891307d620234cd667c481b1ab3a5fd6913b4847d87e9d344340a2cd787ba069959d7429b5847a0f30782cee907df399e98ce3aecfecc74ac290cc

data/app/controllers/foreman_fog_proxmox/compute_resources_controller.rb

@@ -78,8 +78,69 @@ module ForemanFogProxmox
       end
     end
 
+    # GET foreman_fog_proxmox/volumes/:compute_resource_id/:node_id/:storage
+    def volumes_by_node_and_storage
+      cr = ComputeResource.find(params[:compute_resource_id])
+      node_id = params[:node_id]
+      storage = params[:storage]
+
+      vols = cr.storages(node_id).find { |s| s.storage == storage }&.volumes || []
+
+      render json: Array(vols).map { |v|
+        h = v.respond_to?(:as_json) ? v.as_json : v
+        { volid: (h[:volid] || h['volid']), content: (h[:content] || h['content']) }
+      }
+    end
+
+    # GET foreman_fog_proxmox/metadata/:compute_resource_id
+    def metadata
+      cr = ComputeResource.find(params[:compute_resource_id])
+
+      render json: {
+        nodes: extract_nodes(cr),
+        pools: extract_pools(cr),
+        storages: extract_storages(cr),
+        bridges: extract_bridges(cr),
+      }
+    end
+
     private
 
+    def extract_nodes(compute_resource)
+      Array(compute_resource.nodes).map { |n| { node: n.node } }
+    end
+
+    def extract_pools(compute_resource)
+      Array(compute_resource.pools).map do |p|
+        poolid = p.respond_to?(:poolid) ? p.poolid : (p[:poolid] || p['poolid'])
+        { poolid: poolid }
+      end
+    end
+
+    def extract_storages(compute_resource)
+      Array(compute_resource.storages).map do |s|
+        h = s.respond_to?(:as_json) ? s.as_json : s
+        {
+          storage: (h[:storage] || h['storage']),
+          node_id: (h[:node_id] || h['node_id']),
+          content: (h[:content] || h['content']),
+          avail: (h[:avail] || h['avail']),
+          used: (h[:used] || h['used']),
+          total: (h[:total] || h['total']),
+        }
+      end
+    end
+
+    def extract_bridges(compute_resource)
+      Array(compute_resource.bridges).map do |b|
+        h = b.respond_to?(:as_json) ? b.as_json : b
+        {
+          node_id: (h[:node_id] || h['node_id']),
+          iface: (h[:iface] || h['iface']),
+        }
+      end
+    end
+
     def load_compute_resource(compute_resource_id)
       ComputeResource.find(compute_resource_id)
     end

data/app/helpers/proxmox_vm_attrs_helper.rb

@@ -28,7 +28,7 @@ module ProxmoxVMAttrsHelper
   def object_to_attributes_hash(vms, from_profile, start_checked)
     param_scope = from_profile ? "compute_attribute[vm_attrs]" : "host[compute_attributes]"
     vm_h = ActiveSupport::HashWithIndifferentAccess.new
-    keys = [:vmid, :node_id, :type, :pool]
+    keys = [:vmid, :node_id, :type, :pool, :efidisk]
     main = vms.attributes.select { |key, _value| keys.include? key }
     vms.config.all_attributes.each do |key, value|
       camel_key = key.to_s.include?('_') ? snake_to_camel(key.to_s).to_sym : key
@@ -42,7 +42,9 @@ module ProxmoxVMAttrsHelper
     vm_h.merge!(additional_attrs(vms, param_scope, start_checked))
     vm_h[:interfaces] = network_attrs(param_scope, vms.interfaces)
     vm_h[:disks] = volumes_attrs(param_scope, vms.volumes)
-    vm_h.merge(cpu_flags_attrs(param_scope, vms.config))
+    vm_h[:efidisk] = efidisk_attrs(param_scope, vms.efidisk) if vms.efidisk.present?
+    vm_h.merge!(cpu_flags_attrs(param_scope, vms.config))
+    vm_h
   end
 
   def cpu_flags_attrs(param_scope, config)
@@ -53,6 +55,15 @@ module ProxmoxVMAttrsHelper
     flag_attrs
   end
 
+  def efidisk_attrs(param_scope, efidisk)
+    attrs = ActiveSupport::HashWithIndifferentAccess.new
+    keys = ['id', 'volid', 'size', 'storage', 'format', 'efitype', 'pre_enrolled_keys']
+    keys.each do |key|
+      attrs[key] = { :name => "#{param_scope}[efidisk_attributes][#{key}]", :value => efidisk.public_send(key) }
+    end
+    attrs
+  end
+
   def volumes_attrs(param_scope, volumes)
     vol_attrs = []
     volumes.each_with_index do |vol, id|

data/app/helpers/proxmox_vm_cloudinit_helper.rb

@@ -48,7 +48,7 @@ module ProxmoxVMCloudinitHelper
     wd = create_temp_directory(ssh)
 
     configs.each do |config|
-      config_file = ssh.run(%(echo '#{config[1]}' >> "#{wd}/#{config[0]}"))
+      config_file = ssh.run("cat <<'EOF' > '#{wd}/#{config[0]}'\n#{config[1]}\nEOF")
       unless config_file.first.status.zero?
         delete_temp_dir(ssh, wd)
         raise ::Foreman::Exception, "Failed to create file #{config[0]}: #{config_file.first.stdout}"

data/app/helpers/proxmox_vm_config_helper.rb

@@ -40,7 +40,7 @@ module ProxmoxVMConfigHelper
   end
 
   def general_a(type)
-    general_a = ['node_id', 'type', 'config_attributes', 'volumes_attributes', 'interfaces_attributes', 'image_id']
+    general_a = ['node_id', 'type', 'config_attributes', 'efidisk_attributes', 'volumes_attributes', 'interfaces_attributes', 'image_id']
     general_a += ['firmware_type', 'provision_method', 'container_volumes', 'server_volumes', 'start_after_create']
     general_a += ['name'] if type == 'lxc'
     general_a

data/app/helpers/proxmox_vm_efidisk_helper.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+# Copyright 2026 ATIX AG
+
+# 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/>.
+
+require 'fog/proxmox/helpers/efidisk_helper'
+require 'foreman_fog_proxmox/value'
+require 'foreman_fog_proxmox/hash_collection'
+
+# Convert a foreman form server hash into a fog-proxmox server attributes hash
+module ProxmoxVMEfidiskHelper
+  def parsed_typed_efidisk(args, type, parsed_vm)
+    attrs = args['efidisk_attributes']
+
+    # we need the vmid to create the volid if not present
+    vmid = args['vmid'] if args.key?('vmid')
+    # fallback to a dummy vmid for new vms
+    vmid ||= 'no_vmid_yet'
+
+    logger.debug("parsed_typed_efidisk(#{type}): attrs=#{attrs} with #{vmid}")
+    unless ForemanFogProxmox::Value.empty?(args['efidisk_attributes'])
+      efidisk = parse_typed_efidisk(attrs, vmid, type)
+      logger.debug("parsed_typed_efidisk(#{type}): efidisk=#{efidisk}")
+      parsed_vm = parsed_vm.merge(efidisk)
+    end
+    parsed_vm
+  end
+
+  def parse_typed_efidisk(args, _vmid, _type)
+    logger.debug(format(_('parse_efidisk(): args=%<args>s'), args: args))
+    efidisk = {}
+    efidisk[:id] = args['id'] if args.key?('id')
+    efidisk[:volid] = args['volid']
+    efidisk[:size] = args['size'].to_i if args.key?('size') && !args['size'].empty?
+    efidisk[:format] = args['format']
+    efidisk[:efitype] = args['efitype'] if args.key?('efitype') && !args['efitype'].empty?
+    efidisk[:pre_enrolled_keys] = args['pre_enrolled_keys'] if args.key?('pre_enrolled_keys')
+    Fog::Proxmox::EfidiskHelper.flatten(efidisk)
+  end
+end

data/app/helpers/proxmox_vm_helper.rb

@@ -26,6 +26,7 @@ module ProxmoxVMHelper
   include ProxmoxVMVolumesHelper
   include ProxmoxVMConfigHelper
   include ProxmoxVMOsTemplateHelper
+  include ProxmoxVMEfidiskHelper
 
   def vm_collection(type)
     collection = :servers
@@ -42,6 +43,7 @@ module ProxmoxVMHelper
 
     logger.debug("parse_typed_vm(#{type}): args=#{args}")
     parsed_vm = parsed_typed_config(args, type)
+    parsed_vm = parsed_typed_efidisk(args, type, parsed_vm)
     parsed_vm = parsed_typed_interfaces(args, type, parsed_vm)
     parsed_vm = parsed_typed_volumes(args, type, parsed_vm)
     logger.debug("parse_typed_vm(#{type}): parsed_vm=#{parsed_vm}")

data/app/models/concerns/fog_extensions/proxmox/server.rb

@@ -44,6 +44,10 @@ module FogExtensions
         reboot
       end
 
+      def poweroff
+        stop
+      end
+
       def mac
         config.mac_addresses.first
       end
@@ -81,6 +85,7 @@ module FogExtensions
         config.disks.collect(&:to_s)
       end
 
+      delegate :efidisk, to: :config
       delegate :vga, to: :config
       delegate :pool, to: :config
       delegate :cloud_init?, to: :config

data/app/models/foreman_fog_proxmox/proxmox_efidisks.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Copyright 2019 ATIX AG
+
+# 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 ProxmoxEfidisks
+    include ProxmoxVMHelper
+
+    def delete_efidisk(vmobj)
+      logger.info("vm #{vmobj.identity} delete efidisk0")
+      vmobj.detach('efidisk0')
+    end
+  end
+end

data/app/models/foreman_fog_proxmox/proxmox_images.rb

@@ -48,11 +48,18 @@ module ForemanFogProxmox
       volumes = []
       nodes.each do |node|
         storages(node.node).each do |storage|
-          # fetches volumes of QEMU servers for images
-          volumes += storage.volumes.list_by_content_type('images')
+          # 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
 
-          # fetches volumes of KVM containers for images
+          # 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
         end
       end
       # for creating image, only list volumes which are templated

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -22,6 +22,7 @@ require 'foreman_fog_proxmox/hash_collection'
 module ForemanFogProxmox
   module ProxmoxVMCommands
     include ProxmoxVolumes
+    include ProxmoxEfidisks
     include ProxmoxPools
     include ProxmoxVMHelper
 
@@ -72,7 +73,7 @@ module ForemanFogProxmox
       vm = find_vm_by_uuid(uuid)
       return true if vm.nil?
       vm.stop if vm.ready?
-      vm.destroy
+      vm.ha&.dig("managed").to_i == 1 ? vm.destroy(query: { purge: 1 }) : vm.destroy
     rescue ActiveRecord::RecordNotFound
       # if the VM does not exists, we don't really care.
       true
@@ -109,9 +110,17 @@ module ForemanFogProxmox
             ['volumes_attributes']).merge(type: vm.type), vm.type
         )
         config_attributes = compute_config_attributes(parsed_attr)
+
         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) }
+
+        efidisk_attributes = new_attributes['efidisk_attributes']
+        if vm.config.efidisk.present? && efidisk_attributes.empty?
+          logger.debug("Removing efidisk from VM #{vm}")
+          delete_efidisk(vm)
+        end
+
         vm.update(config_attributes[:config_attributes])
         poolid = new_attributes['pool'] if new_attributes.key?('pool')
         update_pool(vm, poolid) if poolid

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

@@ -14,25 +14,43 @@ 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/>. %>
-<% nodes = compute_resource.nodes %>
+
 <% unless local_assigns[:hide_image] && !new_vm %>
-    <%
-      arch ||= nil ; os ||= nil
-      images = possible_images(compute_resource, arch, os)
-    -%>
-    <div id='image_selection'>
-    <%= select_f f, :image_id, images, :uuid, :name, { :include_blank => true },
-      :disabled => true,
-      :help_inline => :indicator,
-      :class => ("without_select2 #{'hide' if from_profile}"),
-      :label => _('Image'),
-      :no_label => from_profile,
-      :label_size => "col-md-2" %>
-    </div>
+  <%
+    arch ||= nil ; os ||= nil
+    images = possible_images(compute_resource, arch, os)
+  -%>
+  <div id='image_selection'>
+    <%= select_f f, :image_id, images, :uuid, :name, { include_blank: true },
+      disabled: true,
+      help_inline: :indicator,
+      class: ("without_select2 #{'hide' if from_profile}"),
+      label: _('Image'),
+      no_label: from_profile,
+      label_size: "col-md-2" %>
+  </div>
 <% end %>
+
 <% untemplatable = new_vm || f.object.templated? %>
-<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start_after_create] || '1' %>
+<% checked = (params.dig(:host, :compute_attributes, :start_after_create) || '1') %>
+
 <% content_for(:javascripts) do %>
   <%= webpacked_plugins_js_for :foreman_fog_proxmox %>
 <% end %>
-<%= react_component('ProxmoxVmType',  { vmAttrs: object_to_attributes_hash(f.object, from_profile, checked), nodes: nodes.as_json, images: images.as_json, pools: compute_resource.pools.as_json, storages: compute_resource.storages.as_json, fromProfile: from_profile, newVm: new_vm, bridges: compute_resource.bridges.as_json, untemplatable: untemplatable }) %>
+
+<%
+  vm_attrs = object_to_attributes_hash(f.object, from_profile, checked)
+
+  props = {
+    vmAttrs: vm_attrs,
+    computeResourceId: compute_resource.id,
+    propsLoaded: false,
+    fromProfile: from_profile,
+    newVm: new_vm,
+    untemplatable: untemplatable,
+    registerComp: local_assigns[:registerComp] || false,
+    images: (defined?(images) && images ? images.as_json : [])
+  }
+%>
+
+<%= react_component('ProxmoxVmType', props) %>

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

@@ -38,6 +38,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
       <%= prop :vmid %>
       <%= prop :description %>
       <%= prop :disks %>
+      <%= prop :efidisk, "EFI-Disk" %>
       <%= prop :nics %>
     <% end %>
   </table>

data/config/routes.rb

@@ -30,5 +30,11 @@ Rails.application.routes.draw do
     match 'isostorages/:compute_resource_id/:node_id', :to => 'compute_resources#iso_storages_by_id_and_node',
       :via => 'get'
     match 'bridges/:compute_resource_id/:node_id', :to => 'compute_resources#bridges_by_id_and_node', :via => 'get'
+    match 'volumes/:compute_resource_id/:node_id/:storage',
+      :to => 'compute_resources#volumes_by_node_and_storage',
+      :via => 'get'
+    match 'metadata/:compute_resource_id',
+      :to => 'compute_resources#metadata',
+      :via => 'get'
   end
 end

data/lib/foreman_fog_proxmox/engine.rb

@@ -49,7 +49,9 @@ module ForemanFogProxmox
                :isos_by_id_and_node,
                :storages_by_id_and_node,
                :iso_storages_by_id_and_node,
-               :bridges_by_id_and_node] }
+               :bridges_by_id_and_node,
+               :volumes_by_node_and_storage,
+               :metadata] }
           end
         end
       end
@@ -92,6 +94,7 @@ module ForemanFogProxmox
       require 'fog/proxmox/compute/models/server'
       require 'fog/proxmox/compute/models/server_config'
       require 'fog/proxmox/compute/models/disk'
+      require 'fog/proxmox/compute/models/efidisk'
       require 'fog/proxmox/compute/models/interface'
       require 'fog/proxmox/compute/models/volume'
       require 'fog/proxmox/compute/models/node'

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.19.1'
+  VERSION = '0.20.0'
 end

data/package.json

@@ -5,9 +5,9 @@
   "main": "index.js",
   "scripts": {
     "lint": "tfm-lint --plugin -d webpack",
-    "test": "tfm-test --plugin --passWithNoTests",
-    "test:watch": "tfm-test --plugin --watchAll",
-    "test:current": "tfm-test --plugin --watch",
+    "test": "tfm-test --config jest.config.js",
+    "test:watch": "tfm-test --config jest.config.js --plugin --watchAll",
+    "test:current": "tfm-test --config jest.config.js --plugin --watch",
     "publish-coverage": "tfm-publish-coverage",
     "stories": "tfm-stories --plugin",
     "stories:build": "tfm-build-stories --plugin",

data/test/functional/compute_resources_controller_test.rb

@@ -20,31 +20,79 @@ require 'test_plugin_helper'
 
 module ForemanFogProxmox
   class ComputeResourcesControllerTest < ActionController::TestCase
+    tests ForemanFogProxmox::ComputeResourcesController
+
+    setup do
+      @compute_resource = FactoryBot.create(:proxmox_cr)
+      mock_storage = mock('storage')
+      mock_storage.stubs(:storage).returns('local')
+      mock_storage.stubs(:volumes).returns([])
+
+      @compute_resource.stubs(:images_by_storage).returns([])
+      @compute_resource.stubs(:nodes).returns([])
+      @compute_resource.stubs(:pools).returns([])
+      @compute_resource.stubs(:storages).with('proxmox').returns([mock_storage])
+      @compute_resource.stubs(:storages).with('proxmox', 'vztmpl').returns([])
+      @compute_resource.stubs(:storages).with('proxmox', 'iso').returns([])
+      @compute_resource.stubs(:storages).with(nil).returns([])
+      @compute_resource.stubs(:bridges).returns([])
+
+      # Stub ComputeResource.find to return our stubbed instance
+      ComputeResource.stubs(:find).with(@compute_resource.id).returns(@compute_resource)
+      ComputeResource.stubs(:find).with(@compute_resource.id.to_s).returns(@compute_resource)
+    end
+
     test 'should get isos by node and storage' do
       get :isos_by_id_and_node_and_storage,
-        params: { :compute_resource_id => 1, :node_id => 'proxmox', :storage => 'local' }
+        params: { :compute_resource_id => @compute_resource.id, :node_id => 'proxmox', :storage => 'local' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get ostemplates by node and storage' do
       get :ostemplates_by_id_and_node_and_storage,
-        params: { :compute_resource_id => 1, :node_id => 'proxmox', :storage => 'local' }
+        params: { :compute_resource_id => @compute_resource.id, :node_id => 'proxmox', :storage => 'local' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get isos by node' do
-      get :isos_by_id_and_node, params: { :compute_resource_id => 1, :node_id => 'proxmox' }
+      get :isos_by_id_and_node, params: { :compute_resource_id => @compute_resource.id, :node_id => 'proxmox' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
     test 'should get ostemplates by node' do
-      get :ostemplates_by_id_and_node, params: { :compute_resource_id => 1, :node_id => 'proxmox' }
+      get :ostemplates_by_id_and_node, params: { :compute_resource_id => @compute_resource.id, :node_id => 'proxmox' }
       assert_response :found
       show_response = @response.body
       assert_not show_response.empty?
     end
+    test 'should get volumes by node and storage' do
+      get :volumes_by_node_and_storage,
+        params: { :compute_resource_id => @compute_resource.id, :node_id => 'proxmox', :storage => 'local' },
+        session: set_session_user
+      assert_response :success
+      show_response = @response.body
+      assert_not show_response.empty?
+      json_response = JSON.parse(show_response)
+      assert_instance_of Array, json_response
+    end
+    test 'should get metadata' do
+      get :metadata, params: { :compute_resource_id => @compute_resource.id }, session: set_session_user
+      assert_response :success
+      show_response = @response.body
+      assert_not show_response.empty?
+      json_response = JSON.parse(show_response)
+      assert_instance_of Hash, json_response
+      assert json_response.key?('nodes')
+      assert json_response.key?('pools')
+      assert json_response.key?('storages')
+      assert json_response.key?('bridges')
+      assert_instance_of Array, json_response['nodes']
+      assert_instance_of Array, json_response['pools']
+      assert_instance_of Array, json_response['storages']
+      assert_instance_of Array, json_response['bridges']
+    end
   end
 end

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb

@@ -39,6 +39,7 @@ module ForemanFogProxmox
         uuid = '100'
         config = mock('config')
         config.stubs(:attributes).returns(:cores => '')
+        config.stubs(:efidisk).returns(nil)
         vm = mock('vm')
         vm.stubs(:config).returns(config)
         vm.stubs(:container?).returns(true)
@@ -59,6 +60,7 @@ module ForemanFogProxmox
         uuid = '100'
         config = mock('config')
         config.stubs(:attributes).returns(:cores => '')
+        config.stubs(:efidisk).returns(nil)
         vm = mock('vm')
         vm.stubs(:config).returns(config)
         vm.stubs(:container?).returns(true)
@@ -87,6 +89,7 @@ module ForemanFogProxmox
         disk.stubs(:id).returns('mp0')
         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)
@@ -148,6 +151,7 @@ module ForemanFogProxmox
         disk.stubs(:attributes).returns(id: 'rootfs', storage: 'local-lvm', size: '1')
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)
@@ -207,6 +211,7 @@ module ForemanFogProxmox
         disk.stubs(:attributes).returns(id: 'mp0', storage: 'local-lvm', size: '1', volid: 'local-lvm:vm-100-disk-0')
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cdrom_test.rb

@@ -48,6 +48,7 @@ module ForemanFogProxmox
         disk.stubs(:mount_point?).returns(false)
         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)
@@ -104,6 +105,7 @@ module ForemanFogProxmox
         disk.stubs(:id).returns('ide2')
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '1', :cpulimit => '1')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)
@@ -159,6 +161,7 @@ module ForemanFogProxmox
         disk.stubs(:attributes).returns(id: 'ide2', storage: 'local-lvm', volid: 'local-lvm:vm-100-disk-0', size: '1')
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_cloudinit_test.rb

@@ -44,6 +44,7 @@ module ForemanFogProxmox
         disk.stubs(:id).returns('ide0')
         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)
@@ -96,6 +97,7 @@ module ForemanFogProxmox
         disk.stubs(:cloud_init?).returns(true)
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '1')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)

data/test/unit/foreman_fog_proxmox/proxmox_vm_commands_server_update_hard_disk_test.rb

@@ -50,6 +50,7 @@ module ForemanFogProxmox
         disk.stubs(:attributes).returns(id: 'scsi0', storage: 'local-lvm', size: '1')
         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)
@@ -101,6 +102,7 @@ module ForemanFogProxmox
         disk.stubs(:id).returns('virtio0')
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)
@@ -157,6 +159,7 @@ module ForemanFogProxmox
         disk.stubs(:attributes).returns(id: 'scsi0', storage: 'local-lvm', size: 1)
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)
@@ -264,6 +267,7 @@ module ForemanFogProxmox
         disk.stubs(:attributes).returns(id: 'scsi0', storage: 'local-lvm', size: '1', volid: 'local-lvm:vm-100-disk-0')
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)
@@ -318,6 +322,7 @@ module ForemanFogProxmox
         disk.stubs(:attributes).returns(id: 'scsi0', storage: 'local-lvm', volid: 'local-lvm:vm-100-disk-0', size: '1')
         disks.stubs(:get).returns(disk)
         config.stubs(:disks).returns(disks)
+        config.stubs(:efidisk).returns(nil)
         config.stubs(:attributes).returns(:cores => '')
         vm = mock('vm')
         vm.stubs(:identity).returns(uuid)