foreman_bootdisk 13.0.0 → 14.0.0

data/test/unit/concerns/host_test.rb

@@ -1,73 +1,73 @@
-require 'test_plugin_helper'
+# frozen_string_literal: true
 
-class ForemanBootdisk::HostTest < ActiveSupport::TestCase
-  test "#bootdisk_build? must be true when provision_method is bootdisk" do
-    host = FactoryBot.build(:host, :managed)
-    host.provision_method = 'bootdisk'
-    assert host.bootdisk_build?
-    refute host.image_build?
-    refute host.pxe_build?
-  end
+require 'test_plugin_helper'
 
-  test "#validate_media? must be true when provision_method is bootdisk" do
-    host = FactoryBot.build(:host, :managed,
-                             :provision_method => "bootdisk",
-                             :build => true,
-                             )
-    assert host.validate_media?
-  end
+module ForemanBootdisk
+  class HostTest < ActiveSupport::TestCase
+    test '#bootdisk_build? must be true when provision_method is bootdisk' do
+      host = FactoryBot.build(:host, :managed)
+      host.provision_method = 'bootdisk'
+      assert host.bootdisk_build?
+      assert_not host.image_build?
+      assert_not host.pxe_build?
+    end
 
-  test "#can_be_built? must be true when provision_method is bootdisk" do
-    host = FactoryBot.build(:host, :managed,
-                             :provision_method => "bootdisk"
-                             )
-    assert host.can_be_built?
-  end
+    test '#validate_media? must be true when provision_method is bootdisk' do
+      host = FactoryBot.build(:host, :managed,
+                              provision_method: 'bootdisk',
+                              build: true)
+      assert host.validate_media?
+    end
 
+    test '#can_be_built? must be true when provision_method is bootdisk' do
+      host = FactoryBot.build(:host, :managed,
+                              provision_method: 'bootdisk')
+      assert host.can_be_built?
+    end
 
-  test "host should have bootdisk" do
-    if unattended?
-      h = FactoryBot.build(:host, :managed,
-                            :provision_method => "bootdisk"
-                           )
-      assert h.bootdisk?
+    test 'host should have bootdisk' do
+      if unattended?
+        h = FactoryBot.build(:host, :managed,
+                             provision_method: 'bootdisk')
+        assert h.bootdisk?
+      end
     end
-  end
 
-  test "host should not have bootdisk" do
-    if unattended?
-      h = FactoryBot.create(:host)
-      assert_equal false, h.bootdisk?
+    test 'host should not have bootdisk' do
+      if unattended?
+        h = FactoryBot.create(:host)
+        assert_equal false, h.bootdisk?
+      end
     end
-  end
 
-  context "#bootdisk_downloadable?" do
-    test "should be true for 64 bit architecture" do
-      architecture = Architecture.where(:name => 'x86_64').first
-      host = FactoryBot.build(:host, :managed, :architecture => architecture)
+    context '#bootdisk_downloadable?' do
+      test 'should be true for 64 bit architecture' do
+        architecture = Architecture.where(name: 'x86_64').first
+        host = FactoryBot.build(:host, :managed, architecture: architecture)
 
-      assert host.bootdisk_downloadable?
-    end
+        assert host.bootdisk_downloadable?
+      end
 
-    test "should be true for 32 bit architecture" do
-      architecture = FactoryBot.create(:architecture, :name => 'i386')
-      host = FactoryBot.build(:host, :managed, :architecture => architecture)
+      test 'should be true for 32 bit architecture' do
+        architecture = FactoryBot.create(:architecture, name: 'i386')
+        host = FactoryBot.build(:host, :managed, architecture: architecture)
 
-      assert host.bootdisk_downloadable?
-    end
+        assert host.bootdisk_downloadable?
+      end
 
-    test "should be false for non-intel architecture" do
-      architecture = Architecture.where(:name => 's390').first
-      host = FactoryBot.build(:host, :managed, :architecture => architecture)
+      test 'should be false for non-intel architecture' do
+        architecture = Architecture.where(name: 's390').first
+        host = FactoryBot.build(:host, :managed, architecture: architecture)
 
-      assert_not host.bootdisk_downloadable?
-    end
+        assert_not host.bootdisk_downloadable?
+      end
 
-    test 'should be true if architecture is absent' do
-      host = FactoryBot.build(:host, :managed, :architecture => nil)
+      test 'should be true if architecture is absent' do
+        host = FactoryBot.build(:host, :managed, architecture: nil)
 
-      assert_nil host.architecture
-      assert host.bootdisk_downloadable?
+        assert_nil host.architecture
+        assert host.bootdisk_downloadable?
+      end
     end
   end
 end

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

@@ -1,48 +1,50 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
-class ForemanBootdisk::OrchestrationComputeTest < ActiveSupport::TestCase
-  setup do
-    disable_orchestration
-    @cr = FactoryBot.build(:vmware_cr)
-    @host = FactoryBot.build(:host, :managed,
-                             :compute_resource => @cr,
-                             :provision_method => "bootdisk",
-                             )
-  end
+module ForemanBootdisk
+  class OrchestrationComputeTest < ActiveSupport::TestCase
+    setup do
+      disable_orchestration
+      @cr = FactoryBot.build(:vmware_cr)
+      @host = FactoryBot.build(:host, :managed,
+                               compute_resource: @cr,
+                               provision_method: 'bootdisk')
+    end
 
-  test "provisioning a host with provision method bootdisk should upload iso" do
-    @cr.expects(:iso_upload)
-    @host.send(:setIsoImage)
-  end
+    test 'provisioning a host with provision method bootdisk should upload iso' do
+      @cr.expects(:iso_upload)
+      @host.send(:setIsoImage)
+    end
 
-  test "provisioning a host with provision method bootdisk should attach iso" do
-    @cr.expects(:iso_attach)
-    @host.send(:setAttachIsoImage)
-  end
+    test 'provisioning a host with provision method bootdisk should attach iso' do
+      @cr.expects(:iso_attach)
+      @host.send(:setAttachIsoImage)
+    end
 
-  test "provisioning a host with provision method bootdisk should queue bootdisk tasks" do
-    @host.stubs(:compute?).returns(true)
-    @host.send(:queue_bootdisk_compute)
-    tasks = @host.queue.all.map { |t| t.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}"
-  end
+    test 'provisioning a host with provision method bootdisk should queue bootdisk tasks' do
+      @host.stubs(:compute?).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}"
+    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
-  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
+    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 '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
+    end
   end
 end

data/test/unit/foreman_bootdisk/renderer_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanBootdisk
@@ -20,7 +22,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}'
-        refute_includes rendered_template, 'token'
+        assert_not_includes rendered_template, 'token'
       end
     end
 

data/test/unit/foreman_bootdisk/scope/bootdisk_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
 module ForemanBootdisk
@@ -13,7 +15,7 @@ module ForemanBootdisk
         end
 
         test 'should render bootdisk chain url with custom mac' do
-          assert_equal "http://foreman.some.host.fqdn/unattended/iPXE?mac=00%3A11%3A22%3A33%3A44%3A55", scope.bootdisk_chain_url('00:11:22:33:44:55')
+          assert_equal 'http://foreman.some.host.fqdn/unattended/iPXE?mac=00%3A11%3A22%3A33%3A44%3A55', scope.bootdisk_chain_url('00:11:22:33:44:55')
         end
       end
 

data/test/unit/foreman_bootdisk/scope/full_host_bootdisk_test.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanBootdisk
+  module Scope
+    class BootdiskTest < ActiveSupport::TestCase
+      let(:operatingsystem) { FactoryBot.create(:ubuntu14_10, :with_media, :with_archs) }
+      let(:host) { FactoryBot.build(:host, :managed, operatingsystem: operatingsystem) }
+      let(:source) { Foreman::Renderer::Source::String.new(content: 'Test') }
+      let(:scope) { ForemanBootdisk::Scope::FullHostBootdisk.new(host: host, source: source) }
+
+      setup do
+        MediumProviders::Default.any_instance.stubs(:unique_id).returns('MyMedium01-ZYHBD6OPET')
+      end
+
+      describe '@kernel' do
+        test 'should match filename on bootdisk' do
+          assert_equal 'BOOT/MYMEDIUM01_ZYHBD6OPET_LINUX', scope.instance_variable_get('@kernel')
+        end
+      end
+
+      describe '@initrd' do
+        test 'should match filename on bootdisk' do
+          assert_equal 'BOOT/EDIUM01_ZYHBD6OPET_INITRD_GZ', scope.instance_variable_get('@initrd')
+        end
+      end
+    end
+  end
+end

data/test/unit/iso_generator_test.rb

@@ -1,48 +1,65 @@
+# frozen_string_literal: true
+
 require 'test_plugin_helper'
 
-class ForemanBootdisk::IsoGeneratorTest < ActiveSupport::TestCase
-  include ForemanBootdiskTestHelper
-  setup :setup_bootdisk
-  setup :setup_org_loc
-  setup :setup_subnet
-  setup :setup_host
+module ForemanBootdisk
+  class IsoGeneratorTest < ActiveSupport::TestCase
+    include ForemanBootdiskTestHelper
+    setup :setup_bootdisk
 
-  setup do
-    @host.build = true
-  end
+    describe '#generate_full_host' do
+      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 %>') }
 
-  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
+      setup do
+        host.expects(:provisioning_template).with(kind: :PXELinux).returns(template)
+      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 'generate_full_host creates with ISO-compatible file names' do
+        urls = host.operatingsystem.boot_file_sources(host.medium_provider)
+
+        kernel = ForemanBootdisk::ISOGenerator.iso9660_filename(
+          host.operatingsystem.kernel(host.medium_provider)
+        )
+        kernel_url = urls[:kernel]
+
+        initrd = ForemanBootdisk::ISOGenerator.iso9660_filename(
+          host.operatingsystem.initrd(host.medium_provider)
+        )
+        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.generate_full_host(host)
+      end
+    end
+
+    describe '#generate' do
+      test 'generates an iso image' do
+        ForemanBootdisk::ISOGenerator.expects(:system).with(
+          regexp_matches(/genisoimage -o .*output.iso -iso-level 2 -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table .*build/)
+        ).returns(true)
+        ForemanBootdisk::ISOGenerator.expects(:system).with('isohybrid', anything).returns(true)
+        ForemanBootdisk::ISOGenerator.generate do |iso|
+          assert_not_nil iso
+        end
+      end
+    end
+
+    describe '#iso9660_filename' do
+      test 'converts path to iso9660' do
+        assert_equal 'BOOT/SOME_FILE_N_A_M_E123_', ForemanBootdisk::ISOGenerator.iso9660_filename('boot/some-File-n_a_m_e123Ä')
+      end
 
-  test "full host image generation generates via PXELinux type" do
-    @host.expects(:generate_pxe_template).with(:PXELinux).returns("Template")
-    @host.operatingsystem.expects(:pxe_files).returns([])
-    ForemanBootdisk::ISOGenerator.expects(:generate).with({:isolinux => "Template", :files => []}, anything)
-    ForemanBootdisk::ISOGenerator.generate_full_host(@host)
+      test 'shortens long filenames' do
+        assert_equal 'BOOT/RPRISELINUXATOMIC_7_3_X86_64', ForemanBootdisk::ISOGenerator.iso9660_filename('boot/RedHatEnterpriseLinuxAtomic-7.3-x86_64')
+      end
+    end
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 14.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
-dependencies: []
+date: 2018-11-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
 description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
   without the need for PXE infrastructure.
 email: dcleal@redhat.com
@@ -30,6 +44,7 @@ files:
 - app/controllers/foreman_bootdisk/disks_controller.rb
 - 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/models/concerns/foreman_bootdisk/compute_resources/vmware.rb
 - app/models/concerns/foreman_bootdisk/host_ext.rb
 - app/models/concerns/foreman_bootdisk/orchestration/compute.rb
@@ -97,6 +112,7 @@ files:
 - test/unit/concerns/orchestration/compute_test.rb
 - test/unit/foreman_bootdisk/renderer_test.rb
 - test/unit/foreman_bootdisk/scope/bootdisk_test.rb
+- test/unit/foreman_bootdisk/scope/full_host_bootdisk_test.rb
 - test/unit/iso_generator_test.rb
 homepage: http://github.com/theforeman/foreman_bootdisk
 licenses: