foreman_discovery 11.0.0 → 12.0.0

data/locale/zh_TW/foreman_discovery.po

@@ -44,9 +44,6 @@ msgstr ""
 msgid "Auto Provision"
 msgstr "自動佈建"
 
-msgid "Auto Provision All"
-msgstr "自動佈建全部"
-
 msgid "Auto provisioning"
 msgstr ""
 
@@ -74,6 +71,9 @@ msgstr ""
 msgid "Clean all reported facts during provisioning (except discovery facts)"
 msgstr ""
 
+msgid "Collapse All"
+msgstr ""
+
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "無法由協定 %{url} 取得詳細資料：%{error}"
 
@@ -95,6 +95,9 @@ msgstr ""
 msgid "DHCP filename option (Grub2 or PXELinux by default)"
 msgstr ""
 
+msgid "Delete"
+msgstr ""
+
 msgid "Delete %s?"
 msgstr "刪除 %s？"
 
@@ -104,9 +107,6 @@ msgstr "刪除發現的主機"
 msgid "Delete a rule"
 msgstr "刪除規則"
 
-msgid "Delete hosts"
-msgstr "刪除主機"
-
 msgid "Delete rule '%s'?"
 msgstr ""
 
@@ -125,6 +125,9 @@ msgstr ""
 msgid "Discovered Hosts"
 msgstr ""
 
+msgid "Discovered host '%{host}' has all NICs filtered out, filter: %{filter}"
+msgstr ""
+
 msgid "Discovered host: %s"
 msgstr "發現的主機：%s"
 
@@ -155,6 +158,9 @@ msgstr ""
 msgid "Discovery Rules"
 msgstr "搜尋規則"
 
+msgid "Discovery fact parser does not work with non-discovery host '%{host}'"
+msgstr ""
+
 msgid "Discovery location"
 msgstr ""
 
@@ -188,11 +194,14 @@ msgstr ""
 msgid "Disks size"
 msgstr "磁碟大小"
 
+msgid "Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"
+msgstr ""
+
 msgid "Domain will be appended automatically. A hostname based on MAC address will be used when left blank."
 msgstr ""
 
-msgid "Edit Discovery Rule"
-msgstr "編輯搜尋規則"
+msgid "Edit %s"
+msgstr ""
 
 msgid "Enable"
 msgstr "啟用"
@@ -200,6 +209,9 @@ msgstr "啟用"
 msgid "Enable rule '%s'?"
 msgstr ""
 
+msgid "Error on existing NIC"
+msgstr ""
+
 msgid "Errors during auto provisioning: %s"
 msgstr "進行自動佈建時發生了錯誤：%s"
 
@@ -212,9 +224,6 @@ msgstr "針對於一部發現的主機執行規則"
 msgid "Execute rules against all currently discovered hosts"
 msgstr "針對於所有目前已發現的主機執行規則"
 
-msgid "Expand All"
-msgstr "全部展開"
-
 msgid "Expected discovery_fact '%s' is missing, unable to detect primary interface and set hostname"
 msgstr "沒有預期的 discovery_fact '%s'，無法偵測主介面並設定主機名稱"
 
@@ -507,9 +516,6 @@ msgstr "佈建一部已發現的主機"
 msgid "Reboot"
 msgstr "重新開機"
 
-msgid "Reboot All"
-msgstr "全部重新開機"
-
 msgid "Rebooting %s"
 msgstr "重新啟動 %s"
 
@@ -642,15 +648,12 @@ msgstr "種類"
 msgid "UUID to track orchestration tasks status, GET /api/orchestration/:UUID/tasks"
 msgstr "用來追蹤協調流程任務狀態的 UUID，GET /api/orchestration/:UUID/tasks"
 
-msgid "Unable to assign subnet, primary interface is missing IP address"
-msgstr "無法指定子網路，主介面沒有 IP 位址"
-
-msgid "Unable to detect primary interface using MAC '%{mac}' specified by discovery_fact '%{fact}'"
-msgstr "無法偵測使用 MAC '%{mac}' 的主介面，由 discovery_fact '%{fact}' 所指定"
-
 msgid "Unable to find a discovery rule, no host provided (check permissions)"
 msgstr "找不到探索規則，未提供主機（檢查權限）"
 
+msgid "Unable to find primary NIC with %{mac} specified via '%{fact}', NIC filter: %{filter}"
+msgstr ""
+
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "無法透過 %{url} 在 %{name} 上執行 kexec：%{msg}"
 
@@ -693,6 +696,9 @@ msgstr "已選取項目。反選以清除"
 msgid "location ID for provisioned hosts"
 msgstr ""
 
+msgid "must be present."
+msgstr ""
+
 msgid "must start with a letter or ERB."
 msgstr "必須以字母或是 ERB 作為起始。"
 

data/test/functional/api/v2/discovered_hosts_controller_test.rb

@@ -1,6 +1,8 @@
 require 'test_plugin_helper'
 
 class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
+  include FactImporterIsolation
+  allow_transactions_for_any_importer
 
   def switch_controller(klass)
     old_controller = @controller

data/test/functional/api/v2/discovery_rules_controller_test.rb

@@ -31,20 +31,32 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal "Location 1", discovery_rule['locations'].first['name']
   end
 
+  test_attributes :pid => '121e0a30-8a24-47d7-974d-998886ed1ea7'
   test "should create discovery rule with taxonomy" do
+    hostgroup = FactoryBot.create(:hostgroup, :with_os, :with_rootpass, :organizations => [organization_one], :locations => [location_one])
+    valid_attributes = {
+      :name => "foo",
+      :search => "bar",
+      :hostgroup_id => hostgroup.id,
+      :organization_ids => [organization_one.id],
+      :location_ids => [location_one.id],
+      :hostname => "",
+      :priority => 1
+    }
     assert_difference('DiscoveryRule.unscoped.count') do
-      hostgroup = FactoryBot.create(:hostgroup, :with_os, :with_rootpass, :organizations => [organization_one], :locations => [location_one])
-      post :create, params: {:discovery_rule => {
-        :name => "foo",
-        :search => "bar",
-        :hostgroup_id => hostgroup.id,
-        :organization_ids => [organization_one.id],
-        :location_ids => [location_one.id],
-        :hostname => "",
-        :priority => 1}}
+      post :create, params: { :discovery_rule => valid_attributes }
       refute_match /error/, response.body
     end
     assert_response :success
+    response = JSON.parse(@response.body)
+    assert %w[id name hostgroup_id search].all? { |needed_key| response.key?(needed_key) }
+    assert_equal valid_attributes[:name], response['name']
+    assert_equal valid_attributes[:hostgroup_id], response['hostgroup_id']
+    assert_equal valid_attributes[:search], response['search']
+    discovery_rule = DiscoveryRule.unscoped.find(response['id'])
+    refute discovery_rule.nil?
+    assert_equal organization_one.id, discovery_rule.organizations.first.id
+    assert_equal location_one.id, discovery_rule.locations.first.id
   end
 
   test "should update discovery rule" do
@@ -53,17 +65,92 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test_attributes :pid => '769c0739-538b-4451-af7b-deb2ecd3dc0d'
+  test "should update discovery rule name" do
+    rule = FactoryBot.create(:discovery_rule)
+    new_name = 'new_rule_name'
+    put :update, params: { :id => rule.to_param, :discovery_rule => { :name => new_name } }
+    assert_response :success
+    rule.reload
+    assert_equal new_name, rule.name
+  end
+
   test "should update taxonomy for discovery rule" do
     rule = FactoryBot.create(:discovery_rule)
     put :update, params: { :id => rule.to_param, :discovery_rule => { :organization_ids => [rule.organizations.first.id] } }
     assert_response :success
   end
 
+  test_attributes :pid => '0f8ec302-f9de-4713-87b7-0f1aca515149'
+  test "should update taxonomies for discovery rule" do
+    min_required_attr = { :name => 'new_rule', :search => 'CPU_Count = 1', :hostgroup_id => hostgroups(:unusual).id }
+    rule = DiscoveryRule.new(min_required_attr)
+    assert rule.save
+    assert rule.organizations.empty?
+    assert rule.locations.empty?
+    hostgroup = FactoryBot.create(:hostgroup, :with_os, :with_rootpass, :organizations => [organization_one], :locations => [location_one])
+    put :update, params: { :id => rule.to_param, :discovery_rule => {
+      :organization_ids => [organization_one.id],
+      :location_ids => [location_one.id],
+      :hostgroup_id => hostgroup.id
+    }}
+    assert_response :success
+    rule.reload
+    assert_equal [organization_one.id], rule.organizations.map {|org| org.id}
+    assert_equal [location_one.id], rule.locations.map {|loc| loc.id}
+  end
+
+  test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
+  test "should update search rule" do
+    rule = FactoryBot.create(:discovery_rule)
+    new_search = 'Location = Default_Location'
+    put :update, params: { :id => rule.to_param, :discovery_rule => { :search => new_search } }
+    assert_response :success
+    rule.reload
+    assert_equal new_search, rule.search
+  end
+
+  test_attributes :pid => '33084060-2866-46b9-bfab-23d91aea73d8'
+  test "should update host limit" do
+    rule = FactoryBot.create(:discovery_rule)
+    new_max_count = 150
+    assert_not_equal new_max_count, rule.max_count
+    put :update, params: { :id => rule.to_param, :discovery_rule => { :max_count => new_max_count } }
+    assert_response :success
+    rule.reload
+    assert_equal new_max_count, rule.max_count
+  end
+
+  test_attributes :pid => '330aa943-167b-46dd-b434-1a6e5fe8f283'
+  test "test_positive_disable" do
+    rule = FactoryBot.create(:discovery_rule)
+    assert rule.enabled
+    put :update, params: { :id => rule.to_param, :discovery_rule => { :enabled => false } }
+    assert_response :success
+    rule.reload
+    refute rule.enabled
+  end
+
+  test_attributes :pid => '9fdba953-dcc7-4532-9204-17a45b0d9e05'
   test "should destroy discovery rule" do
     rule = FactoryBot.create(:discovery_rule)
     assert_difference('DiscoveryRule.unscoped.count', -1) do
       delete :destroy, params: { :id => rule.to_param }
     end
     assert_response :success
+    refute DiscoveryRule.unscoped.exists?(rule.id)
+  end
+
+  test_attributes :pid => '415379b7-0134-40b9-adb1-2fe0adb1ac36'
+  test "should not create with too long name" do
+    assert_difference('DiscoveryRule.unscoped.count', 0) do
+      post :create, params: {:discovery_rule => {
+        :name => RFauxFactory.gen_alpha(256),
+        :search => 'CPU_Count = 1',
+        :hostgroup_id => hostgroups(:unusual).id
+      }}
+    end
+    assert_response :unprocessable_entity
+    assert_include @response.body, 'Name is too long (maximum is 255 characters)'
   end
 end

data/test/functional/api/v2/settings_controller_test.rb

@@ -0,0 +1,22 @@
+require 'test_plugin_helper'
+
+class Api::V2::SettingsControllerTest < ActionController::TestCase
+  setup do
+    FactoryBot.create(:setting, :name => 'discovery_prefix', :value => 'mac', :category => 'Setting::Discovered')
+  end
+
+  test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
+  test "should update hostname prefix without value" do
+    setting = Setting.find_by_name("discovery_prefix")
+    put :update, params: { :id => setting.id, :setting => { :value => '' } }
+    assert_equal JSON.parse(@response.body)['value'], '', "Can't update discovery_prefix setting with empty value"
+  end
+
+  test_attributes :pid => '4969994d-f934-4f0e-9a98-476b87eb0527'
+  test "should update hostname prefix" do
+    value = RFauxFactory.gen_alpha
+    setting = Setting.find_by_name("discovery_prefix")
+    put :update, params: { :id => setting.id, :setting => { :value => value } }
+    assert_equal JSON.parse(@response.body)['value'], value, "Can't update discovery_prefix setting with valid value #{value}"
+  end
+end

data/test/functional/discovered_hosts_controller_test.rb

@@ -103,7 +103,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
       assert managed_host.build
       assert_redirected_to host_url(managed_host)
       assert_equal hostgroup.id, managed_host.hostgroup_id
-      assert_match /Successfully/, flash[:notice]
+      assert_match(/Successfully/, flash[:success])
     end
   end
 
@@ -178,7 +178,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     post :reboot, params: { :id => host.id }, session: set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
     assert_nil flash[:error]
-    assert_equal "Rebooting host #{host.name}", flash[:notice]
+    assert_equal "Rebooting host #{host.name}", flash[:success]
   end
 
   def test_reboot_failure
@@ -208,7 +208,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     post :auto_provision, params: { :id => host.id }, session: set_session_user(User.current)
     assert_response :redirect
     assert_nil flash[:error]
-    assert_match(/^Host macaabbccddeeff.* was provisioned/, flash[:notice])
+    assert_match(/^Host macaabbccddeeff.* was provisioned/, flash[:success])
     managed_host = Host.find(host.id)
     assert managed_host.build
   end
@@ -220,10 +220,10 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     post :auto_provision, params: { :id => host.id }, session: set_session_user(User.current)
     assert_response :redirect
     assert_nil flash[:error]
-    assert_equal "No rule found for host macaabbccddeeff", flash[:notice]
+    assert_equal "No rule found for host macaabbccddeeff", flash[:success]
   end
 
-  def test_auto_provision_all_success
+  def test_multiple_auto_provision_success
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
@@ -235,13 +235,13 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
       :hostgroup => hostgroup,
       :organizations => [host.organization], :locations => [host.location]
     )
-    post :auto_provision_all, params: {}, session: set_session_user(User.current)
+    post :submit_multiple_auto_provision, params: {:host_ids => host.id}, session: set_session_user(User.current)
     assert_response :redirect
     assert_nil flash[:error]
-    assert_equal "Discovered hosts are provisioning now", flash[:notice]
+    assert_equal "Discovered hosts are provisioning now", flash[:success]
   end
 
-  def test_auto_provision_all_no_rule_success
+  def test_multiple_auto_provision_no_rule_success
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
     host = discover_host_from_facts(facts)
@@ -253,41 +253,40 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
       :hostgroup => hostgroup,
       :organizations => [host.organization], :locations => [host.location]
     )
-    post :auto_provision_all, params: {}, session: set_session_user(User.current)
+    post :submit_multiple_auto_provision, params: {:host_ids => host.id}, session: set_session_user(User.current)
     assert_response :redirect
     assert_nil flash[:error]
-    assert_equal "Discovered hosts are provisioning now", flash[:notice]
+    assert_equal "Discovered hosts are provisioning now", flash[:success]
   end
 
-  def test_reboot_all_success
+  def test_multiple_reboot_success
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(true)
-    post :reboot, params: { :id => host.id }, session: set_session_user_default_manager
+    post :submit_multiple_reboot, params: {:host_ids => host.id}, session: set_session_user(User.current)
     assert_redirected_to discovered_hosts_url
-    assert_equal "Rebooting host #{host.name}", flash[:notice]
     assert_nil flash[:error]
-    assert_equal "Rebooting host macaabbccddeeff", flash[:notice]
+    assert_equal "Discovered hosts are rebooting now", flash[:success]
   end
 
-  def test_reboot_all_failure
+  def test_multiple_reboot_failure
     @request.env["HTTP_REFERER"] = discovered_hosts_url
     host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).returns(false)
-    post :reboot_all, params: { }, session: set_session_user_default_manager
+    post :submit_multiple_reboot, params: {:host_ids => host.id}, session: set_session_user(User.current)
     assert_redirected_to discovered_hosts_url
     assert_equal "Errors during reboot: #{host.name}: failed to reboot", flash[:error]
-    assert_nil flash[:notice]
+    assert_nil flash[:success]
   end
 
-  def test_reboot_all_error
+  def test_multiple_reboot_error
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    discover_host_from_facts(@facts)
+    host = discover_host_from_facts(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
-    post :reboot_all, params: { }, session: set_session_user_default_manager
+    post :submit_multiple_reboot, params: {:host_ids => host.id}, session: set_session_user(User.current)
     assert_redirected_to discovered_hosts_url
     assert_match(/ERF50-4973/, flash[:error])
-    assert_nil flash[:notice]
+    assert_nil flash[:success]
   end
 
   def test_no_dns_rebuild_if_dns_pending

data/test/functional/discovery_rules_controller_test.rb

@@ -19,17 +19,18 @@ class DiscoveryRulesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  test "should create discovery rule without taxonomy" do
-    assert_difference('DiscoveryRule.unscoped.count') do
+  test "should not create discovery rule without taxonomy" do
+    assert_difference('DiscoveryRule.unscoped.count', 0) do
+      DiscoveryRule.any_instance.stubs(:set_current_taxonomy).returns(true)
       post :create, params: {:discovery_rule => {
         :name => "foo",
         :search => "cpu_count = 42",
         :hostgroup_id => 1,
         :hostname => "",
         :priority => 1}}, session: set_session_user_default_manager
-      assert_empty(extract_form_errors(response))
+      assert_not_empty(extract_form_errors(response))
     end
-    assert_redirected_to discovery_rules_path
+    assert_template :new
   end
 
   test "should create discovery rule with taxonomy" do

data/test/integration/discovered_hosts_test.rb

@@ -5,8 +5,6 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
   let(:discovered_host) { FactoryBot.create(:discovered_host, :with_facts) }
   let(:discovered_hosts) { Host::Discovered.all }
 
-  extend Minitest::OptionalRetry
-
   setup do
     assert discovered_notification_blueprint
     discovered_host.save!
@@ -17,20 +15,28 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
     Host::Discovered.destroy_all
   end
 
-  describe 'Reboot all' do
+  describe 'Multiple host Reboot' do
     test 'triggers reboot on all discovered_hosts' do
       Host::Discovered.any_instance
                       .expects(:reboot)
                       .at_least(discovered_hosts.count)
-      select_all_hosts
-      page.find_link('Reboot All').click
+      select_host_checkbox(discovered_host.id)
+      page.find_link('Select Action').click
+      page.find_link('Reboot').click
+      wait_for_ajax
+      assert page.has_text?('The following hosts are about to be changed')
+      page.find_button('Submit').click
     end
   end
 
-  describe 'Autoprovision all' do
+  describe 'Multiple host Autoprovision' do
     test 'converts all discovered to managed hosts' do
-      select_all_hosts
-      page.find_link('Auto Provision All').click
+      select_host_checkbox(discovered_host.id)
+      page.find_link('Select Action').click
+      page.find_link('Auto Provision').click
+      wait_for_ajax
+      assert page.has_text?('The following hosts are about to be changed')
+      page.find_button('Submit').click
       wait_for_ajax
       assert page.has_text?('Discovered hosts are provisioning now')
     end
@@ -38,9 +44,9 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
 
   describe 'Delete hosts' do
     test 'it removes all hosts' do
-      select_all_hosts
+      select_host_checkbox(discovered_host.id)
       page.find_link('Select Action').click
-      page.find_link('Delete hosts').click
+      page.find_link('Delete').click
       wait_for_ajax
       assert page.has_text?('The following hosts are about to be changed')
       page.find_button('Submit').click
@@ -137,6 +143,10 @@ class DiscoveredHostsTest < IntegrationTestWithJavascript
     page.find('#check_all').click
   end
 
+  def select_host_checkbox(id)
+    page.find("#host_ids_#{id}").click
+  end
+
   def select_from(element_id, id)
     page.find_by_id(element_id, visible: false)
         .find("option[value='#{id}']", visible: false)