foreman_fog_proxmox 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a437699869ae38137e94761791e2a01d741e9dd36f924c286bfaa9afc139f9e7
-  data.tar.gz: 5698645c6f2a3a3278959989e5214357263f3ba7c0091830d1f41205033582ea
+  metadata.gz: f08732412c42423f30a2f448a7bc48c6249bbf0a62050b28e43a56f4a774caac
+  data.tar.gz: ffecc9919a3f2c64f200b272a7e33065f43584f6734be25c74f794585beed665
 SHA512:
-  metadata.gz: 1d29712272ab785a33e4bdc70f345b0da96ff22d020820bbefc27c14302c24c1207d198d6ec742562a4d30a84083b1e081b43bb6a855c432e5a67ce60ca8a5b9
-  data.tar.gz: 9f3c39bbeca9d7364f4ee92cef02cc6fc7c398692cbc12f03a7c581324a9c21ca65ef1af33fcc892b1da02e3378f3f7c214fad2fb79bded7cfb028d55f5e5827
+  metadata.gz: d54a0db2ef661feeffb82d8002f7466bd1a8eb1d3b0b3d11215928b07600fbe591d9ca5cffeb36ff2d293e82523509406b949c8d81a8c2ab80ebdcf83bf95295
+  data.tar.gz: '0740284790c3189d29502bae8359fbf57faace0e1d27bc0e625b37ff17d0d93b31dfbd213f803e5ff2afcacb3726630cfb7176aa2d8c753ac0d31f7f0836393a'

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/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_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/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,7 @@ module ForemanFogProxmox
     include ProxmoxOperatingSystems
     include ProxmoxVersion
     include ProxmoxConsole
+    include ComputeAttributesUpdateDetector
     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 }

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,8 +31,9 @@ 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 %>
 <div class="col-md-offset-2">

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.23.1'
 end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+# 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 'test_plugin_helper'
+
+module ForemanFogProxmox
+  class ProxmoxFormHelperTest < ActiveSupport::TestCase
+    include ProxmoxFormHelper
+
+    describe 'interface compute attribute validation' do
+      let(:required_attrs) do
+        {
+          'qemu' => { 'model' => 'virtio' },
+          'lxc' => { 'name' => 'eth0' },
+        }
+      end
+
+      it 'rejects attributes when required keys are missing' do
+        required_attrs.each_key do |vm_type|
+          assert_not send(:proxmox_valid_interface_compute_attributes?, { 'bridge' => 'vmbr0' }, vm_type)
+        end
+      end
+
+      it 'accepts attributes when required keys are present' do
+        required_attrs.each do |vm_type, attrs|
+          assert send(:proxmox_valid_interface_compute_attributes?, attrs, vm_type)
+        end
+      end
+
+      it 'accepts attributes when required keys are present with other keys' do
+        required_attrs.each do |vm_type, attrs|
+          assert send(:proxmox_valid_interface_compute_attributes?, attrs.merge('bridge' => 'vmbr0'), vm_type)
+        end
+      end
+    end
+  end
+end

data/test/unit/foreman_fog_proxmox/proxmox_test.rb

@@ -54,11 +54,86 @@ module ForemanFogProxmox
       assert_equal :foreman_uuid, cr.provided_attributes[:uuid]
     end
 
+    test '#update_required? detects added HDD attributes' do
+      cr = FactoryBot.build_stubbed(:proxmox_cr)
+      old_attrs = hdd_compute_attrs(hdd_attrs('0'))
+      new_attrs = hdd_compute_attrs(hdd_attrs('0').merge('1' => hdd_attributes('virtio1', 'virtio', '1')))
+
+      assert cr.update_required?(old_attrs, new_attrs)
+    end
+
+    test '#update_required? detects removed HDD attributes' do
+      cr = FactoryBot.build_stubbed(:proxmox_cr)
+
+      old_attrs = hdd_compute_attrs(
+        hdd_attrs('0').merge('1' => hdd_attributes('virtio1', 'virtio', '1'))
+      )
+
+      new_attrs = hdd_compute_attrs(
+        hdd_attrs('0').merge('1' => { '_delete' => '1' })
+      )
+
+      assert cr.update_required?(old_attrs, new_attrs)
+    end
+
+    test '#update_required? detects modified existing HDD attributes' do
+      cr = FactoryBot.build_stubbed(:proxmox_cr)
+      old_attrs = hdd_compute_attrs(hdd_attrs('0'))
+      new_attrs = hdd_compute_attrs(hdd_attrs('0').deep_merge('0' => { 'size' => '20' }))
+
+      assert cr.update_required?(old_attrs, new_attrs)
+    end
+
+    test '#update_required? detects modified CPU flag' do
+      cr = FactoryBot.build_stubbed(:proxmox_cr)
+      old_attrs = { 'config_attributes' => { 'spectre' => '0' } }
+      new_attrs = { 'config_attributes' => { 'spectre' => '+1' } }
+
+      assert cr.update_required?(old_attrs, new_attrs)
+    end
+
+    test '#update_required? detects modified network interface' do
+      cr = FactoryBot.build_stubbed(:proxmox_cr)
+      old_attrs = { 'interfaces_attributes' => { '0' => { 'id' => 'net0', 'bridge' => 'vmbr0' } } }
+      new_attrs = { 'interfaces_attributes' => { '0' => { 'id' => 'net0', 'bridge' => 'vmbr1' } } }
+
+      assert cr.update_required?(old_attrs, new_attrs)
+    end
+
+    test '#update_required? detects added network interface' do
+      cr = FactoryBot.build_stubbed(:proxmox_cr)
+      old_attrs = { 'interfaces_attributes' => { '0' => { 'id' => 'net0' } } }
+      new_attrs = { 'interfaces_attributes' => { '0' => { 'id' => 'net0' }, '1' => { 'id' => 'net1' } } }
+
+      assert cr.update_required?(old_attrs, new_attrs)
+    end
+
     test '#node' do
       node = mock('node')
       cr = FactoryBot.build_stubbed(:proxmox_cr)
       cr.stubs(:node).returns(node)
       assert_equal node, (as_admin { cr.node })
     end
+
+    private
+
+    def hdd_compute_attrs(volumes_attrs)
+      { 'volumes_attributes' => volumes_attrs }
+    end
+
+    def hdd_attrs(index)
+      { index => hdd_attributes('scsi0', 'scsi', '0') }
+    end
+
+    def hdd_attributes(id, controller, device)
+      {
+        'id' => id,
+        'storage_type' => 'hard_disk',
+        'controller' => controller,
+        'device' => device,
+        'storage' => 'local-lvm',
+        'size' => '10',
+      }
+    end
   end
 end

data/webpack/global_index.js

@@ -1,3 +1,5 @@
+import '../app/assets/javascripts/foreman_fog_proxmox/proxmox_compute_resource';
+
 // Placeholder to initialize routes (compare foreman_ansible)
 
 /*

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Tristan Robert
@@ -153,6 +153,7 @@ files:
 - app/models/concerns/host_ext/proxmox/for_vm.rb
 - app/models/concerns/host_ext/proxmox/interfaces.rb
 - app/models/concerns/orchestration/proxmox/compute.rb
+- app/models/foreman_fog_proxmox/compute_attributes_update_detector.rb
 - app/models/foreman_fog_proxmox/options_select.rb
 - app/models/foreman_fog_proxmox/proxmox.rb
 - app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb
@@ -254,6 +255,7 @@ files:
 - test/functional/compute_resources_controller_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_form_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb
@@ -333,6 +335,7 @@ test_files:
 - test/functional/compute_resources_controller_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_container_helper_test.rb
+- test/unit/foreman_fog_proxmox/helpers/proxmox_form_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_helper_test.rb
 - test/unit/foreman_fog_proxmox/helpers/proxmox_vm_uuid_helper_test.rb