foreman_discovery 23.0.0 → 24.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06b773090a573270dd6c59f3f3ea9236a4a92aee4097904c7306b4190b71870
-  data.tar.gz: 6aeb520a8f222918d58459f5afa95430ac490f3bde6066eafc030f550ea39109
+  metadata.gz: 76f3192238fe98894488060d699286e6dd1a0baf5288aeb121688d8109064868
+  data.tar.gz: d8367489d3500b8c5339fab630f4a88cacf0ba04c4be60964747b8b2f47246a7
 SHA512:
-  metadata.gz: 02a2a1a166d4412c82aaeadd5d1b8e200776d5680e97baccda80ffbc07f7013b84a44a512dcc4c77921dfc85e4c33c56f039213d58a05f81eaca9fad8687540e
-  data.tar.gz: a2c342f5b8dfe0b74fd3694d2fe58b7ea64b68835d08d731c33cea5007c39a4b237e374fd725307c6e40af6074f78f3b4b29d118a5a8f7cc6e084c5ac7cc073f
+  metadata.gz: c1f64acaf2b19c689d5d11f7a9ce557a7f2d7ec1cf612bcd5bc710b303764289507c9e80d9b2541102203d0a125cb37f091ed843db58a1d9ddfd0357f7846a68
+  data.tar.gz: 4de514ded1d66d77b69a4510b26db4c74f549262c52266abedbf7ec573435409e689a23b86beacdcc550bfd0041561454d2fcc00afd9644b00a0a0150d54ac23

data/README.md

@@ -26,11 +26,11 @@ instead of github.com issues. Please report issues there.
 
 There are unit and integration tests in the repository, to run them execute the following in the *Foreman core* directory:
 
-	bundle exec rake test:discovery
+	bundle exec rake test:foreman_discovery
 
 It is possible to execute a single test, however the path must be *absolute* (e.g. use `$HOME` variable):
 
-	bundle exec rake test:discovery TEST=~/work/foreman_discovery/test/unit/host_discovered_test.rb
+	bundle exec rake test:foreman_discovery TEST=~/work/foreman_discovery/test/unit/host_discovered_test.rb
 
 # Copyright
 

data/app/controllers/api/v2/discovered_hosts_controller.rb

@@ -218,7 +218,7 @@ module Api
                            :message => error_message
                        }
         else
-          process_success _("Discovered hosts are rebooting now")
+          process_success :success_msg => _("Discovered hosts are rebooting now")
         end
       end
 

data/app/controllers/discovered_hosts_controller.rb

@@ -83,7 +83,8 @@ class DiscoveredHostsController < ::ApplicationController
       ::ForemanDiscovery::HostConverter.set_build_clean_facts(host)
       ::ForemanDiscovery::HostConverter.unused_ip_for_host(host)
       if host.save
-        success_options = { :success_redirect => host_path(host), :redirect_xhr => request.xhr? }
+        host_path = Setting['host_details_ui'] ? host_details_page_path(host) : host_path(host)
+        success_options = { :success_redirect => host_path, :redirect_xhr => request.xhr? }
         success_options[:success_msg] = success_message if success_message
         process_success success_options
       else

data/app/views/discovered_hosts/welcome.html.erb

@@ -1,10 +1,3 @@
-<% content_for(:javascripts) do %>
-  <%= webpacked_plugins_js_for :'foreman_discovery' %>
-<% end %>
-<% content_for(:stylesheets) do %>
-  <%= webpacked_plugins_css_for :'foreman_discovery' %>
-<% end %>
-
 <% content_for(:title, _("Discovered Hosts")) %>
 
 <% content_for(:content) do %>

data/app/views/discovery_rules/welcome.html.erb

@@ -1,10 +1,3 @@
-<% content_for(:javascripts) do %>
-  <%= webpacked_plugins_js_for :'foreman_discovery' %>
-<% end %>
-<% content_for(:stylesheets) do %>
-  <%= webpacked_plugins_css_for :'foreman_discovery' %>
-<% end %>
-
 <% content_for(:title, _("Discovered Rules")) %>
 
 <% content_for(:content) do %>

data/lib/foreman_discovery/engine.rb

@@ -30,7 +30,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 3.8'
+        requires_foreman '>= 3.10'
         register_gettext
 
         # settings
@@ -75,11 +75,10 @@ module ForemanDiscovery
             setting "discovery_hostname",
               type: :array,
               default: ["discovery_bootif"],
+              validate: { presence: true },
               full_name: N_("Hostname facts"),
               description: N_("List of facts to use for the hostname (first wins)")
 
-            validates "discovery_hostname", presence: true
-
             setting "discovery_auto",
               type: :boolean,
               default: false,
@@ -95,11 +94,10 @@ module ForemanDiscovery
             setting "discovery_prefix",
               type: :string,
               default: "mac",
+              validate: { presence: true },
               full_name: N_("Hostname prefix"),
               description: N_("The default prefix to use for the host name, must start with a letter")
 
-            validates "discovery_prefix", presence: true
-
             setting "discovery_fact_column",
               type: :array,
               default: [],
@@ -367,7 +365,7 @@ module ForemanDiscovery
     end
 
     rake_tasks do
-      load "discovery.rake"
+      load "foreman_discovery.rake"
       Rake::Task['db:seed'].enhance do
         ForemanDiscovery::Engine.load_seed
       end

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "23.0.0"
+  VERSION = "24.0.0"
 end

data/lib/{discovery.rake → foreman_discovery.rake}

@@ -1,7 +1,7 @@
 # Setup Tests
 namespace :test do
   desc "Test Discovery plugin"
-  Rake::TestTask.new(:discovery) do |t|
+  Rake::TestTask.new(:foreman_discovery) do |t|
     test_dir = File.join(File.dirname(__FILE__), '..', 'test')
     t.libs << ["test",test_dir]
     if ENV['FILE'] || ENV['TEST']
@@ -14,12 +14,13 @@ namespace :test do
   end
 end
 Rake::Task[:test].enhance do
-  Rake::Task['test:discovery'].invoke
+  Rake::Task['test:foreman_discovery'].invoke
 end
 
 load 'tasks/jenkins.rake'
 if Rake::Task.task_defined?(:'jenkins:unit')
-  Rake::Task["jenkins:unit"].enhance do
-    Rake::Task['test:discovery'].invoke
+  # The "unit" tests also include system tests
+  Rake::Task["jenkins:unit"].enhance(['webpack:compile']) do
+    Rake::Task['test:foreman_discovery'].invoke
   end
 end

data/test/functional/discovered_hosts_controller_test.rb

@@ -101,7 +101,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
     managed_host = Host.find(host.id)
     assert managed_host.build
-    assert_redirected_to host_url(managed_host)
+    assert_redirected_to host_details_page_path(managed_host)
     assert_equal hostgroup.id, managed_host.hostgroup_id
     assert_match(/Successfully/, flash[:success])
   end

data/test/functional/discovery_rules_controller_test.rb

@@ -3,12 +3,6 @@ require_relative '../test_plugin_helper'
 class DiscoveryRulesControllerTest < ActionController::TestCase
   setup :initialize_host
 
-  test "should add a link to navigation" do
-    get :index, params: {}, session: set_session_user
-    assert_response :success
-    assert response.body =~ /\/discovery_rules/
-  end
-
   test "reader role should get index" do
     get :index, params: {}, session: set_session_user_default_reader
     assert_response :success

data/test/integration/menu_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class ManagedExtensionsTest < ActiveSupport::TestCase
+  def test_discovery_rules_is_in_menu
+    menu = UserMenu.new.generate
+    assert_includes(menu, { name: 'Discovery Rules', url: '/discovery_rules' })
+  end
+end

data/test/unit/host_discovered_test.rb

@@ -271,7 +271,8 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     @facts["productname"] = "Dishwasher DW400"
     host2 = discover_host_from_facts(@facts)
     assert_equal 'mace41f13cc3658', host2.name
-    assert_equal 'Dishwasher DW400', host2.facts["productname"]
+    # Bypass fact cache by using it as a method
+    assert_equal 'Dishwasher DW400', host2.facts('productname')['productname']
     assert_equal '10.35.27.2', host2.ip
     assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 23.0.0
+  version: 24.0.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -76,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -213,7 +213,7 @@ files:
 - db/seeds.d/90_add_permissions_from_default_roles.rb
 - extra/discover-host
 - extra/generate-authors-file
-- lib/discovery.rake
+- lib/foreman_discovery.rake
 - lib/foreman_discovery.rb
 - lib/foreman_discovery/engine.rb
 - lib/foreman_discovery/version.rb
@@ -295,6 +295,7 @@ files:
 - test/functional/discovery_rules_controller_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
 - test/integration/discovered_hosts_test.rb
+- test/integration/menu_test.rb
 - test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb
 - test/migrations/20221102075151_migrate_discovery_hostname_and_fact_column_to_array_test.rb.orig
 - test/static_fixtures/redhat_kexec.erb
@@ -380,6 +381,7 @@ test_files:
 - test/functional/discovered_hosts_controller_test.rb
 - test/functional/discovery_rules_controller_test.rb
 - test/integration/discovered_hosts_test.rb
+- test/integration/menu_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
 - test/unit/discovered_mailer_test.rb