foreman_bootdisk 6.1.0 → 7.0.0

data/locale/zh_TW/foreman_bootdisk.po

@@ -1,32 +1,29 @@
-# foreman_bootdisk
-# 
-# This file is distributed under the same license as foreman_bootdisk.
-# 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_bootdisk package.
+#
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 6.0.0\n"
+"Project-Id-Version: Foreman\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-20 11:19+0000\n"
-"PO-Revision-Date: 2015-02-20 11:24+0000\n"
-"Last-Translator: Dominic Cleal <dominic@cleal.org>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
+"PO-Revision-Date: 2016-03-24 09:54+0000\n"
+"Last-Translator: Lukáš Zapletal\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
+"uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
 "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 templates."
+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 ""
 
-msgid ""
-"All images are usable as either ISOs or as disk images, including being "
-"written to a USB disk with `dd`."
+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 磁碟中。"
+
+msgid "Attach ISO image to CDROM drive for %s"
 msgstr ""
 
 msgid "Back"
@@ -36,40 +33,49 @@ msgid "Boot disk"
 msgstr "開機磁碟"
 
 msgid "Boot disks"
-msgstr ""
+msgstr "開機磁碟"
 
-msgid ""
-"Bootdisk is not supported with safemode rendering, please disable "
-"safemode_render under Adminster>Settings"
-msgstr "開機磁碟不支援 safemode rendering，請在「管理」>「設定」下停用 safemode_render"
+msgid "Bootdisk Based"
+msgstr ""
 
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "請使用 genisoimage 或是 mkisofs 來作為產生 ISO 映像檔的指令"
 
 msgid "Download generic image"
-msgstr ""
+msgstr "下載泛型映像檔"
 
 msgid "Download host image"
+msgstr "下載主機映像檔"
+
+msgid "Download subnet generic image"
 msgstr ""
 
-msgid "Failed to render boot disk template: %s"
-msgstr "轉譯開機磁碟範本失敗：%s"
+msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
+msgstr ""
 
-msgid "Full host '%s' image"
+msgid "Failed to generate ISO image for instance %{name}: %{message}"
 msgstr ""
 
+msgid "Failed to render boot disk template"
+msgstr ""
+
+msgid "Failed to upload ISO image for instance %{name}: %{message}"
+msgstr ""
+
+msgid "Full host '%s' image"
+msgstr "完整的主機 '%s' 映像檔"
+
 msgid "Full host image"
+msgstr "完整的主機映像檔"
+
+msgid "Generating ISO image for %s"
 msgstr ""
 
 msgid "Generic image"
 msgstr "泛型映像檔"
 
-msgid ""
-"Generic images are a reusable disk image that works for any host registered "
-"in Foreman.  It requires a basic DHCP and DNS service to function and "
-"contact the server, but does not require DHCP reservations or static IP "
-"addresses."
-msgstr ""
+msgid "Generic images are a reusable disk image that works for any host registered in Foreman.  It requires a basic DHCP and DNS service to function and contact the server, but does not require DHCP reservations or static IP addresses."
+msgstr "泛型映像檔是個可重複使用的磁碟映像檔，並且可使用於任何向 Foreman 註冊過的主機上。它需要一項基本的 DHCP 和 DNS 服務才能運作和聯絡伺服器，不過並不需要 DHCP 預留或靜態 IP 位址。"
 
 msgid "Help"
 msgstr "協助"
@@ -90,10 +96,10 @@ msgid "Host has no subnet defined"
 msgstr "主機尚未定義子網路"
 
 msgid "Host image"
-msgstr ""
+msgstr "主機映像檔"
 
 msgid "Host is not in build mode, so the template cannot be rendered"
-msgstr ""
+msgstr "主機不在組建模式下，因此無法編寫範本"
 
 msgid "ISO build failed"
 msgstr "建立 ISO 失敗"
@@ -102,13 +108,10 @@ msgid "ISO hybrid conversion failed"
 msgstr "ISO 混合式轉換失敗"
 
 msgid "Installation media files will be cached for full host images"
-msgstr ""
+msgstr "安裝媒介檔案將會被快取以作為完整的主機映像檔"
 
-msgid ""
-"Once chainloaded, the OS bootloader and installer are downloaded directly "
-"from the installation media configured in Foreman, and the provisioning "
-"script (kickstart/preseed) is downloaded from Foreman."
-msgstr ""
+msgid "Once chainloaded, the OS bootloader and installer are downloaded directly from the installation media configured in Foreman, and the provisioning script (kickstart/preseed) is downloaded from Foreman."
+msgstr "在 chainload 之後，OS 開機載入程式和安裝程式將會直接從 Foreman 中所配置的安裝媒介下載，而佈建 script（kickstart/preseed）則會由 Foreman 下載。"
 
 msgid "Path to directory containing iPXE images"
 msgstr "包含 iPXE 映像檔的目錄之路徑"
@@ -116,19 +119,16 @@ msgstr "包含 iPXE 映像檔的目錄之路徑"
 msgid "Path to directory containing syslinux images"
 msgstr "包含 syslinux 映像檔的目錄之路徑"
 
-msgid ""
-"Per-host images contain data about a particular host registered in Foreman "
-"and set up fully static networking, avoiding the requirement for DHCP.  "
-"After networking is configured, they chainload from Foreman, picking up the "
-"current OS configuration and build state from the server."
-msgstr ""
+msgid "Per-host images contain data about a particular host registered in Foreman and set up fully static networking, avoiding the requirement for DHCP.  After networking is configured, they chainload from Foreman, picking up the current OS configuration and build state from the server."
+msgstr "個別主機的映像檔包含了有關於向 Foreman 註冊的特定主機的資料，並且會設置完整靜態的網路，以避免需要使用到 DHCP。在配置了網路後，它們便會由 Foreman 進行 chainload，取得目前的 OS 配置，並由伺服器建立狀態。"
 
 msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
 msgstr "請確認 ipxe-bootimgs 和 syslinux 套件已安裝。"
 
-msgid ""
-"Plugin for Foreman that creates iPXE-based boot disks to provision hosts "
-"without the need for PXE infrastructure."
+msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
+msgstr "能建立基於 iPXE 的開機磁碟的 Foreman 外掛程式，以在不需要 PXE 設備的情況下佈建主機。"
+
+msgid "Subnet '%s' generic image"
 msgstr ""
 
 msgid "Subnet (%s) has no gateway defined"
@@ -137,28 +137,42 @@ msgstr "子網路（%s）尚未定義閘道器"
 msgid "Subnet (%s) has no primary DNS server defined"
 msgstr "子網路（%s）尚未定義主 DNS 伺服器"
 
-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."
+msgid "Subnet boot disks"
 msgstr ""
 
-msgid "True for full, false for basic reusable image"
+msgid "Subnet image"
+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 ""
+
+msgid "Subnet is not assigned to the host %s"
+msgstr ""
+
+msgid "TFTP feature not enabled for subnet %s"
+msgstr ""
+
+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 ""
 
+msgid "True for full, false for basic reusable image"
+msgstr "「true」代表完整，「false」則代表可重複使用的基本映像檔"
+
 msgid "Unable to find template specified by %s setting"
 msgstr "找不到 %s 設定所指定的範本"
 
 msgid "Unable to generate disk template: %s"
-msgstr ""
+msgstr "無法產生磁碟範本：%s"
 
-msgid ""
-"Various types of boot disks can be created to provision hosts without the "
-"need for PXE services.  Boot disks can be attached to the host (physical or "
-"virtual) which boots from the disk, contacts Foreman and begins the OS "
-"installation."
+msgid "Upload ISO image to datastore for %s"
 msgstr ""
 
+msgid "Various types of boot disks can be created to provision hosts without the need for PXE services.  Boot disks can be attached to the host (physical or virtual) which boots from the disk, contacts Foreman and begins the OS installation."
+msgstr "您可建立各種不同類型的開機磁碟來在不使用 PXE 服務的情況下佈建主機。開機磁碟能連接至由磁碟開機的主機（實體或虛擬），聯絡 Foreman 並開始進行 OS 的安裝程序。"
+
 msgid "iPXE template to use for generic host boot disks"
 msgstr "使用來作為泛型主機開機磁碟的 iPXE 範本"
 

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

@@ -0,0 +1,76 @@
+require 'test_plugin_helper'
+
+class ForemanBootdisk::VmwareTest < ActiveSupport::TestCase
+  describe "#create_vm" do
+    setup do
+      @cr = FactoryGirl.build(:vmware_cr)
+      @cr.stubs(:test_connection)
+    end
+
+    test "does not call clone_vm when bootdisk provisioning" do
+      args = { "provision_method" => "bootdisk" }
+      mock_vm = mock('vm')
+      mock_vm.expects(:save).returns(mock_vm)
+      @cr.stubs(:parse_networks).returns(args)
+      @cr.expects(:clone_vm).times(0)
+      @cr.expects(:new_vm).returns(mock_vm)
+      @cr.create_vm(args)
+    end
+  end
+
+  describe "#new_vm" do
+    setup do
+      @cr = FactoryGirl.build(:vmware_cr)
+    end
+
+    test "calls client with cdrom drive and correct boot order when bootdisk provisioning" do
+      args = { "provision_method" => "bootdisk" }
+      mock_client = mock('client')
+      mock_servers = mock('servers')
+      mock_cdrom = mock('cdrom')
+      mock_client.expects(:servers).returns(mock_servers)
+      mock_servers.expects(:new).with() do |args|
+        assert_equal args[:boot_order], ['cdrom', 'disk']
+        assert_includes args[:cdroms], mock_cdrom
+      end
+      @cr.expects(:new_cdrom).returns(mock_cdrom)
+      @cr.expects(:new_interface)
+      @cr.expects(:new_volume)
+      @cr.expects(:datacenter)
+      @cr.expects(:client).returns(mock_client)
+      @cr.new_vm(args)
+    end
+  end
+
+  describe "#parse_args" do
+    setup do
+      @cr = FactoryGirl.build(:vmware_cr)
+    end
+
+    test "should add a cdrom drive while keeping other parameters when provision_method is bootdisk" do
+      mock_cdrom = mock('cdrom')
+      @cr.expects(:new_cdrom).returns(mock_cdrom)
+      attrs_in = HashWithIndifferentAccess.new(
+        'cpus' => '1',
+        :provision_method => 'bootdisk',
+      )
+      attrs_out = {
+        :cpus => '1',
+        :provision_method => 'bootdisk',
+        :cdroms => [mock_cdrom],
+        :boot_order => ['cdrom', 'disk'],
+      }
+      assert_equal attrs_out, @cr.parse_args(attrs_in)
+    end
+  end
+
+  describe "#capabilities" do
+    setup do
+      @cr = FactoryGirl.build(:vmware_cr)
+    end
+
+    test "should include bootdisk" do
+      assert_includes @cr.capabilities, :bootdisk
+    end
+  end
+end

data/test/unit/concerns/host_test.rb

@@ -0,0 +1,43 @@
+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.provision_method = 'bootdisk'
+    assert host.bootdisk_build?
+    refute host.image_build?
+    refute host.pxe_build?
+  end
+
+  test "#validate_media? must be true when provision_method is bootdisk" do
+    host = FactoryGirl.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 = FactoryGirl.build(:host, :managed,
+                             :provision_method => "bootdisk"
+                             )
+    assert host.can_be_built?
+  end
+
+
+  test "host should have bootdisk" do
+    if unattended?
+      h = FactoryGirl.build(:host, :managed,
+                            :provision_method => "bootdisk"
+                           )
+      assert h.bootdisk?
+    end
+  end
+
+  test "host should not have bootdisk" do
+    if unattended?
+      h = FactoryGirl.create(:host)
+      assert_equal false, h.bootdisk?
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+require 'test_plugin_helper'
+
+class ForemanBootdisk::OrchestrationComputeTest < ActiveSupport::TestCase
+  setup do
+    disable_orchestration
+    @cr = FactoryGirl.build(:vmware_cr)
+    @host = FactoryGirl.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 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 "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 = FactoryGirl.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-04-06 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.
@@ -24,18 +24,22 @@ files:
 - CHANGES.md
 - LICENSE
 - README.md
+- app/assets/javascripts/foreman_bootdisk/host_edit.js
 - app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb
 - app/controllers/foreman_bootdisk/api/v2/disks_controller.rb
 - app/controllers/foreman_bootdisk/api/v2/subnet_disks_controller.rb
 - app/controllers/foreman_bootdisk/disks_controller.rb
 - app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.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
 - app/models/setting/bootdisk.rb
 - 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_host.erb
 - app/views/foreman_bootdisk/host.erb
+- app/views/hosts/provision_method/bootdisk/_form.html.erb
 - config/routes.rb
 - config/routes/mount_engine.rb
 - db/migrate/20130914211030_create_host_bootdisk_template.rb
@@ -85,6 +89,9 @@ files:
 - test/functional/foreman_bootdisk/api/v2/subnet_disks_controller_test.rb
 - test/functional/foreman_bootdisk/disks_controller_test.rb
 - test/test_plugin_helper.rb
+- test/unit/concerns/compute_resources/vmware_test.rb
+- test/unit/concerns/host_test.rb
+- test/unit/concerns/orchestration/compute_test.rb
 homepage: http://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3