foreman_bootdisk 9.0.0 → 10.0.0

data/locale/zh_TW/foreman_bootdisk.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-03-24 09:54+0000\n"
+"PO-Revision-Date: 2017-09-20 00:09+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "A variant of the per-host image which contains the OS bootloader embedded inside the disk.  This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or PXELinux templates."
-msgstr ""
+msgstr "個別主機映像檔的變體，磁碟中嵌入了 OS 的開機載入程式。這對於在特定硬體上的 chainloading 失敗時特別有幫助，不過缺點就是若要對 OS、開機載入程式或 PXELinux 範本進行任何更改，映像檔就必須重新產生。"
 
 msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
 msgstr "所有映像檔皆能作為 ISO 或是磁碟映像檔使用，包括以 `dd` 寫入一個 USB 磁碟中。"
@@ -35,6 +35,9 @@ msgstr "開機磁碟"
 msgid "Boot disk based"
 msgstr ""
 
+msgid "Boot disk download not available for %s architecture"
+msgstr ""
+
 msgid "Boot disk embedded template"
 msgstr ""
 
@@ -51,7 +54,7 @@ msgid "Download host image"
 msgstr "下載主機映像檔"
 
 msgid "Download subnet generic image"
-msgstr ""
+msgstr "下載子網路泛型映像檔"
 
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
 msgstr ""
@@ -60,7 +63,7 @@ msgid "Failed to generate ISO image for instance %{name}: %{message}"
 msgstr ""
 
 msgid "Failed to render boot disk template"
-msgstr ""
+msgstr "轉譯開機磁碟範本失敗"
 
 msgid "Failed to upload ISO image for instance %{name}: %{message}"
 msgstr ""
@@ -96,7 +99,7 @@ msgid "Host has no domain defined"
 msgstr "主機尚未定義區域"
 
 msgid "Host has no provisioning interface defined"
-msgstr ""
+msgstr "主機沒有網路卡"
 
 msgid "Host has no subnet defined"
 msgstr "主機尚未定義子網路"
@@ -156,7 +159,7 @@ msgid "SYSLINUX directory"
 msgstr ""
 
 msgid "Subnet '%s' generic image"
-msgstr ""
+msgstr "子網路「%s」泛型映像檔"
 
 msgid "Subnet (%s) has no gateway defined"
 msgstr "子網路（%s）尚未定義閘道器"
@@ -165,25 +168,25 @@ msgid "Subnet (%s) has no primary DNS server defined"
 msgstr "子網路（%s）尚未定義主 DNS 伺服器"
 
 msgid "Subnet boot disks"
-msgstr ""
+msgstr "子網路開機磁碟"
 
 msgid "Subnet image"
-msgstr ""
+msgstr "子網路映像檔"
 
 msgid "Subnet images are similar to generic images, but chain-loading is done via the TFTP Smart Proxy assigned to the Subnet of the host. The smart proxy must have the \"Templates\" module enabled and configured."
-msgstr ""
+msgstr "子網路映像檔跟泛型映像檔類似，但連鎖載入（chain-loading）是透過 TFTP 智慧型代理指定至主機的子網路。智慧型代理必須啟用並配置了「模版」（Templates）模組。"
 
 msgid "Subnet is not assigned to the host %s"
-msgstr ""
+msgstr "子網路並未指定給主機 %s"
 
 msgid "TFTP feature not enabled for subnet %s"
-msgstr ""
+msgstr "TFTP 功能並未啟動給子網路 %s 使用"
 
 msgid "The OS install continues using the installation media configured in Foreman, and it will typically configure static networking, depending on how the OS iPXE template is configured."
 msgstr "OS 安裝程序會繼續使用配置於 Foreman 中的安裝媒介，並且它一般會根據 OS iPXE 範本的配置方法來配置靜態網路。"
 
 msgid "This image is generic for all hosts with a provisioning NIC on that subnet."
-msgstr ""
+msgstr "這映像檔對在該子網路上配有網路卡的所有主機來說，是通用的。"
 
 msgid "True for full, false for basic reusable image"
 msgstr "「true」代表完整，「false」則代表可重複使用的基本映像檔"

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

@@ -6,7 +6,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
 
   test "should generate generic image" do
     ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk generic host template/))).yields("temp ISO")
-    File.expects(:read).with("temp ISO").returns("ISO image")
+    @controller.expects(:read_file).with("temp ISO").returns("ISO image")
     get :generic, {}
     assert_response :success
     assert_equal "ISO image", @response.body
@@ -18,7 +18,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
 
     test "should generate host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk host template/))).yields("temp ISO")
-      File.expects(:read).with("temp ISO").returns("ISO image")
+      @controller.expects(:read_file).with("temp ISO").returns("ISO image")
       get :host, {:id => @host.name}
       assert_response :success
       assert_equal "ISO image", @response.body
@@ -26,7 +26,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
 
     test "should generate full host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate_full_host).with(@host).yields("temp ISO")
-      File.expects(:read).with("temp ISO").returns("ISO image")
+      @controller.expects(:read_file).with("temp ISO").returns("ISO image")
       get :host, {:id => @host.name, :full => true}
       assert_response :success
       assert_equal "ISO image", @response.body
@@ -37,7 +37,12 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
     setup :setup_host_env
 
     test "path - /api/hosts/:host_id routes to #host" do
-      assert_routing "/api/hosts/#{@host.id}",
+      if Rails::VERSION::MAJOR >= 5
+        expected_path = "/api/v2/hosts/#{@host.id}"
+      else
+        expected_path = "/api/hosts/#{@host.id}"
+      end
+      assert_routing expected_path,
                      :format     => "json",
                      :apiv       => "v2",
                      :controller => "foreman_bootdisk/api/v2/disks",

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -6,7 +6,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
 
   test "should generate generic image" do
     ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk generic host template/))).yields("temp ISO")
-    File.expects(:read).with("temp ISO").returns("ISO image")
+    @controller.expects(:read_file).with("temp ISO").returns("ISO image")
     get :generic, {}, set_session_user
     assert_response :success
     assert_equal "ISO image", @response.body
@@ -20,7 +20,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
 
     test "should generate host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk host template/))).yields("temp ISO")
-      File.expects(:read).with("temp ISO").returns("ISO image")
+      @controller.expects(:read_file).with("temp ISO").returns("ISO image")
       get :host, {:id => @host.name}, set_session_user
       assert_response :success
       assert_equal "ISO image", @response.body
@@ -28,7 +28,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
 
     test "should generate full host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate_full_host).with(@host).yields("temp ISO")
-      File.expects(:read).with("temp ISO").returns("ISO image")
+      @controller.expects(:read_file).with("temp ISO").returns("ISO image")
       get :full_host, {:id => @host.name}, set_session_user
       assert_response :success
       assert_equal "ISO image", @response.body
@@ -37,7 +37,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     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")
-      File.expects(:read).with("temp ISO").returns("ISO image")
+      @controller.expects(:read_file).with("temp ISO").returns("ISO image")
       get :subnet, {:id => @host.name}, set_session_user
       assert_empty flash[:error]
       assert_response :success

data/test/test_plugin_helper.rb

@@ -31,19 +31,20 @@ module ForemanBootdiskTestHelper
 
   def setup_org_loc
     disable_orchestration
-    @org, @loc = FactoryGirl.create(:organization), FactoryGirl.create(:location)
+    @org, @loc = FactoryBot.create(:organization), FactoryBot.create(:location)
   end
 
   def setup_subnet
-    @subnet = FactoryGirl.create(:subnet_ipv4, :tftp, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8', :organizations => [@org], :locations => [@loc])
+    tftp_proxy = FactoryBot.create(:smart_proxy, :features => [FactoryBot.create(:tftp_feature)])
+    setup_subnet_no_tftp.update! :tftp => tftp_proxy
   end
 
   def setup_subnet_no_tftp
-    @subnet = FactoryGirl.create(:subnet_ipv4, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8', :organizations => [@org], :locations => [@loc])
+    @subnet = FactoryBot.create(:subnet_ipv4, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8', :organizations => [@org], :locations => [@loc])
   end
 
   def setup_host
-    @host = FactoryGirl.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)
   end
 
 end

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

@@ -3,7 +3,7 @@ require 'test_plugin_helper'
 class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
   describe "#create_vm" do
     setup do
-      @cr = FactoryGirl.build(:vmware_cr)
+      @cr = FactoryBot.build(:vmware_cr)
       @cr.stubs(:test_connection)
     end
 
@@ -21,7 +21,7 @@ class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
 
   describe "#new_vm" do
     setup do
-      @cr = FactoryGirl.build(:vmware_cr)
+      @cr = FactoryBot.build(:vmware_cr)
     end
 
     test "calls client with cdrom drive and correct boot order when bootdisk provisioning" do
@@ -32,6 +32,7 @@ class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
       mock_client.expects(:servers).returns(mock_servers)
       mock_servers.expects(:new).with() do |args|
         assert_equal args[:boot_order], ['cdrom', 'disk']
+        assert_equal args[:boot_retry], 10
         assert_includes args[:cdroms], mock_cdrom
       end
       @cr.expects(:new_cdrom).returns(mock_cdrom)
@@ -45,7 +46,7 @@ class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
 
   describe "#parse_args" do
     setup do
-      @cr = FactoryGirl.build(:vmware_cr)
+      @cr = FactoryBot.build(:vmware_cr)
     end
 
     test "should add a cdrom drive while keeping other parameters when provision_method is bootdisk" do
@@ -60,6 +61,7 @@ class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
         :provision_method => 'bootdisk',
         :cdroms => [mock_cdrom],
         :boot_order => ['cdrom', 'disk'],
+        :boot_retry => 10
       }
       assert_equal attrs_out, @cr.parse_args(attrs_in)
     end
@@ -67,7 +69,7 @@ class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
 
   describe "#capabilities" do
     setup do
-      @cr = FactoryGirl.build(:vmware_cr)
+      @cr = FactoryBot.build(:vmware_cr)
     end
 
     test "should include bootdisk" do

data/test/unit/concerns/host_test.rb

@@ -2,7 +2,7 @@ require 'test_plugin_helper'
 
 class ForemanBootdisk::HostTest < ActiveSupport::TestCase
   test "#bootdisk_build? must be true when provision_method is bootdisk" do
-    host = FactoryGirl.build(:host, :managed)
+    host = FactoryBot.build(:host, :managed)
     host.provision_method = 'bootdisk'
     assert host.bootdisk_build?
     refute host.image_build?
@@ -10,7 +10,7 @@ class ForemanBootdisk::HostTest < ActiveSupport::TestCase
   end
 
   test "#validate_media? must be true when provision_method is bootdisk" do
-    host = FactoryGirl.build(:host, :managed,
+    host = FactoryBot.build(:host, :managed,
                              :provision_method => "bootdisk",
                              :build => true,
                              )
@@ -18,7 +18,7 @@ class ForemanBootdisk::HostTest < ActiveSupport::TestCase
   end
 
   test "#can_be_built? must be true when provision_method is bootdisk" do
-    host = FactoryGirl.build(:host, :managed,
+    host = FactoryBot.build(:host, :managed,
                              :provision_method => "bootdisk"
                              )
     assert host.can_be_built?
@@ -27,7 +27,7 @@ class ForemanBootdisk::HostTest < ActiveSupport::TestCase
 
   test "host should have bootdisk" do
     if unattended?
-      h = FactoryGirl.build(:host, :managed,
+      h = FactoryBot.build(:host, :managed,
                             :provision_method => "bootdisk"
                            )
       assert h.bootdisk?
@@ -36,7 +36,7 @@ class ForemanBootdisk::HostTest < ActiveSupport::TestCase
 
   test "host should not have bootdisk" do
     if unattended?
-      h = FactoryGirl.create(:host)
+      h = FactoryBot.create(:host)
       assert_equal false, h.bootdisk?
     end
   end
@@ -44,29 +44,29 @@ class ForemanBootdisk::HostTest < ActiveSupport::TestCase
   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)
+      host = FactoryBot.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)
+      architecture = FactoryBot.create(:architecture, :name => 'i386')
+      host = FactoryBot.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)
+      host = FactoryBot.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)
+      host = FactoryBot.build(:host, :managed, :architecture => nil)
 
-      assert_equal host.architecture, nil
+      assert_nil host.architecture
       assert host.bootdisk_downloadable?
     end
   end

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

@@ -3,8 +3,8 @@ require 'test_plugin_helper'
 class ForemanBootdisk::OrchestrationComputeTest < ActiveSupport::TestCase
   setup do
     disable_orchestration
-    @cr = FactoryGirl.build(:vmware_cr)
-    @host = FactoryGirl.build(:host, :managed,
+    @cr = FactoryBot.build(:vmware_cr)
+    @host = FactoryBot.build(:host, :managed,
                              :compute_resource => @cr,
                              :provision_method => "bootdisk",
                              )
@@ -37,7 +37,7 @@ class ForemanBootdisk::OrchestrationComputeTest < ActiveSupport::TestCase
   end
 
   test "should skip rebuild bootdisk" do
-    host = FactoryGirl.build(:host,
+    host = FactoryBot.build(:host,
                              :compute_resource => @cr
                              )
     host.expects(:bootdisk_generate_iso_image).never

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 10.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-12-05 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.
@@ -49,6 +49,7 @@ files:
 - db/migrate/20130915201457_create_generic_host_bootdisk_template.rb
 - db/migrate/20131021095100_edit_host_bootdisk_template_dns_secondary.rb
 - db/migrate/20140522185700_change_templatekind_to_bootdisk.rb
+- db/migrate/20171009225200_remove_duplicate_bootdisk_templates.rb
 - db/seeds.d/50-bootdisk_templates.rb
 - lib/foreman_bootdisk.rb
 - lib/foreman_bootdisk/engine.rb
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman