foreman_bootdisk 8.1.0 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 082ac2b9dd317b3ccc8009b039eb390a932b36d1
-  data.tar.gz: 1e0c848ca45723620186429e46a2d9bf7d2a217f
+  metadata.gz: 51edea5185dd0ebc1d65265ee3829f0467865488
+  data.tar.gz: 437a6db3410aaa989e7d3567df89dc29b759119a
 SHA512:
-  metadata.gz: 2778790684106e88c33f2838ab8d6d7fcefe225059c136855a21dbaf91a9d1a8e0dff7cff0ac3b41400c9de6284a839c0b5d84331b5ce7be9b161051062bb64b
-  data.tar.gz: 67651bcb8230af2f329a1e822af51fa93d63747082ce1785d7ce74da528d87f6cbbb31b76ae71e6785454368794d389c49c2a7529d2f6937a9fb9307995d2f4b
+  metadata.gz: 8bb01e994002ba62e9752f02905a7176adf153804b1ee07272876b4e520c031a5cc5373e8cf9f296e1c88a8b726cc3315216ece1badc138fad265d2abc116ac5
+  data.tar.gz: '078ff4c14078cffac0f13c049666c5ac946e906eafc0c647fb0df735900ca54763108c1b0ea09c72c868e7e625ba5ef4645a1c19f9bfc2d979aa8c8d37aa44ed'

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v9.0.0
+* add missing bootdisk helpers for template previews (#17893)
+* disable boot disk button on non-Intel architectures (#17497)
+* fix TFTP menu setup on Foreman 1.13 when creating full host disks
+
 ## v8.1.0
 * add separate ISOLINUX dir setting for Debian OSes (#14896)
 * add friendly setting category name for Foreman 1.14

data/README.md

@@ -43,6 +43,7 @@ gPXE images are unsupported due to lack of initrd support.
 | >= 1.9          | ~> 6.0         |
 | >= 1.11         | >= 6.1, < 8.0  |
 | >= 1.12         | ~> 8.0         |
+| >= 1.13         | ~> 9.0         |
 
 # Usage
 

data/app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -6,20 +6,34 @@ module ForemanBootdisk::HostsHelperExt
   end
 
   def host_title_actions_with_bootdisk(*args)
+    if @host.bootdisk_downloadable?
+      title_actions(
+        button_group(
+          select_action_button(_('Boot disk'), {:class => 'btn btn-group'},
+            display_bootdisk_link_if_authorized(_("Host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'host', :id => @host}, :class=>'la'),
+            display_bootdisk_link_if_authorized(_("Full host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'full_host', :id => @host}, :class=>'la'),
+            content_tag(:li, "", :class => "divider"),
+            display_bootdisk_link_if_authorized(_("Generic image"), {:controller => 'foreman_bootdisk/disks', :action => 'generic'}, :class=>'la'),
+            display_bootdisk_for_subnet,
+            content_tag(:li, "", :class => "divider"),
+            display_bootdisk_link_if_authorized(_("Help"), {:controller => 'foreman_bootdisk/disks', :action => 'help'}, :class=>'la')
+          )
+        )
+      )
+    else
+      bootdisk_button_disabled
+    end
+
+    host_title_actions_without_bootdisk(*args)
+  end
+
+  def bootdisk_button_disabled
     title_actions(
       button_group(
-        select_action_button(_('Boot disk'), {:class => 'btn btn-group'},
-          display_bootdisk_link_if_authorized(_("Host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'host', :id => @host}, :class=>'la'),
-          display_bootdisk_link_if_authorized(_("Full host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'full_host', :id => @host}, :class=>'la'),
-          content_tag(:li, "", :class => "divider"),
-          display_bootdisk_link_if_authorized(_("Generic image"), {:controller => 'foreman_bootdisk/disks', :action => 'generic'}, :class=>'la'),
-          display_bootdisk_for_subnet,
-          content_tag(:li, "", :class => "divider"),
-          display_bootdisk_link_if_authorized(_("Help"), {:controller => 'foreman_bootdisk/disks', :action => 'help'}, :class=>'la')
-        )
+        link_to(_("Boot disk"), '#', :disabled => true, :class => 'btn btn-default',
+                :title => _("Boot disk download not available for %s architecture") % @host.architecture.name)
       )
     )
-    host_title_actions_without_bootdisk(*args)
   end
 
   # need to wrap this one in a test for template proxy presence

data/app/models/concerns/foreman_bootdisk/host_ext.rb

@@ -33,6 +33,14 @@ module ForemanBootdisk::HostExt
     managed? && bootdisk_build? && SETTINGS[:unattended]
   end
 
+  def bootdisk_downloadable?
+    architecture.blank? || intel_arch?
+  end
+
+  def intel_arch?
+    /i.86|x86[_-]64/ =~ architecture.name
+  end
+
   def validate_media_with_bootdisk?
     validate_media_without_bootdisk? || (managed && bootdisk_build? && build?)
   end

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -10,7 +10,7 @@ class ForemanBootdisk::ISOGenerator
   def self.generate_full_host(host, opts = {}, &block)
     raise ::Foreman::Exception.new(N_('Host is not in build mode, so the template cannot be rendered')) unless host.build?
 
-    tmpl = host.send(:generate_pxe_template)
+    tmpl = host.send(:generate_pxe_template, :PXELinux)
     raise ::Foreman::Exception.new(N_('Unable to generate disk template: %s'), host.errors.full_messages.to_sentence) if tmpl == false
 
     # pxe_files and filename conversion is utterly bizarre

data/app/services/foreman_bootdisk/renderer.rb

@@ -5,6 +5,7 @@ module ForemanBootdisk
     include ::Foreman::Renderer
     include Rails.application.routes.url_helpers
     delegate :logger, :to => :ForemanBootdisk
+    include RendererMethods
 
     def generic_template_render(subnet = nil)
       tmpl = ProvisioningTemplate.find_by_name(Setting[:bootdisk_generic_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_generic_host_template'))
@@ -24,17 +25,5 @@ module ForemanBootdisk
       modified_template.gsub!(/(?<=iPXE\?)token=faketoken\&(?=mac=)/,'')
       modified_template
     end
-
-    def bootdisk_chain_url(mac = '', action = 'iPXE')
-      Renderer.format_bootdisk_chain_url(foreman_url(action), mac)
-    end
-
-    def self.format_bootdisk_chain_url(url, mac)
-      u = URI.parse(url)
-      ForemanBootdisk.logger.warn("Foreman or proxy is configured with HTTPS, probably not supported by iPXE: #{u}") if u.scheme == 'https'
-      u.query = "#{u.query}&mac=#{mac}"
-      u.fragment = nil
-      u.to_s
-    end
   end
 end

data/app/services/foreman_bootdisk/renderer_methods.rb

@@ -0,0 +1,19 @@
+module ForemanBootdisk
+  module RendererMethods
+    extend ActiveSupport::Concern
+
+    class_methods do
+      def format_bootdisk_chain_url(url, mac)
+        u = URI.parse(url)
+        ForemanBootdisk.logger.warn("Foreman or proxy is configured with HTTPS, probably not supported by iPXE: #{u}") if u.scheme == 'https'
+        u.query = "#{u.query}&mac=#{mac}"
+        u.fragment = nil
+        u.to_s
+      end
+    end
+
+    def bootdisk_chain_url(mac = '', action = 'iPXE')
+      self.class.format_bootdisk_chain_url(foreman_url(action), mac)
+    end
+  end
+end

data/lib/foreman_bootdisk/engine.rb

@@ -48,7 +48,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.12'
+        requires_foreman '>= 1.13'
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :subnet, :help],
@@ -62,6 +62,7 @@ module ForemanBootdisk
         apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
         provision_method 'bootdisk', N_('Boot disk based')
         template_labels 'Bootdisk' => N_('Boot disk embedded template')
+        extend_template_helpers ForemanBootdisk::RendererMethods
       end
     end
 

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '8.1.0'
+  VERSION = '9.0.0'
 end

data/test/functional/foreman_bootdisk/api/v2/disks_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_plugin_helper'
 
 class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
+  include ForemanBootdiskTestHelper
   setup :setup_bootdisk
 
   test "should generate generic image" do
@@ -12,6 +13,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
   end
 
   describe "#host" do
+    setup :setup_referer
     setup :setup_host_env
 
     test "should generate host image" do

data/test/functional/foreman_bootdisk/api/v2/subnet_disks_controller_test.rb

@@ -1,9 +1,11 @@
 require 'test_plugin_helper'
 
 class ForemanBootdisk::Api::V2::SubnetDisksControllerTest < ActionController::TestCase
+  include ForemanBootdiskTestHelper
   setup :setup_bootdisk
 
   describe "#subnet_host" do
+    setup :setup_referer
     setup :setup_org_loc
     setup :setup_subnet
     setup :setup_host

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -1,6 +1,7 @@
 require 'test_plugin_helper'
 
 class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
+  include ForemanBootdiskTestHelper
   setup :setup_bootdisk
 
   test "should generate generic image" do
@@ -12,6 +13,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
   end
 
   describe "#host" do
+    setup :setup_referer
     setup :setup_org_loc
     setup :setup_subnet
     setup :setup_host
@@ -44,6 +46,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
   end
 
   describe "#host without tftp" do
+    setup :setup_referer
     setup :setup_org_loc
     setup :setup_subnet_no_tftp
     setup :setup_host

data/test/test_plugin_helper.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActionController::TestCase
+module ForemanBootdiskTestHelper
   def setup_bootdisk
     setup_routes
     setup_settings
@@ -25,9 +25,12 @@ class ActionController::TestCase
     load File.join(File.dirname(__FILE__), '..', 'db', 'seeds.d', '50-bootdisk_templates.rb')
   end
 
+  def setup_referer
+    request.env["HTTP_REFERER"] = "/history"
+  end
+
   def setup_org_loc
     disable_orchestration
-    request.env["HTTP_REFERER"] = "/history"
     @org, @loc = FactoryGirl.create(:organization), FactoryGirl.create(:location)
   end
 

data/test/unit/concerns/compute_resources/vmware_test.rb

@@ -10,6 +10,7 @@ class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
     test "does not call clone_vm when bootdisk provisioning" do
       args = { "provision_method" => "bootdisk" }
       mock_vm = mock('vm')
+      mock_vm.stubs(:firmware)
       mock_vm.expects(:save).returns(mock_vm)
       @cr.stubs(:parse_networks).returns(args)
       @cr.expects(:clone_vm).times(0)

data/test/unit/concerns/host_test.rb

@@ -40,4 +40,34 @@ class ForemanBootdisk::HostTest < ActiveSupport::TestCase
       assert_equal false, h.bootdisk?
     end
   end
+
+  context "#bootdisk_downloadable?" do
+    test "should be true for 64 bit architecture" do
+      architecture = Architecture.where(:name => 'x86_64').first
+      host = FactoryGirl.build(:host, :managed, :architecture => architecture)
+
+      assert host.bootdisk_downloadable?
+    end
+
+    test "should be true for 32 bit architecture" do
+      architecture = FactoryGirl.create(:architecture, :name => 'i386')
+      host = FactoryGirl.build(:host, :managed, :architecture => architecture)
+
+      assert host.bootdisk_downloadable?
+    end
+
+    test "should be false for non-intel architecture" do
+      architecture = Architecture.where(:name => 's390').first
+      host = FactoryGirl.build(:host, :managed, :architecture => architecture)
+
+      assert_not host.bootdisk_downloadable?
+    end
+
+    test 'should be true if architecture is absent' do
+      host = FactoryGirl.build(:host, :managed, :architecture => nil)
+
+      assert_equal host.architecture, nil
+      assert host.bootdisk_downloadable?
+    end
+  end
 end

data/test/unit/iso_generator_test.rb

@@ -0,0 +1,49 @@
+require 'test_plugin_helper'
+
+class ForemanBootdisk::IsoGeneratorTest < ActiveSupport::TestCase
+  include ForemanBootdiskTestHelper
+  setup :setup_bootdisk
+  setup :setup_org_loc
+  setup :setup_subnet
+  setup :setup_host
+
+  setup do
+    @host.build = true
+  end
+
+  test "generate_full_host creates with ISO-compatible file names" do
+    @host.expects(:generate_pxe_template).with(:PXELinux).returns("Fake kernel line boot/Debian-8.1-x86_64-vmlinuz")
+    boot_files = [
+      {:"boot/Debian-8.1-x86_64"=>"/tmp/pxeboot/vmlinuz"},
+      {:"boot/Debian-8.1-x86_64"=>"/tmp/pxeboot/initrd.img"}
+    ]
+    @host.operatingsystem.expects(:pxe_files).returns(boot_files)
+    ForemanBootdisk::ISOGenerator.expects(:generate).with({
+      :isolinux => 'Fake kernel line BOOT/DEBIAN_8_1_X86_64_VMLINUZ',
+      :files => [[['BOOT/DEBIAN_8_1_X86_64_VMLINUZ', '/tmp/pxeboot/vmlinuz']],
+      [['BOOT/DEBIAN_8_1_X86_64_INITRD_IMG', '/tmp/pxeboot/initrd.img']]] }, anything)
+    ForemanBootdisk::ISOGenerator.generate_full_host(@host)
+  end
+
+  test "generate_full_host creates with ISO-compatible long file names" do
+    @host.expects(:generate_pxe_template).with(:PXELinux).returns("Fake kernel line boot/RedHatEnterpriseLinuxAtomic-7.3-x86_64-vmlinuz")
+    boot_files = [
+      {:"boot/RedHatEnterpriseLinuxAtomic-7.3-x86_64"=>"/tmp/pxeboot/vmlinuz"},
+      {:"boot/RedHatEnterpriseLinuxAtomic-7.3-x86_64"=>"/tmp/pxeboot/initrd.img"}
+    ]
+    @host.operatingsystem.expects(:pxe_files).returns(boot_files)
+    ForemanBootdisk::ISOGenerator.expects(:generate).with({
+      :isolinux => 'Fake kernel line BOOT/NUXATOMIC_7_3_X86_64_VMLINUZ',
+      :files => [[['BOOT/NUXATOMIC_7_3_X86_64_VMLINUZ', '/tmp/pxeboot/vmlinuz']],
+        [['BOOT/ATOMIC_7_3_X86_64_INITRD_IMG', '/tmp/pxeboot/initrd.img']]]}, anything)
+    ForemanBootdisk::ISOGenerator.generate_full_host(@host)
+  end
+
+  test "full host image generation generates via PXELinux type" do
+    @host.operatingsystem.expects(:pxe_files).returns([])
+    @host.operatingsystem.expects(:kernel).returns("kernel")
+    @host.operatingsystem.expects(:initrd).returns("initrd")
+    ForemanBootdisk::ISOGenerator.expects(:generate).with({:isolinux => nil, :files => []}, anything)
+    ForemanBootdisk::ISOGenerator.generate_full_host(@host)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 9.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-13 00:00:00.000000000 Z
+date: 2017-03-22 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
   without the need for PXE infrastructure.
@@ -36,6 +36,7 @@ files:
 - app/models/setting/bootdisk.rb
 - app/services/foreman_bootdisk/iso_generator.rb
 - app/services/foreman_bootdisk/renderer.rb
+- app/services/foreman_bootdisk/renderer_methods.rb
 - app/views/foreman_bootdisk/disks/help.html.erb
 - app/views/foreman_bootdisk/generic_host.erb
 - app/views/foreman_bootdisk/host.erb
@@ -93,9 +94,10 @@ files:
 - test/unit/concerns/compute_resources/vmware_test.rb
 - test/unit/concerns/host_test.rb
 - test/unit/concerns/orchestration/compute_test.rb
+- test/unit/iso_generator_test.rb
 homepage: http://github.com/theforeman/foreman_bootdisk
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman