foreman_rescue 4.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30d69cfe2978f5b7b6a4f3604151d8d83ab5fcee0a5245ce845798ada48ea10c
-  data.tar.gz: 37cbc08534f2b5cada7d57f8988a5f36a60ae38b244e1ee7c6c076487e51d9fc
+  metadata.gz: cd45138c63c9ba95c38d04d10adfefdc3559c73dfd73b42f7ebcc3788fb727b7
+  data.tar.gz: 8de3698b0905932213fd9217b82083c52b642886a2a08da47ce7a449caab4d83
 SHA512:
-  metadata.gz: cf8c408b71e8d5369c027d11909369152f1ece087658579b3874b55d6e3306448597f17cadab4cba0ee47ae15da5acf8f854dcece077acdd1dcdabf84101bcdc
-  data.tar.gz: fc5b71b96991fd3f42b66bdb8dc2fac9b3173214420273c4d76f5b3bd3b6bbdb7f570a11540cbdca268305983799432656b3ada028fd04d838edbf7cc060124f
+  metadata.gz: 59b4a5dcec262b3b166ef8f4cace5ba2ce94f4ce8ad41513952128a4eca6a8327a00e2c4a8ea200fbbe6ca4a714242497850af6ebaf06004f1a55c193df358ae
+  data.tar.gz: 6d091efc235c1a01d40e6e068af5f53fe0542e90c46559f6ed97bbf5e33dca670ea4fc9f259596b5f7ff0c2cf3363699f3ed3acca4a2a76d588c6a9b9b917fb5

data/README.md

@@ -13,6 +13,7 @@ This plugin allows a user to boot a Foreman host into a rescue system via PXE.
 | >= 1.20         | ~> 2.0         |
 | >= 1.21         | ~> 3.0         |
 | >= 3.9          | ~> 4.0         |
+| >= 3.13         | ~> 5.0         |
 
 ## Installation
 

data/app/models/concerns/foreman_rescue/provisioning_template_extensions.rb

@@ -2,7 +2,7 @@
 
 module ForemanRescue
   module ProvisioningTemplateExtensions
-    def self.templates_by_kind(kind)
+    def templates_by_kind(kind)
       template_kind = TemplateKind.find_by(name: kind)
       ProvisioningTemplate.where(:template_kind => template_kind).pluck(:name, :name).to_h
     end

data/lib/foreman_rescue/engine.rb

@@ -4,9 +4,6 @@ module ForemanRescue
   class Engine < ::Rails::Engine
     engine_name 'foreman_rescue'
 
-    config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-
     # Add any db migrations
     initializer 'foreman_rescue.load_app_instance_data' do |app|
       ForemanRescue::Engine.paths['db/migrate'].existent.each do |path|
@@ -14,38 +11,40 @@ module ForemanRescue
       end
     end
 
-    initializer 'foreman_rescue.register_plugin', :before => :finisher_hook do |_app| # rubocop:disable Metrics/BlockLength
-      Foreman::Plugin.register :foreman_rescue do # rubocop:disable Metrics/BlockLength
-        requires_foreman '>= 3.9'
+    initializer 'foreman_rescue.register_plugin', :before => :finisher_hook do |app| # rubocop:disable Metrics/BlockLength
+      app.reloader.to_prepare do # rubocop:disable Metrics/BlockLength
+        Foreman::Plugin.register :foreman_rescue do # rubocop:disable Metrics/BlockLength
+          requires_foreman '>= 3.13'
 
-        settings do
-          category :rescue, N_('Rescue') do
-            setting('rescue_pxelinux_tftp_template',
-              type: :string,
-              default: 'Kickstart rescue PXELinux',
-              full_name: N_('PXELinux rescue template'),
-              description: N_('PXELinux template used when booting rescue system'),
-              collection: proc { ProvisioningTemplate.templates_by_kind('PXELinux') })
+          settings do
+            category :rescue, N_('Rescue') do
+              setting('rescue_pxelinux_tftp_template',
+                type: :string,
+                default: 'Kickstart rescue PXELinux',
+                full_name: N_('PXELinux rescue template'),
+                description: N_('PXELinux template used when booting rescue system'),
+                collection: proc { ProvisioningTemplate.templates_by_kind('PXELinux') })
 
-            setting('rescue_pxegrub_tftp_template',
-              type: :string,
-              default: '',
-              full_name: N_('PXEGrub rescue template'),
-              description: N_('PXEGrub template used when booting rescue system'),
-              collection: proc { ProvisioningTemplate.templates_by_kind('PXEGrub') })
+              setting('rescue_pxegrub_tftp_template',
+                type: :string,
+                default: '',
+                full_name: N_('PXEGrub rescue template'),
+                description: N_('PXEGrub template used when booting rescue system'),
+                collection: proc { ProvisioningTemplate.templates_by_kind('PXEGrub') })
 
-            setting('rescue_pxegrub2_tftp_template',
-              type: :string,
-              default: '',
-              full_name: N_('PXEGrub2 rescue template'),
-              description: N_('PXEGrub2 template used when booting rescue system'),
-              collection: proc { ProvisioningTemplate.templates_by_kind('PXEGrub2') })
+              setting('rescue_pxegrub2_tftp_template',
+                type: :string,
+                default: '',
+                full_name: N_('PXEGrub2 rescue template'),
+                description: N_('PXEGrub2 template used when booting rescue system'),
+                collection: proc { ProvisioningTemplate.templates_by_kind('PXEGrub2') })
+            end
           end
-        end
 
-        # Add permissions
-        security_block :foreman_rescue do
-          permission :rescue_hosts, :'foreman_rescue/hosts' => [:rescue, :set_rescue, :cancel_rescue]
+          # Add permissions
+          security_block :foreman_rescue do
+            permission :rescue_hosts, :'foreman_rescue/hosts' => [:rescue, :set_rescue, :cancel_rescue]
+          end
         end
       end
     end
@@ -54,7 +53,7 @@ module ForemanRescue
       Host::Managed.prepend ForemanRescue::HostExtensions
       HostsHelper.prepend ForemanRescue::HostsHelperExtensions
       Nic::Managed.prepend ForemanRescue::Orchestration::TFTP
-      ProvisioningTemplate.prepend ForemanRescue::ProvisioningTemplateExtensions
+      ProvisioningTemplate.singleton_class.prepend ForemanRescue::ProvisioningTemplateExtensions
     rescue StandardError => e
       Rails.logger.warn "ForemanRescue: skipping engine hook (#{e})"
     end

data/lib/foreman_rescue/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ForemanRescue
-  VERSION = '4.0.0'
+  VERSION = '5.0.0'
 end

data/test/models/host_test.rb

@@ -56,7 +56,17 @@ class HostTest < ActiveSupport::TestCase
 
       test 'should deploy rescue template' do
         Setting['rescue_pxelinux_tftp_template'] = template.name
-        ProxyAPI::TFTP.any_instance.expects(:set).with('PXELinux', host.mac, :pxeconfig => template.template).once
+        version = Foreman::Version.new
+        if version.major.to_i == 3 && version.minor.to_i <= 13
+          ProxyAPI::TFTP.any_instance.expects(:set).with('PXELinux', host.mac, :pxeconfig => template.template).once
+        else
+          ProxyAPI::TFTP.any_instance.expects(:set).with('PXELinux', host.mac, { :pxeconfig => template.template,
+                                                                                 :targetos => os.name.downcase.to_s,
+                                                                                 :release => host.operatingsystem.release,
+                                                                                 :arch => host.arch.name,
+                                                                                 :bootfile_suffix => host.arch.bootfilename_efi }).once
+
+        end
         host.stubs(:skip_orchestration?).returns(false) # Enable orchestration
         assert host.save
       end

data/test/models/provisioning_template_test.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+class ProvisioningHostTest < ActiveSupport::TestCase
+  setup do
+    User.current = FactoryBot.build(:user, :admin)
+    disable_orchestration
+  end
+
+  context 'provisioning template query' do
+    context 'with type PXELinux' do
+      let(:type) do
+        'PXELinux'
+      end
+
+      test 'should return templates' do
+        templates = ProvisioningTemplate.templates_by_kind(type)
+
+        assert_includes templates, 'PXE Default Menu'
+        assert_includes templates, 'PXELinux default local boot'
+        assert_includes templates, 'PXELinux global default'
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rescue
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Timo Goebel
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -71,13 +70,13 @@ files:
 - test/factories/host.rb
 - test/lib/tasks/seeds_test.rb
 - test/models/host_test.rb
+- test/models/provisioning_template_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_rescue/access_permissions_test.rb
 homepage: https://github.com/dm-drogeriemarkt/foreman_rescue
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Provides the ability to boot a host into a rescue system.
 test_files:
@@ -104,5 +102,6 @@ test_files:
 - test/factories/host.rb
 - test/lib/tasks/seeds_test.rb
 - test/models/host_test.rb
+- test/models/provisioning_template_test.rb
 - test/test_plugin_helper.rb
 - test/unit/foreman_rescue/access_permissions_test.rb