foreman_discovery 21.0.3 → 22.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f46a7cb5e8d9844eab1344f89727588ea50ac3a4b4132b9f57b31c59890654f4
-  data.tar.gz: 616421f009b108959eb3620b962a34ae1272cf0aaeee05969b531cbe9c23062d
+  metadata.gz: 88ecd56a2e51a5e9f79ad75f9b3214dbd639bd7dccef4fad054b02ed930047ea
+  data.tar.gz: 6ff4fafc798c38ef7097fcef16b777966ba9154ca1f13af52d62b47c2ef6eea5
 SHA512:
-  metadata.gz: c58e346d7b486ac0fe4d0e97abd4253af4f80d5f3bcd1895e9e989a53b75deb41570485c29126f43346714cacdb06dedf4ae7e20eed399132e93c964b92f07dd
-  data.tar.gz: 05353a4e56ddec1d1c2d97c127b8c18d34bc69055404d98893eec32922e43a24bbfcee5ba5f422f4c0252724ccab544b3c50406197eae8d5cb325ab01f4f0bd5
+  metadata.gz: 7d28310f1bc924f34c60cbe5f0998ad567a61b3ef244503a7247204ef6ffd784e241243bb0b3b4e3f86ff2d619d89961469716966e0e9fa4d851a88010eb19e0
+  data.tar.gz: 5194001c735a6edbee4a50fb5fe5eb4e9f18d19a74317c4bd15dae1d32f74a35d49d4136c0acfc9df45e4dc7f12671a15fe60b9bd8efde3aefeca4174ba29bff

data/db/migrate/20221102065954_fix_discovery_settings_category_to_dsl.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class FixDiscoverySettingsCategoryToDsl < ActiveRecord::Migration[6.0]
+  def up
+    # rubocop:disable Rails/SkipsModelValidations
+    Setting.where(category: 'Setting::Discovered').update_all(category: 'Setting')
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+end

data/lib/foreman_discovery/engine.rb

@@ -43,7 +43,7 @@ module ForemanDiscovery
 
     initializer 'foreman_discovery.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_discovery do
-        requires_foreman '>= 3.2'
+        requires_foreman '>= 3.3'
 
         # settings
         settings do
@@ -310,7 +310,7 @@ module ForemanDiscovery
           :edit_discovery_rules,
           :destroy_discovery_rules,
         ]
-        if defined?(ForemanPuppet::VERSION) 
+        if defined?(ForemanPuppet::Engine)
           MANAGER += [ :view_environments, :view_puppetclasses ]
         end
         role "Discovery Reader", READER, "Role granting permissions to view discovered hosts"
@@ -337,8 +337,6 @@ module ForemanDiscovery
         # add dashboard widget
         widget 'discovery_widget', :name=>N_('Discovered Hosts'), :sizex => 6, :sizey =>1
 
-        template_labels 'kexec' => N_('Discovery Kexec template')
-
         # apipie API documentation
         # Only available in 1.8, otherwise it has to be in the initializer below
         apipie_documented_controllers ["#{ForemanDiscovery::Engine.root}/app/controllers/api/v2/*.rb"]

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "21.0.3"
+  VERSION = "22.0.2"
 end

data/test/functional/discovered_hosts_controller_test.rb

@@ -303,6 +303,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     Host::Managed.any_instance.stubs(:queue_puppetca_create).returns(true)
     Host::Managed.any_instance.stubs(:queue_puppetca_certname_reset).returns(true)
     Host::Managed.any_instance.stubs(:queue_puppetca_autosign_destroy).returns(true)
+    ProxyAPI::DNS.any_instance.stubs(:set).returns(true)
     put :update, params: {:commit => "Update", :id => host.id,
                   :host => {
       :name => 'mytest',
@@ -354,6 +355,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   def prepare_hostgroup_for_dns_rebuild(host)
     hostgroup = setup_hostgroup(host)
     hostgroup.domain = FactoryBot.create(:domain, :name => 'myorchdomain.net', :dns => FactoryBot.create(:smart_proxy, :features => [FactoryBot.create(:feature, :dns)]))
+    hostgroup.save
     hostgroup
   end
 end

data/{app/views/foreman_discovery → test/static_fixtures}/redhat_kexec.erb

@@ -1,6 +1,7 @@
 <%#
 kind: kexec
 name: Discovery Red Hat kexec
+model: ProvisioningTemplate
 oses:
 - CentOS 4
 - CentOS 5
@@ -20,11 +21,14 @@ description: |
   environments. The template must generate JSON format with the following items
   "kernel", "initram", "append" and "extra". The kexec command is composed in
   the following way:
-  
+
   kexec --force --debug --append=$append --initrd=$initram $extra $kernel
-  
+
   Please read kexec(8) man page for more information about semantics.
   Extra options like --reset-vga can be set via "extra" array.
+require:
+- plugin: foreman_discovery
+ version: 22.0.0
 -%>
 <%
   mac = @host.facts['discovery_bootif']
@@ -44,13 +48,13 @@ description: |
   extra << "--kexec-file-syscall" if @host.pxe_loader.include?('SecureBoot')
 -%>
 {
-  "kernel": "<%= @kernel_uri %>",
-  "initram": "<%= @initrd_uri %>",
+"kernel": "<%= @kernel_uri %>",
+"initram": "<%= @initrd_uri %>",
 <% if (@host.operatingsystem.name == 'Fedora' and @host.operatingsystem.major.to_i > 16) or
-    (@host.operatingsystem.name != 'Fedora' and @host.operatingsystem.major.to_i >= 7) -%>
+  (@host.operatingsystem.name != 'Fedora' and @host.operatingsystem.major.to_i >= 7) -%>
   "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> inst.ks.sendmac <%= "ip=#{ip}::#{gw}:#{mask}:::none nameserver=#{dns} ksdevice=bootif BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% else -%>
   "append": "inst.ks=<%= foreman_url('provision') + "&static=yes" %> kssendmac nicdelay=5 <%= "ip=#{ip} netmask=#{mask} gateway=#{gw} dns=#{dns} ksdevice=#{mac} BOOTIF=#{bootif} nomodeset nokaslr " + options.compact.join(' ') %>",
 <% end -%>
-  "extra": <%= extra %>
-}
+"extra": <%= extra %>
+}

data/test/unit/host_discovered_test.rb

@@ -293,22 +293,18 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     host1 = FactoryBot.create(:host, :type => "Host::Discovered", :organization => org1)
     host2 = FactoryBot.create(:host, :type => "Host::Discovered", :organization => org2)
     host3 = FactoryBot.create(:host, :type => "Host::Discovered", :organization => org3)
-    hosts = nil
 
     assert_nil Organization.current
-    as_user(user_subset) do
-      hosts = Host::Discovered.all
-    end
-    assert_includes hosts, host1
-    assert_includes hosts, host2
-    refute_includes hosts, host3
 
-    as_user(user_all) do
-      hosts = Host::Discovered.all
-    end
-    assert_includes hosts, host1
-    assert_includes hosts, host2
-    assert_includes hosts, host3
+    hosts = as_user(user_subset) { Host::Discovered.all }.map(&:name)
+    assert_includes hosts, host1.name
+    assert_includes hosts, host2.name
+    refute_includes hosts, host3.name
+
+    hosts = as_user(user_all) { Host::Discovered.all }.map(&:name)
+    assert_includes hosts, host1.name
+    assert_includes hosts, host2.name
+    assert_includes hosts, host3.name
   end
 
   test "provisioning a discovered host without saving it doesn't create a token" do

data/test/unit/managed_extensions_test.rb

@@ -1,4 +1,5 @@
 require_relative '../test_plugin_helper'
+require 'test_helper'
 
 class ManagedExtensionsTest < ActiveSupport::TestCase
   class StubHost < ApplicationRecord
@@ -10,7 +11,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
     end
   end
 
-  let(:kexec_template) { FactoryBot.build(:provisioning_template, :template => File.read(File.expand_path(File.join("..", "..", "..", "app", "views", "foreman_discovery", "redhat_kexec.erb"), __FILE__))) }
+  let(:kexec_template) { FactoryBot.build(:provisioning_template, :template => File.read(File.expand_path(File.join("..", "..", "static_fixtures", "redhat_kexec.erb"), __FILE__))) }
 
   context "stubbed orchestration" do
     setup do

data/webpack/src/ForemanDiscovery/DiscoveredHosts/Components/EmptyState/EmptyState.js

@@ -12,7 +12,7 @@ const EmptyState = props => {
   };
   return (
     <ForemanEmptyState
-      header="Foreman Discovery"
+      header={__('Foreman Discovery')}
       description={description}
       icon="gears"
       iconType="fa"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 21.0.3
+  version: 22.0.2
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -14,7 +14,6 @@ authors:
 - Avi Sharvit
 - Bryan Kearney
 - bshuster
-- ChairmanTubeAmp
 - Daniel Lobato
 - Daniel Lobato Garcia
 - Daniel Lobato García
@@ -27,6 +26,7 @@ authors:
 - Ewoud Kohl van Wijngaarden
 - Frank Wall
 - Greg Sutcliffe
+- ChairmanTubeAmp
 - Ido Kanner
 - imriz
 - Imri Zvik
@@ -48,11 +48,10 @@ authors:
 - Matt Jarvis
 - Michael Moll
 - Nick
-- nofar
 - odovzhenko
 - Ohad Levy
-- Ondřej Ezr
 - Ondrej Prazak
+- Ondřej Ezr
 - Ori Rabin
 - orrabin
 - Partha Aji
@@ -77,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-06 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -167,8 +166,6 @@ files:
 - app/views/discovery_rules/index.html.erb
 - app/views/discovery_rules/new.html.erb
 - app/views/discovery_rules/welcome.html.erb
-- app/views/foreman_discovery/debian_kexec.erb
-- app/views/foreman_discovery/redhat_kexec.erb
 - config/as_deprecation_whitelist.yaml
 - config/initializers/discovery_setup.rb
 - config/routes.rb
@@ -192,7 +189,7 @@ files:
 - db/migrate/20161006094714_add_constraints_on_subnets_smart_proxies.rb
 - db/migrate/20171222120314_add_constraints_on_discovery_rules_hostgroups.rb
 - db/migrate/20180412124505_add_priority_score_to_discovery_rules.rb
-- db/seeds.d/50_discovery_templates.rb
+- db/migrate/20221102065954_fix_discovery_settings_category_to_dsl.rb
 - db/seeds.d/60_discovery_proxy_feature.rb
 - db/seeds.d/70_discovery_mail_notification.rb
 - db/seeds.d/80_discovery_ui_notification.rb
@@ -260,6 +257,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/static_fixtures/redhat_kexec.erb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb
 - test/unit/discovered_extensions_test.rb
@@ -344,7 +342,6 @@ test_files:
 - test/integration/discovered_hosts_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
-- test/unit/discovered_extensions_test.rb
 - test/unit/discovered_mailer_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/discovery_rule_test.rb
@@ -352,7 +349,9 @@ test_files:
 - test/unit/fact_parser_test.rb
 - test/unit/fact_to_category_resolver_test.rb
 - test/unit/lldp_neighbors_test.rb
+- test/unit/discovered_extensions_test.rb
 - test/unit/host_discovered_test.rb
 - test/unit/managed_extensions_test.rb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb
+- test/static_fixtures/redhat_kexec.erb

data/app/views/foreman_discovery/debian_kexec.erb

@@ -1,41 +0,0 @@
-<%#
-kind: kexec
-name: Discovery Debian kexec
-oses:
-- Debian
-- Ubuntu
-description: |
-  This template is used to pass command line options to kexec when reloading
-  kernel on a discovered host instead of rebooting. This is useful in PXE-less
-  environments. The template must generate JSON format with the following items
-  "kernel", "initram", "append" and "extra". The kexec command is composed in
-  the following way:
-  
-  kexec --force --debug --append=$append --initrd=$initram $extra $kernel
-  
-  Please read kexec(8) man page for more information about semantics.
-  Extra options like --reset-vga can be set via "extra" array.
--%>
-<%
-  mac = @host.facts['discovery_bootif']
-  bootif = host_param("hardware_type", "01") + '-' + mac.gsub(':', '-') if mac
-  ip_cidr = @host.facts['discovery_ip_cidr']
-  ip = @host.facts['discovery_ip']
-  mask = @host.facts['discovery_netmask']
-  gw = @host.facts['discovery_gateway']
-  dns = @host.facts['discovery_dns']
-  options = ["nomodeset", "nokaslr", "auto=true"]
-  options << @host.facts['append']
-  options << "domain=#{@host.domain}"
-  options << 'console-setup/ask_detect=false console-setup/layout=USA console-setup/variant=USA keyboard-configuration/layoutcode=us localechooser/translation/warn-light=true localechooser/translation/warn-severe=true'
-  options << "locale=#{host_param('lang') || 'en_US'}"
-  options << "inst.stage2=#{@host.operatingsystem.medium_uri(@host)}" if @host.operatingsystem.name.match(/Atomic/i)
-  extra = []
-  extra << "--kexec-file-syscall" if @host.pxe_loader.include?('SecureBoot')
--%>
-{
-  "kernel": "<%= @kernel_uri %>",
-  "initram": "<%= @initrd_uri %>",
-  "append": "url=<%= foreman_url('provision') + "&static=yes" %> interface=<%= mac %> netcfg/get_ipaddress=<%= ip %> netcfg/get_netmask=<%= mask %> netcfg/get_gateway=<%= gw %> netcfg/get_nameservers=<%= dns %> netcfg/disable_dhcp=true netcfg/get_hostname=<%= @host.name %> BOOTIF=<%= bootif %> <%= options.compact.join(' ') %>",
-  "extra": <%= extra %>
-}

data/db/seeds.d/50_discovery_templates.rb

@@ -1,31 +0,0 @@
-organizations = Organization.unscoped.all
-locations = Location.unscoped.all
-
-kind = TemplateKind.unscoped.find_or_create_by(name: 'kexec')
-kind.description = N_("Command line options for kexec during PXE-less provisioning.")
-kind.save!
-
-ProvisioningTemplate.without_auditing do
-  [['redhat_kexec.erb', 'Red Hat'], ['debian_kexec.erb', 'Debian']].each do |tmpl_names|
-    content = File.read(File.join(ForemanDiscovery::Engine.root, 'app', 'views', 'foreman_discovery', tmpl_names[0]))
-    tmpl = ProvisioningTemplate.unscoped.where(:name => "Discovery #{tmpl_names[1]} kexec").first_or_create(
-      :template_kind_id => kind.id,
-      :snippet => false,
-      :template => content
-    )
-    tmpl.attributes = {
-      :template => content,
-      :default  => true,
-      :vendor   => "Foreman Discovery",
-      :locked   => true
-    }
-    tmpl.template = content
-    tmpl.organizations = organizations
-    tmpl.locations = locations
-
-    metadata = Template.parse_metadata(content)
-    tmpl.description = metadata['description']
-
-    tmpl.save!(:validate => false) if tmpl.changes.present?
-  end
-end