foreman_fog_proxmox 0.22.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea8c8bfb4c244c6b8de14bc2119c03bd737d44d3ebfac7f57ee6b4b836bffe4
-  data.tar.gz: 8588badabb959ac81107d258a4c05e3c06ccb7c109c94ddfe91281dd3507bdea
+  metadata.gz: f08732412c42423f30a2f448a7bc48c6249bbf0a62050b28e43a56f4a774caac
+  data.tar.gz: ffecc9919a3f2c64f200b272a7e33065f43584f6734be25c74f794585beed665
 SHA512:
-  metadata.gz: 360e58e7b7efc5cc25dbc6fd473fb869c44329527aa1bdb96b0f98c3049928ae5ee5246632c83f900aa245d9fb3d023b3f4c58e405e12898e75da110f9057936
-  data.tar.gz: 8bcd614b6e3ff837e2e3524c1da9ec54d43ef93869034208634208d8cee66c418db38030ac2bf62829aa3ac1d17f8c3954b6d37f920428a557887181650b2139
+  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/concerns/fog_extensions/proxmox/server.rb

@@ -21,12 +21,18 @@ module FogExtensions
   module Proxmox
     module Server
       extend ActiveSupport::Concern
-      attr_accessor :image_id, :templated, :ostemplate_storage, :ostemplate_file, :password, :start_after_create
+      attr_accessor :image_id, :templated, :ostemplate_storage, :ostemplate_file, :password, :start_after_create, :compute_resource_id
 
       def unique_cluster_identity(compute_resource)
         compute_resource.id.to_s + '_' + identity.to_s
       end
 
+      def foreman_uuid
+        return identity.to_s if compute_resource_id.nil?
+
+        compute_resource_id.to_s + '_' + identity.to_s
+      end
+
       def start
         action('start')
       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 }
@@ -45,6 +46,7 @@ module ForemanFogProxmox
 
     def provided_attributes
       super.merge(
+        :uuid => :foreman_uuid,
         :mac => :mac
       )
     end
@@ -62,10 +64,11 @@ module ForemanFogProxmox
     end
 
     def associated_host(vm)
-      associate_by('mac', vm.mac)
+      associate_by('mac', vm&.mac)
     end
 
     def associate_by(name, attributes)
+      return nil if attributes.blank?
       Host.authorized(:view_hosts,
         Host).joins(:primary_interface).where(:nics => { :primary => true }).where("nics.#{name}".downcase => attributes.downcase).readonly(false).first
     end

data/app/models/foreman_fog_proxmox/proxmox_compute_attributes.rb

@@ -19,8 +19,13 @@
 
 module ForemanFogProxmox
   module ProxmoxComputeAttributes
+    FOREMAN_INTERFACE_ATTRIBUTES = [:id, :mac, :ip, :ip6].freeze
+    PROXMOX_MAC_ATTRIBUTES = [:macaddr, :hwaddr].freeze
+    PROXMOX_INTERFACE_METADATA = [:identifier, :compute_attributes].freeze
+
     def host_compute_attrs(host)
-      ostype = host.compute_attributes['config_attributes']['ostype']
+      config = host.compute_attributes['config_attributes'] || {}
+      ostype = config['ostype']
       type = host.compute_attributes['type']
       case type
       when 'lxc'
@@ -41,9 +46,21 @@ module ForemanFogProxmox
     end
 
     def interface_compute_attributes(interface_attributes)
-      vm_attrs = ForemanFogProxmox::HashCollection.new_hash_reject_keys(interface_attributes, [:identifier, :macaddr, :hwaddr])
-      vm_attrs[:dhcp] = (interface_attributes[:ip] == 'dhcp') ? '1' : '0'
-      vm_attrs[:dhcp6] = (interface_attributes[:ip6] == 'dhcp') ? '1' : '0'
+      attrs = interface_attributes.with_indifferent_access
+      provider_attrs = attrs[:compute_attributes].present? ? attrs[:compute_attributes].with_indifferent_access : ActiveSupport::HashWithIndifferentAccess.new
+
+      vm_attrs = FOREMAN_INTERFACE_ATTRIBUTES.index_with do |key|
+        attrs[key] || provider_attrs.delete(key)
+      end.compact
+      vm_attrs[:mac] ||= attrs[:macaddr] || attrs[:hwaddr] || provider_attrs.delete(:macaddr) || provider_attrs.delete(:hwaddr)
+
+      attrs.except(*FOREMAN_INTERFACE_ATTRIBUTES, *PROXMOX_MAC_ATTRIBUTES, *PROXMOX_INTERFACE_METADATA).each do |key, value|
+        provider_attrs[key] = value
+      end
+
+      provider_attrs[:dhcp] = (vm_attrs[:ip] == 'dhcp') ? '1' : '0'
+      provider_attrs[:dhcp6] = (vm_attrs[:ip6] == 'dhcp') ? '1' : '0'
+      vm_attrs[:compute_attributes] = provider_attrs
       vm_attrs
     end
 

data/app/models/foreman_fog_proxmox/proxmox_operating_systems.rb

@@ -20,16 +20,20 @@
 module ForemanFogProxmox
   module ProxmoxOperatingSystems
     def compute_os_types(host)
-      os_linux_types_mapping(host).empty? ? os_windows_types_mapping(host) : os_linux_types_mapping(host)
+      [os_linux_types_mapping(host), os_windows_types_mapping(host), os_other_types_mapping(host)].find(&:any?) || []
     end
 
     def available_operating_systems
-      operating_systems = ['other', 'solaris']
+      operating_systems = available_other_operating_systems
       operating_systems += available_linux_operating_systems
       operating_systems += available_windows_operating_systems
       operating_systems
     end
 
+    def available_other_operating_systems
+      ['other', 'solaris']
+    end
+
     def available_linux_operating_systems
       ['l24', 'l26', 'debian', 'ubuntu', 'centos', 'fedora', 'opensuse', 'archlinux', 'gentoo', 'alpine']
     end
@@ -50,5 +54,12 @@ module ForemanFogProxmox
     def os_windows_types_mapping(host)
       ['Windows'].include?(host.operatingsystem.type) ? available_windows_operating_systems : []
     end
+
+    def os_other_types_mapping(host)
+      {
+        'Freebsd' => ['other'],
+        'Solaris' => ['solaris'],
+      }.fetch(host.operatingsystem.type, [])
+    end
   end
 end

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -46,9 +46,10 @@ module ForemanFogProxmox
     def vms(opts = {})
       vms = []
       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 = []
-        vms.each { |vm| vms_eager << vm.collection.get(vm.identity) }
+        vms.each { |vm| vms_eager << attach_compute_resource_id(vm.collection.get(vm.identity)) }
         vms = vms_eager
       end
       ForemanFogProxmox::Vms.new(vms)
@@ -71,12 +72,21 @@ module ForemanFogProxmox
     def find_vm_in_servers_by_vmid(servers, vmid)
       vm = servers.get(vmid) unless ForemanFogProxmox::Value.empty?(vmid)
       pool_owner(vm) if vm
-      vm
+      attach_compute_resource_id(vm)
     rescue Fog::Errors::NotFound
       nil
     rescue StandardError => e
       Foreman::Logging.exception(format(_('Failed retrieving proxmox server vm by vmid=%<vmid>s'), vmid: vmid), e)
       raise(ActiveRecord::RecordNotFound, e)
     end
+
+    private
+
+    def attach_compute_resource_id(virtual_machine)
+      return virtual_machine if virtual_machine.nil?
+
+      virtual_machine.compute_resource_id = id if virtual_machine.respond_to?(:compute_resource_id=)
+      virtual_machine
+    end
   end
 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/app/views/compute_resources_vms/index/_proxmox.html.erb

@@ -42,6 +42,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
         <%= action_buttons(
                 vm_power_action(vm, authorizer),
 		vm_associate_link(vm),
+          vm_import_action(vm),
                 display_delete_if_authorized(hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.unique_cluster_identity(@compute_resource)).merge(:auth_object => @compute_resource, :authorizer => authorizer))) %>
         </td>
       </tr>

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.22.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_compute_attributes_test.rb

@@ -60,6 +60,52 @@ module ForemanFogProxmox
         assert err.message.end_with?('Operating system family Solaris is not consistent with l26')
       end
 
+      it 'accepts proxmox linux ostype for linux servers' do
+        operatingsystem = FactoryBot.build(:debian7_1)
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :primary => true)
+        host = FactoryBot.build(
+          :host_empty,
+          :interfaces => [physical_nic],
+          :operatingsystem => operatingsystem,
+          :compute_attributes => {
+            'type' => 'qemu',
+            'config_attributes' => {
+              'ostype' => 'l26',
+            },
+            'interfaces_attributes' => {
+              '0' => physical_nic,
+            },
+          }
+        )
+
+        @cr.host_compute_attrs(host)
+
+        assert_equal host.name, host.compute_attributes['config_attributes']['name']
+      end
+
+      it 'accepts proxmox other ostype for FreeBSD servers' do
+        operatingsystem = FactoryBot.build(:freebsd)
+        physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :primary => true)
+        host = FactoryBot.build(
+          :host_empty,
+          :interfaces => [physical_nic],
+          :operatingsystem => operatingsystem,
+          :compute_attributes => {
+            'type' => 'qemu',
+            'config_attributes' => {
+              'ostype' => 'other',
+            },
+            'interfaces_attributes' => {
+              '0' => physical_nic,
+            },
+          }
+        )
+
+        @cr.host_compute_attrs(host)
+
+        assert_equal host.name, host.compute_attributes['config_attributes']['name']
+      end
+
       it 'sets container hostname with host name' do
         physical_nic = FactoryBot.build(:nic_base_empty, :identifier => 'net0', :primary => true,
           :compute_attributes => { 'dhcp' => '1', 'dhcp6' => '1' })
@@ -87,6 +133,23 @@ module ForemanFogProxmox
       end
       excluded_keys = [:vmid, :disks, :interfaces]
 
+      it 'maps flat interface attributes into foreman nic structure' do
+        vm_attrs = @cr.interface_compute_attributes(
+          id: 'net0',
+          macaddr: '36:25:8C:53:0C:50',
+          model: 'virtio',
+          bridge: 'vmbr0'
+        )
+
+        assert_equal 'net0', vm_attrs[:id]
+        assert_equal '36:25:8C:53:0C:50', vm_attrs[:mac]
+        assert_equal 'virtio', vm_attrs[:compute_attributes][:model]
+        assert_equal 'vmbr0', vm_attrs[:compute_attributes][:bridge]
+        assert_equal '0', vm_attrs[:compute_attributes][:dhcp]
+        assert_equal '0', vm_attrs[:compute_attributes][:dhcp6]
+        assert_not vm_attrs[:compute_attributes].key?(:macaddr)
+      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)
@@ -101,11 +164,13 @@ module ForemanFogProxmox
         assert_not vm_attrs[:config_attributes].key?(:interfaces)
         assert vm_attrs.key?(:interfaces_attributes)
         assert_equal interface_attributes[:id], vm_attrs[:interfaces_attributes]['0'][:id]
-        assert_equal interface_attributes[:mac], vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:macaddr]
+        assert_equal interface_attributes[:mac], vm_attrs[:interfaces_attributes]['0'][:mac]
         assert_equal interface_attributes[:compute_attributes][:model],
           vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:model]
         assert_equal interface_attributes[:compute_attributes][:bridge],
           vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:bridge]
+        assert_equal '0', vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:dhcp]
+        assert_equal '0', vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:dhcp6]
       end
 
       it 'converts a container to hash' do
@@ -121,11 +186,13 @@ module ForemanFogProxmox
         assert_equal volume_attributes.merge(_delete: '0'), vm_attrs[:volumes_attributes]['0']
         assert vm_attrs.key?(:interfaces_attributes)
         assert_equal interface_attributes[:id], vm_attrs[:interfaces_attributes]['0'][:id]
+        assert_equal interface_attributes[:mac], vm_attrs[:interfaces_attributes]['0'][:mac]
         assert_equal interface_attributes[:compute_attributes][:name],
           vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:name]
-        assert_equal interface_attributes[:mac], vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:hwaddr]
         assert_equal interface_attributes[:compute_attributes][:bridge],
           vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:bridge]
+        assert_equal '0', vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:dhcp]
+        assert_equal '0', vm_attrs[:interfaces_attributes]['0'][:compute_attributes][:dhcp6]
       end
     end
   end

data/test/unit/foreman_fog_proxmox/proxmox_operating_systems_test.rb

@@ -0,0 +1,48 @@
+# 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 ProxmoxOperatingSystemsTest < ActiveSupport::TestCase
+    def setup
+      @cr = FactoryBot.build_stubbed(:proxmox_cr)
+    end
+
+    test '#compute_os_types returns linux os types for linux families' do
+      assert_equal @cr.available_linux_operating_systems, @cr.compute_os_types(host_with_os_type('Debian'))
+    end
+
+    test '#compute_os_types returns windows os types for windows family' do
+      assert_equal @cr.available_windows_operating_systems, @cr.compute_os_types(host_with_os_type('Windows'))
+    end
+
+    test '#compute_os_types returns other os type for Freebsd family' do
+      assert_equal ['other'], @cr.compute_os_types(host_with_os_type('Freebsd'))
+    end
+
+    test '#compute_os_types returns solaris os type for Solaris family' do
+      assert_equal ['solaris'], @cr.compute_os_types(host_with_os_type('Solaris'))
+    end
+
+    private
+
+    def host_with_os_type(type)
+      stub(operatingsystem: stub(type: type))
+    end
+  end
+end

data/test/unit/foreman_fog_proxmox/proxmox_test.rb

@@ -48,11 +48,92 @@ module ForemanFogProxmox
       assert_equal host, (as_admin { cr.associated_host(vm) })
     end
 
+    test '#provided_attributes maps uuid to foreman_uuid' do
+      cr = FactoryBot.build_stubbed(:proxmox_cr)
+
+      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/components/ProxmoxContainer/ProxmoxContainerStorage.js

@@ -117,13 +117,12 @@ const ProxmoxContainerStorage = ({
         const newMountPoint = {
           id: newNextId,
           data: initMP,
-          storagesMap,
         };
         setMountPoints(prev => [...prev, newMountPoint]);
         return newNextId;
       });
     },
-    [nextId, paramScope, storagesMap]
+    [nextId, paramScope]
   );
 
   const removeMountPoint = idToRemove => {
@@ -221,7 +220,7 @@ const ProxmoxContainerStorage = ({
               key={mountPoint.id}
               id={mountPoint.id}
               data={mountPoint.data}
-              storagesMap={mountPoint.storagesMap}
+              storagesMap={storagesMap}
             />
           </div>
         ))}

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.22.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
@@ -261,6 +263,7 @@ files:
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
 - 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_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb
@@ -321,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Foreman plugin that adds Proxmox VE compute resource using fog-proxmox
 test_files:
@@ -332,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
@@ -339,6 +343,7 @@ test_files:
 - test/unit/foreman_fog_proxmox/proxmox_compute_attributes_test.rb
 - 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_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_version_test.rb
 - test/unit/foreman_fog_proxmox/proxmox_vm_commands_container_test.rb