foreman_bootdisk 16.1.0 → 17.0.2

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

@@ -5,20 +5,33 @@ require 'test_plugin_helper'
 class ForemanBootdisk::Api::V2::SubnetDisksControllerTest < ActionController::TestCase
   include ForemanBootdiskTestHelper
   setup :setup_bootdisk
+  setup :setup_referer
+  setup :setup_org_loc
 
-  describe '#subnet_host' do
-    setup :setup_referer
-    setup :setup_org_loc
-    setup :setup_subnet
+  def perform_subnet_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
+    get :subnet, params: { id: @host.subnet.id }
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  describe '#subnet_host with TFTP' do
+    setup :setup_subnet_with_tftp
+    setup :setup_host
+
+    test 'should generate subnet generic host image' do
+      perform_subnet_generate
+    end
+  end
+
+  describe '#subnet_host with TFTP and HTTPBOOT' do
+    setup :setup_subnet_with_tftp_httpboot_template
     setup :setup_host
 
     test 'should generate subnet generic host image' do
-      ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(ipxe: regexp_matches(/disk generic host template/))).yields('temp ISO')
-      ForemanBootdisk::Renderer.any_instance.stubs(:bootdisk_chain_url).yields('http://smart-proxy.lan')
-      File.expects(:read).with('temp ISO').returns('ISO image')
-      get :subnet, params: { id: @host.subnet.id }
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_subnet_generate
     end
   end
 end

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -5,45 +5,85 @@ require 'test_plugin_helper'
 class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
   include ForemanBootdiskTestHelper
   setup :setup_bootdisk
+  setup :setup_referer
+  setup :setup_org_loc
 
-  test 'should generate generic image' do
-    ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(ipxe: regexp_matches(/disk generic host template/))).yields('temp ISO')
-    @controller.expects(:read_file).with('temp ISO').returns('ISO image')
+  def perform_generic_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
     get :generic, session: set_session_user
     assert_response :success
-    assert_equal 'ISO image', @response.body
+  ensure
+    tmp.unlink
   end
 
-  describe '#host' do
-    setup :setup_referer
-    setup :setup_org_loc
-    setup :setup_subnet
+  def perform_host_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
+    get :host, params: { id: @host.name }, session: set_session_user
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  def perform_full_host_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate_full_host).yields(create_tempfile.path)
+    get :full_host, params: { id: @host.name }, session: set_session_user
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  def perform_subnet_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
+    get :subnet, params: { id: @host.name }, session: set_session_user
+    assert_empty flash[:error]
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  describe '#generic with TFTP' do
+    setup :setup_subnet_with_tftp
     setup :setup_host
 
+    test 'should generate generic image' do
+      perform_generic_generate
+    end
+
     test 'should generate host image' do
-      ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(ipxe: regexp_matches(/disk host template/))).yields('temp ISO')
-      @controller.expects(:read_file).with('temp ISO').returns('ISO image')
-      get :host, params: { id: @host.name }, session: set_session_user
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_host_generate
     end
 
     test 'should generate full host image' do
-      ForemanBootdisk::ISOGenerator.expects(:generate_full_host).with(@host).yields('temp ISO')
-      @controller.expects(:read_file).with('temp ISO').returns('ISO image')
-      get :full_host, params: { id: @host.name }, session: set_session_user
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_full_host_generate
     end
 
     test 'should generate subnet image' do
-      ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(ipxe: regexp_matches(/disk generic host template/))).yields('temp ISO')
-      ForemanBootdisk::Renderer.any_instance.stubs(:bootdisk_chain_url).yields('http://smart-proxy.lan')
-      @controller.expects(:read_file).with('temp ISO').returns('ISO image')
-      get :subnet, params: { id: @host.name }, session: set_session_user
-      assert_empty flash[:error]
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_subnet_generate
+    end
+  end
+
+  describe '#subnet_host with TFTP and HTTPBOOT' do
+    setup :setup_subnet_with_tftp_httpboot_template
+    setup :setup_host
+
+    test 'should generate generic image' do
+      perform_generic_generate
+    end
+
+    test 'should generate host image' do
+      perform_host_generate
+    end
+
+    test 'should generate full host image' do
+      perform_full_host_generate
+    end
+
+    test 'should generate subnet image' do
+      perform_subnet_generate
     end
   end
 

data/test/test_plugin_helper.rb

@@ -5,15 +5,23 @@ require 'webmock/minitest'
 require 'webmock'
 
 module ForemanBootdiskTestHelper
+  def create_tempfile
+    file = Tempfile.new('bootdisk-test', '/tmp')
+    file.close
+    file
+  end
+
   def setup_bootdisk
+    ForemanBootdisk::Scope::Bootdisk.any_instance.stubs(:bootdisk_chain_url).returns('http://smart-proxy.example.com/unattended/iPXE?mac=')
     setup_routes
     setup_settings
     setup_templates
   end
 
+  # TODO remove me
   def setup_host_env
     setup_org_loc
-    setup_subnet
+    setup_subnet_with_tftp
     setup_host
   end
 
@@ -39,7 +47,17 @@ module ForemanBootdiskTestHelper
     @loc = FactoryBot.create(:location)
   end
 
-  def setup_subnet
+  def setup_subnet_with_tftp_httpboot_template
+    ProxyAPI::V2::Features.any_instance.stubs(:features).returns(:httpboot => { :settings => { :https_port => 1234 }, :state => 'running' }, :templates => {}, :tftp => {})
+    SmartProxy.any_instance.stubs(:httpboot_http_port).returns('8888')
+    SmartProxy.any_instance.stubs(:httpboot_https_port).returns('9999')
+
+    proxy = FactoryBot.create(:smart_proxy, features: [FactoryBot.create(:tftp_feature), FactoryBot.create(:feature, :templates), FactoryBot.create(:feature, :httpboot)])
+    proxy.reload
+    setup_subnet_no_tftp.update! tftp: proxy, httpboot: proxy, template: proxy
+  end
+
+  def setup_subnet_with_tftp
     tftp_proxy = FactoryBot.create(:smart_proxy, features: [FactoryBot.create(:tftp_feature)])
     setup_subnet_no_tftp.update! tftp: tftp_proxy
   end
@@ -49,6 +67,6 @@ module ForemanBootdiskTestHelper
   end
 
   def setup_host
-    @host = FactoryBot.create(:host, :managed, subnet: @subnet, ip: @subnet.network.sub(/0$/, '4'), organization: @org, location: @loc)
+    @host = FactoryBot.create(:host, :managed, subnet: @subnet, ip: @subnet.network.sub(/0$/, '4'), organization: @org, location: @loc, build: true)
   end
 end

data/test/unit/concerns/host_test.rb

@@ -36,7 +36,7 @@ module ForemanBootdisk
     test 'host should not have bootdisk' do
       if unattended?
         h = FactoryBot.create(:host)
-        assert_equal false, h.bootdisk?
+        assert_not(h.bootdisk?)
       end
     end
 

data/test/unit/concerns/orchestration/compute_test.rb

@@ -22,29 +22,48 @@ module ForemanBootdisk
       @host.send(:setAttachIsoImage)
     end
 
-    test 'provisioning a host with provision method bootdisk should queue bootdisk tasks' do
+    test 'provisioning a host with provision method bootdisk should detach iso' do
+      @cr.expects(:iso_detach)
+      @host.send(:setDetachIsoImage)
+    end
+
+    test 'provisioning a new host with provision method bootdisk should queue bootdisk tasks' do
       @host.stubs(:compute?).returns(true)
+      @host.stubs(:build?).returns(true)
       @host.send(:queue_bootdisk_compute)
       tasks = @host.queue.all.map(&:name)
       assert_includes tasks, "Generating ISO image for #{@host.name}"
       assert_includes tasks, "Upload ISO image to datastore for #{@host.name}"
       assert_includes tasks, "Attach ISO image to CDROM drive for #{@host.name}"
+      assert_not_includes tasks, "Detach ISO image from CDROM drive for #{@host.name}"
     end
 
-    test 'should rebuild bootdisk' do
-      @host.expects(:bootdisk_generate_iso_image).returns(true)
-      @host.expects(:bootdisk_upload_iso).returns(true)
-      @host.expects(:bootdisk_attach_iso).returns(true)
-      assert @host.rebuild_with_bootdisk
+    test 'rebuilding a host with provision method bootdisk should queue bootdisk tasks' do
+      @host.stubs(:compute?).returns(true)
+      old = stub()
+      old.stubs(:build?).returns(false)
+      @host.stubs(:old).returns(old)
+      @host.stubs(:build?).returns(true)
+      @host.send(:queue_bootdisk_compute)
+      tasks = @host.queue.all.map(&:name)
+      assert_includes tasks, "Generating ISO image for #{@host.name}"
+      assert_includes tasks, "Upload ISO image to datastore for #{@host.name}"
+      assert_includes tasks, "Attach ISO image to CDROM drive for #{@host.name}"
+      assert_not_includes tasks, "Detach ISO image from CDROM drive for #{@host.name}"
     end
 
-    test 'should skip rebuild bootdisk' do
-      host = FactoryBot.build(:host,
-                              compute_resource: @cr)
-      host.expects(:bootdisk_generate_iso_image).never
-      host.expects(:bootdisk_upload_iso).never
-      host.expects(:bootdisk_attach_iso).never
-      assert host.rebuild_with_bootdisk
+    test 'the iso should be detached when the host leaves build mode' do
+      @host.stubs(:compute?).returns(true)
+      old = stub()
+      old.stubs(:build?).returns(true)
+      @host.stubs(:old).returns(old)
+      @host.stubs(:build?).returns(false)
+      @host.send(:queue_bootdisk_compute)
+      tasks = @host.queue.all.map(&:name)
+      assert_not_includes tasks, "Generating ISO image for #{@host.name}"
+      assert_not_includes tasks, "Upload ISO image to datastore for #{@host.name}"
+      assert_not_includes tasks, "Attach ISO image to CDROM drive for #{@host.name}"
+      assert_includes tasks, "Detach ISO image from CDROM drive for #{@host.name}"
     end
   end
 end

data/test/unit/foreman_bootdisk/renderer_test.rb

@@ -21,7 +21,7 @@ module ForemanBootdisk
 
       test 'does not include a host token' do
         rendered_template = renderer.generic_template_render
-        assert_includes rendered_template, 'http://foreman.some.host.fqdn/unattended/iPXE?mac=${net0/mac}'
+        assert_includes rendered_template, 'http://smart-proxy.example.com/unattended/iPXE?mac=${net0/mac}'
         assert_not_includes rendered_template, 'token'
       end
     end

data/test/unit/iso_generator_test.rb

@@ -11,10 +11,12 @@ module ForemanBootdisk
       let(:medium) { FactoryBot.create(:medium, name: 'Red Hat Enterprise Linux Atomic Mirror') }
       let(:operatingsystem) { FactoryBot.create(:ubuntu14_10, :with_archs, :with_ptables, media: [medium]) }
       let(:host) { FactoryBot.create(:host, :managed, operatingsystem: operatingsystem, build: true) }
-      let(:template) { FactoryBot.create(:provisioning_template, template: 'Fake kernel line <%= @kernel %> - <%= @initrd %>') }
+      let(:pxelinux_template) { FactoryBot.create(:provisioning_template, template: 'Fake kernel line <%= @kernel %> - <%= @initrd %>') }
+      let(:pxegrub2_template) { FactoryBot.create(:provisioning_template, template: 'Fake kernel line <%= @kernel %> - <%= @initrd %>') }
 
       setup do
-        host.stubs(:provisioning_template).with(kind: :PXELinux).returns(template)
+        host.stubs(:provisioning_template).with(kind: :PXELinux).returns(pxelinux_template)
+        host.stubs(:provisioning_template).with(kind: :PXEGrub2).returns(pxegrub2_template)
       end
 
       test 'fetch handles redirect' do
@@ -40,11 +42,8 @@ module ForemanBootdisk
         )
         initrd_url = urls[:initrd]
 
-        ForemanBootdisk::ISOGenerator.expects(:generate).with({
-                                                                isolinux: "Fake kernel line #{kernel} - #{initrd}",
-                                                                files: { kernel => kernel_url,
-                                                                         initrd => initrd_url }
-                                                              }, anything)
+        ForemanBootdisk::ISOGenerator.expects(:generate)
+                                     .with({ isolinux: "Fake kernel line #{kernel} - #{initrd}", grub: "Fake kernel line /#{kernel} - /#{initrd}", files: { kernel => kernel_url, initrd => initrd_url } }, anything)
 
         ForemanBootdisk::ISOGenerator.generate_full_host(host)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 16.1.0
+  version: 17.0.2
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -88,6 +102,7 @@ files:
 - app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb
 - app/lib/foreman_bootdisk/scope/bootdisk.rb
 - app/lib/foreman_bootdisk/scope/full_host_bootdisk.rb
+- app/lib/foreman_bootdisk/scope/full_host_bootdisk_efi.rb
 - app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb
 - app/models/concerns/foreman_bootdisk/host_ext.rb
 - app/models/concerns/foreman_bootdisk/orchestration/compute.rb
@@ -95,6 +110,7 @@ files:
 - app/services/foreman_bootdisk/iso_generator.rb
 - app/services/foreman_bootdisk/renderer.rb
 - app/views/foreman_bootdisk/disks/help.html.erb
+- app/views/foreman_bootdisk/generic_efi_host.erb
 - app/views/foreman_bootdisk/generic_host.erb
 - app/views/foreman_bootdisk/generic_static_host.erb
 - app/views/foreman_bootdisk/host.erb
@@ -114,6 +130,7 @@ files:
 - lib/foreman_bootdisk/version.rb
 - lib/tasks/bootdisk.rake
 - locale/Makefile
+- locale/action_names.rb
 - locale/ca/LC_MESSAGES/foreman_bootdisk.mo
 - locale/ca/foreman_bootdisk.po
 - locale/de/LC_MESSAGES/foreman_bootdisk.mo