foreman_bootdisk 6.0.0 → 6.1.0

data/locale/zh_TW/foreman_bootdisk.po

@@ -5,12 +5,12 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 4.0.2\n"
+"Project-Id-Version: foreman_bootdisk 6.0.0\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 <dcleal@redhat.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/foreman/language/zh_TW/)\n"
+"Last-Translator: Dominic Cleal <dominic@cleal.org>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

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

@@ -4,7 +4,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
   setup :setup_bootdisk
 
   test "should generate generic image" do
-    ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/generic host template/))).yields("temp ISO")
+    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")
     get :generic, {}
     assert_response :success
@@ -12,10 +12,12 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
   end
 
   describe "#host" do
+    setup :setup_org_loc
+    setup :setup_subnet
     setup :setup_host
 
     test "should generate host image" do
-      ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/host template/))).yields("temp ISO")
+      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")
       get :host, {:id => @host.name}
       assert_response :success

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

@@ -0,0 +1,20 @@
+require 'test_plugin_helper'
+
+class ForemanBootdisk::Api::V2::SubnetDisksControllerTest < ActionController::TestCase
+  setup :setup_bootdisk
+
+  describe "#subnet_host" do
+    setup :setup_org_loc
+    setup :setup_subnet
+    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, {:id => @host.subnet.id}
+      assert_response :success
+      assert_equal "ISO image", @response.body
+    end
+  end
+end

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -4,7 +4,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
   setup :setup_bootdisk
 
   test "should generate generic image" do
-    ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/generic host template/))).yields("temp ISO")
+    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")
     get :generic, {}, set_session_user
     assert_response :success
@@ -12,10 +12,12 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
   end
 
   describe "#host" do
+    setup :setup_org_loc
+    setup :setup_subnet
     setup :setup_host
 
     test "should generate host image" do
-      ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/host template/))).yields("temp ISO")
+      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")
       get :host, {:id => @host.name}, set_session_user
       assert_response :success
@@ -29,6 +31,28 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
       assert_response :success
       assert_equal "ISO image", @response.body
     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")
+      File.expects(:read).with("temp ISO").returns("ISO image")
+      get :subnet, {:id => @host.name}, set_session_user
+      assert_empty flash[:error]
+      assert_response :success
+      assert_equal "ISO image", @response.body
+    end
+  end
+
+  describe "#host without tftp" do
+    setup :setup_org_loc
+    setup :setup_subnet_no_tftp
+    setup :setup_host
+
+    test "should not generate subnet image" do
+      get :subnet, {:id => @host.name}, set_session_user
+      assert_match(/Failed.*: TFTP feature not enabled/, flash[:error])
+      assert_response :redirect
+    end
   end
 
   test "should render help" do

data/test/test_plugin_helper.rb

@@ -19,10 +19,22 @@ class ActionController::TestCase
     load File.join(File.dirname(__FILE__), '..', 'db', 'seeds.d', '50-bootdisk_templates.rb')
   end
 
-  def setup_host
+  def setup_org_loc
     disable_orchestration
-    org, loc = FactoryGirl.create(:organization), FactoryGirl.create(:location)
-    subnet = FactoryGirl.create(:subnet, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8', :organizations => [org], :locations => [loc])
-    @host = FactoryGirl.create(:host, :managed, :subnet => subnet, :ip => subnet.network.sub(/0$/, '4'), :organization => org, :location => loc)
+    request.env["HTTP_REFERER"] = "/history"
+    @org, @loc = FactoryGirl.create(:organization), FactoryGirl.create(:location)
+  end
+
+  def setup_subnet
+    @subnet = FactoryGirl.create(:subnet, :tftp, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8', :organizations => [@org], :locations => [@loc])
+  end
+
+  def setup_subnet_no_tftp
+    @subnet = FactoryGirl.create(:subnet, :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)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2016-01-21 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.
@@ -26,6 +26,7 @@ files:
 - README.md
 - 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/host_ext.rb
@@ -49,6 +50,8 @@ files:
 - lib/foreman_bootdisk/version.rb
 - lib/tasks/bootdisk.rake
 - locale/Makefile
+- locale/ca/LC_MESSAGES/foreman_bootdisk.mo
+- locale/ca/foreman_bootdisk.po
 - locale/de/LC_MESSAGES/foreman_bootdisk.mo
 - locale/de/foreman_bootdisk.po
 - locale/en/LC_MESSAGES/foreman_bootdisk.mo
@@ -79,6 +82,7 @@ files:
 - locale/zh_TW/LC_MESSAGES/foreman_bootdisk.mo
 - locale/zh_TW/foreman_bootdisk.po
 - test/functional/foreman_bootdisk/api/v2/disks_controller_test.rb
+- test/functional/foreman_bootdisk/api/v2/subnet_disks_controller_test.rb
 - test/functional/foreman_bootdisk/disks_controller_test.rb
 - test/test_plugin_helper.rb
 homepage: http://github.com/theforeman/foreman_bootdisk