foreman_discovery 21.0.0 → 21.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96449844722349c5dbde7fe09e0ca06051bf7fa1a7bb87c36de52a103d505611
-  data.tar.gz: cb1bb8e19220de291965b37329d49231b58f40898936cba633be93f6ba5e2009
+  metadata.gz: dbc5abad67ec340bdfe3ed25013bd59afd164c5aa5b71197cf115fca531f07f8
+  data.tar.gz: ba6b00159de292b52754d70bab8a79bbd0b77e29f7cba34e2e6e16ab6a5f05a6
 SHA512:
-  metadata.gz: 5f09bca16062aba8ae5d80ec8a2b9498dbaef24eef21f12702472ae0cce9bc083fa2a8635b968b09eeeba321fe63cfc3193d4fc4376c6cbacba0692f2dc4c9aa
-  data.tar.gz: 80b2978cc54e2790cd4bb17848e92a9831dfac040c47e138b600522a17bb92f8cbd07120af2f3830e107330d057870262a7be5b7b8a2c9cb75a9e84bc7e56f47
+  metadata.gz: c812aab3400e97c3b25523cc6bb7bd118e86a0c6c71383275f442e3c49f71d6a87d6a3f413b9ac5e3b0278d8e8fd7c3cd535bf9dcfc6e2f033433d674f1dcb46
+  data.tar.gz: f8f22a7eecfa7cdb30f22e691b8433983719d8449b71d9330c6fbf8bfe4240359846b701b71456b46d3b5acca469c65062f4ca57d608913d4ca15fcb16b99352

data/app/models/setting/discovered.rb

@@ -1,46 +1,4 @@
-class Setting::Discovered < ::Setting
-  BLANK_ATTRS << "discovery_location"
-  BLANK_ATTRS << "discovery_organization"
-  BLANK_ATTRS << "discovery_fact_column"
-  BLANK_ATTRS << 'discovery_facts_highlights'
-  BLANK_ATTRS << 'discovery_facts_storage'
-  BLANK_ATTRS << 'discovery_facts_software'
-  BLANK_ATTRS << 'discovery_facts_hardware'
-  BLANK_ATTRS << 'discovery_facts_network'
-  BLANK_ATTRS << 'discovery_facts_ipmi'
-
-  STRING_PRESENCE_ATTRS = ['discovery_hostname', 'discovery_prefix']
-  validates :value, :presence => true, :if => proc { |s| STRING_PRESENCE_ATTRS.include?(s.name) }
-
-  def self.default_settings
-    [
-      self.set('discovery_location', N_("The default location to place discovered hosts in"), "", N_("Discovery location"), nil, { :collection => Proc.new {Hash[Location.all.map{|loc| [loc[:title], loc[:title]]}]} }),
-      self.set('discovery_organization', N_("The default organization to place discovered hosts in"), "", N_("Discovery organization"), nil, { :collection => Proc.new {Hash[Organization.all.map{|org| [org[:title], org[:title]]}]} }),
-      self.set('discovery_fact', N_("Fact name to use for primary interface detection"), "discovery_bootif", N_("Interface fact")),
-      self.set('discovery_auto_bond', N_("Automatic bond interface (if another interface is detected on the same VLAN via LLDP)"), false, N_("Create bond interfaces")),
-      self.set('discovery_clean_facts', N_("Clean all reported facts during provisioning (except discovery facts)"), false, N_("Clean all facts")),
-      self.set('discovery_hostname', N_("List of facts to use for the hostname (separated by comma, first wins)"), "discovery_bootif", N_("Hostname facts")),
-      self.set('discovery_auto', N_("Automatically provision newly discovered hosts, according to the provisioning rules"), false, N_("Auto provisioning")),
-      self.set('discovery_reboot', N_("Automatically reboot or kexec discovered host during provisioning"), true, N_("Reboot")),
-      self.set('discovery_prefix', N_("The default prefix to use for the host name, must start with a letter"), "mac", N_("Hostname prefix")),
-      self.set('discovery_fact_column', N_("Extra facter columns to show in host lists (separate by comma)"), "", N_("Fact columns")),
-      self.set('discovery_facts_highlights', N_("Regex to organize facts for highlights section - e.g. ^(abc|cde)$"), "", N_("Highlighted facts")),
-      self.set('discovery_facts_storage', N_("Regex to organize facts for storage section"), "", N_("Storage facts")),
-      self.set('discovery_facts_software', N_("Regex to organize facts for software section"), "", N_("Software facts")),
-      self.set('discovery_facts_hardware', N_("Regex to organize facts for hardware section"), "", N_("Hardware facts")),
-      self.set('discovery_facts_network', N_("Regex to organize facts for network section"), "", N_("Network facts")),
-      self.set('discovery_facts_ipmi', N_("Regex to organize facts for ipmi section"), "", N_("IPMI facts")),
-      self.set('discovery_lock', N_("Automatically generate PXE configuration to pin a newly discovered host to discovery"), false, N_("Lock PXE")),
-      self.set('discovery_pxelinux_lock_template', N_("PXELinux template to be used when pinning a host to discovery"), 'pxelinux_discovery', N_("Locked PXELinux template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
-      self.set('discovery_pxegrub_lock_template', N_("PXEGrub template to be used when pinning a host to discovery"), 'pxegrub_discovery', N_("Locked PXEGrub template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
-      self.set('discovery_pxegrub2_lock_template', N_("PXEGrub2 template to be used when pinning a host to discovery"), 'pxegrub2_discovery', N_("Locked PXEGrub2 template name"), nil, { :collection => Proc.new {Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]} }),
-      self.set('discovery_always_rebuild_dns', N_("Force DNS entries creation when provisioning discovered host"), true, N_("Force DNS")),
-      self.set('discovery_error_on_existing', N_("Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)"), false, N_("Error on existing NIC")),
-      self.set('discovery_naming', N_("Discovery hostname naming pattern"), 'Fact', N_("Type of name generator"), nil, {:collection => Proc.new {::Host::Discovered::NAMING_PATTERNS} }),
-      self.set('discovery_prefer_ipv6', N_("Prefer IPv6 to IPv4 when calling discovered nodes"), false, N_("Prefer IPv6")),
-    ]
-  end
-
+class Setting::Discovered
   def self.discovery_fact_column_array
     from_array(Setting['discovery_fact_column'])
   end

data/app/views/foreman_discovery/debian_kexec.erb

@@ -4,18 +4,17 @@ name: Discovery Debian kexec
 oses:
 - Debian
 - Ubuntu
--%>
-<%#
-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.
+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']

data/app/views/foreman_discovery/redhat_kexec.erb

@@ -14,18 +14,17 @@ oses:
 - RedHat 5
 - RedHat 6
 - RedHat 7
--%>
-<%#
-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.
+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']

data/lib/foreman_discovery/engine.rb

@@ -45,38 +45,201 @@ module ForemanDiscovery
       Foreman::Plugin.register :foreman_discovery do
         requires_foreman '>= 3.2'
 
-        # discovered hosts permissions
-        security_block :discovery do
-          permission :view_discovered_hosts, {
-            :discovered_hosts          => [:index, :show, :auto_complete_search, :welcome],
-            :"api/v2/discovered_hosts" => [:index, :show],
-            :'discovered_hosts/react' => [:index]
-          }, :resource_type => 'Host'
-          permission :submit_discovered_hosts, {
-            :"api/v2/discovered_hosts" => [:facts, :create]
-          }, :resource_type => 'Host'
-          permission :auto_provision_discovered_hosts, {
-            :discovered_hosts          => [:auto_provision,
-                                           :multiple_auto_provision,
-                                           :submit_multiple_auto_provision],
-            :"api/v2/discovered_hosts" => [:auto_provision, :auto_provision_all]
-          }, :resource_type => 'Host'
-          permission :provision_discovered_hosts, {
-            :discovered_hosts          => [:edit, :update],
-            :"api/v2/discovered_hosts" => [:update]
-          }, :resource_type => 'Host'
-          permission :edit_discovered_hosts, {
-            :discovered_hosts          => [:update_multiple_location,
-                                           :select_multiple_organization,
-                                           :update_multiple_organization,
-                                           :select_multiple_location,
-                                           :refresh_facts,
-                                           :reboot,
-                                           :multiple_reboot,
-                                           :submit_multiple_reboot],
-            :hosts                     => [:process_hostgroup],
-            :"api/v2/discovered_hosts" => [:refresh_facts, :reboot, :reboot_all]
-          }, :resource_type => 'Host'
+        # settings
+        settings do
+          category :discovery, N_("Discovery") do
+            snippets = Proc.new {
+              Hash[ProvisioningTemplate.where(:template_kind => TemplateKind.find_by_name(:snippet)).map{|template| [template[:name], template[:name]]}]
+            }
+
+            setting "discovery_location",
+              type: :string,
+              collection: Proc.new { Hash[[['', '']].concat Location.all.map{|loc| [loc[:title], loc[:title]]}] },
+              default: "",
+              full_name: N_("Discovery location"),
+              description: N_("The default location to place discovered hosts in")
+
+            setting "discovery_organization",
+              type: :string,
+              collection: Proc.new { Hash[[['', '']].concat Organization.all.map{|org| [org[:title], org[:title]]}] },
+              default: "",
+              full_name: N_("Discovery location"),
+              description: N_("The default location to place discovered hosts in")
+
+            setting "discovery_fact",
+              type: :string,
+              default: "discovery_bootif",
+              full_name: N_("Interface fact"),
+              description: N_("Fact name to use for primary interface detection")
+
+            setting "discovery_auto_bond",
+              type: :boolean,
+              default: false,
+              full_name: N_("Create bond interfaces"),
+              description: N_("Automatic bond interface (if another interface is detected on the same VLAN via LLDP)")
+
+            setting "discovery_clean_facts",
+              type: :boolean,
+              default: false,
+              full_name: N_("Clean all facts"),
+              description: N_("Clean all reported facts during provisioning (except discovery facts)")
+
+            setting "discovery_hostname",
+              type: :string,
+              default: "discovery_bootif",
+              full_name: N_("Hostname facts"),
+              description: N_("List of facts to use for the hostname (separated by comma, first wins)")
+
+            validates "discovery_hostname", presence: true
+
+            setting "discovery_auto",
+              type: :boolean,
+              default: false,
+              full_name: N_("Auto provisioning"),
+              description: N_("Automatically provision newly discovered hosts, according to the provisioning rules")
+
+            setting "discovery_reboot",
+              type: :boolean,
+              default: true,
+              full_name: N_("Reboot"),
+              description: N_("Automatically reboot or kexec discovered host during provisioning")
+
+            setting "discovery_prefix",
+              type: :string,
+              default: "mac",
+              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: :string,
+              default: "",
+              full_name: N_("Fact columns"),
+              description: N_("Extra facter columns to show in host lists (separate by comma)")
+
+            setting "discovery_facts_highlights",
+              type: :string,
+              default: "",
+              full_name: N_("Highlighted facts"),
+              description: N_("Regex to organize facts for highlights section - e.g. ^(abc|cde)$")
+
+            setting "discovery_facts_storage",
+              type: :string,
+              default: "",
+              full_name: N_("Storage facts"),
+              description: N_("Regex to organize facts for storage section")
+
+            setting "discovery_facts_software",
+              type: :string,
+              default: "",
+              full_name: N_("Software facts"),
+              description: N_("Regex to organize facts for software section")
+
+            setting "discovery_facts_hardware",
+              type: :string,
+              default: "",
+              full_name: N_("Hardware facts"),
+              description: N_("Regex to organize facts for hardware section")
+
+            setting "discovery_facts_network",
+              type: :string,
+              default: "",
+              full_name: N_("Network facts"),
+              description: N_("Regex to organize facts for network section")
+
+            setting "discovery_facts_ipmi",
+              type: :string,
+              default: "",
+              full_name: N_("IPMI facts"),
+              description: N_("Regex to organize facts for ipmi section")
+
+            setting "discovery_lock",
+              type: :boolean,
+              default: false,
+              full_name: N_("Lock PXE"),
+              description: N_("Automatically generate PXE configuration to pin a newly discovered host to discovery")
+
+            setting "discovery_pxelinux_lock_template",
+              type: :string,
+              collection: snippets,
+              default: "pxelinux_discovery",
+              full_name: N_("Locked PXELinux template name"),
+              description: N_("PXELinux template to be used when pinning a host to discovery")
+
+            setting "discovery_pxegrub_lock_template",
+              type: :string,
+              collection: snippets,
+              default: "pxegrub_discovery",
+              full_name: N_("Locked PXEGrub template name"),
+              description: N_("PXEGrub template to be used when pinning a host to discovery")
+
+            setting "discovery_pxegrub2_lock_template",
+              type: :string,
+              collection: snippets,
+              default: "pxegrub2_discovery",
+              full_name: N_("Locked PXEGrub2 template name"),
+              description: N_("PXEGrub2 template to be used when pinning a host to discovery")
+
+            setting "discovery_always_rebuild_dns",
+              type: :boolean,
+              default: true,
+              full_name: N_("Force DNS"),
+              description: N_("Force DNS entries creation when provisioning discovered host")
+
+            setting "discovery_error_on_existing",
+              type: :boolean,
+              default: false,
+              full_name: N_("Error on existing NIC"),
+              description: N_("Do not allow to discover existing managed host matching MAC of a provisioning NIC (errors out early)")
+
+            setting "discovery_naming",
+              type: :string,
+              collection: Proc.new { ::Host::Discovered::NAMING_PATTERNS },
+              default: "Fact",
+              full_name: N_("Type of name generator"),
+              description: N_("Discovery hostname naming pattern")
+
+            setting "discovery_prefer_ipv6",
+              type: :boolean,
+              default: false,
+              full_name: N_("Prefer IPv6"),
+              description: N_("Prefer IPv6 to IPv4 when calling discovered nodes")
+            end
+          end
+
+          # discovered hosts permissions
+          security_block :discovery do
+            permission :view_discovered_hosts, {
+              :discovered_hosts          => [:index, :show, :auto_complete_search, :welcome],
+              :"api/v2/discovered_hosts" => [:index, :show],
+              :'discovered_hosts/react' => [:index]
+            }, :resource_type => 'Host'
+            permission :submit_discovered_hosts, {
+              :"api/v2/discovered_hosts" => [:facts, :create]
+            }, :resource_type => 'Host'
+            permission :auto_provision_discovered_hosts, {
+              :discovered_hosts          => [:auto_provision,
+                                             :multiple_auto_provision,
+                                             :submit_multiple_auto_provision],
+                                             :"api/v2/discovered_hosts" => [:auto_provision, :auto_provision_all]
+            }, :resource_type => 'Host'
+            permission :provision_discovered_hosts, {
+              :discovered_hosts          => [:edit, :update],
+              :"api/v2/discovered_hosts" => [:update]
+            }, :resource_type => 'Host'
+            permission :edit_discovered_hosts, {
+              :discovered_hosts          => [:update_multiple_location,
+                                             :select_multiple_organization,
+                                             :update_multiple_organization,
+                                             :select_multiple_location,
+                                             :refresh_facts,
+                                             :reboot,
+                                             :multiple_reboot,
+                                             :submit_multiple_reboot],
+                                             :hosts                     => [:process_hostgroup],
+                                             :"api/v2/discovered_hosts" => [:refresh_facts, :reboot, :reboot_all]
+            }, :resource_type => 'Host'
           permission :destroy_discovered_hosts, {
             :discovered_hosts          => [:destroy, :submit_multiple_destroy, :multiple_destroy],
             :"api/v2/discovered_hosts" => [:destroy]

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "21.0.0"
+  VERSION = "21.0.1"
 end

data/package.json

@@ -21,16 +21,14 @@
     "url": "http://projects.theforeman.org/projects/foreman_discovery/issues"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^6.0.0"
+    "@theforeman/vendor": ">= 0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^6.0.0",
-    "@theforeman/eslint-plugin-foreman": "^6.0.0",
-    "@theforeman/stories": "^7.0.0",
-    "@theforeman/test": "^8.0.0",
-    "@theforeman/vendor-dev": "^6.0.0",
-    "babel-eslint": "^10.0.3",
+    "@theforeman/builder": ">= 0",
+    "@theforeman/eslint-plugin-foreman": ">= 0",
+    "@theforeman/stories": ">= 0",
+    "@theforeman/test": ">= 0",
     "eslint": "^6.7.2",
     "prettier": "^1.19.1",
     "stylelint": "^9.3.0",

data/test/unit/managed_extensions_test.rb

@@ -91,7 +91,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
 
     test "kexec template is correctly rendered" do
       expected = {
-        "append" => "inst.ks=http://foreman.some.host.fqdn/unattended/provision&static=yes inst.ks.sendmac ip=::::::none nameserver= ksdevice=bootif BOOTIF= nomodeset nokaslr nomodeset",
+        "append" => "inst.ks=http://foreman.example.com/unattended/provision&static=yes inst.ks.sendmac ip=::::::none nameserver= ksdevice=bootif BOOTIF= nomodeset nokaslr nomodeset",
         "extra" => []
       }
       assert @host.operatingsystem.respond_to?(:pxe_type)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 21.0.0
+  version: 21.0.1
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -76,7 +76,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -203,51 +203,35 @@ files:
 - lib/foreman_discovery/engine.rb
 - lib/foreman_discovery/version.rb
 - locale/ca/LC_MESSAGES/foreman_discovery.mo
-- locale/ca/foreman_discovery.edit.po
 - locale/ca/foreman_discovery.po
 - locale/de/LC_MESSAGES/foreman_discovery.mo
-- locale/de/foreman_discovery.edit.po
 - locale/de/foreman_discovery.po
 - locale/en/LC_MESSAGES/foreman_discovery.mo
-- locale/en/foreman_discovery.edit.po
 - locale/en/foreman_discovery.po
 - locale/en_GB/LC_MESSAGES/foreman_discovery.mo
-- locale/en_GB/foreman_discovery.edit.po
 - locale/en_GB/foreman_discovery.po
 - locale/es/LC_MESSAGES/foreman_discovery.mo
-- locale/es/foreman_discovery.edit.po
 - locale/es/foreman_discovery.po
 - locale/foreman_discovery.pot
 - locale/fr/LC_MESSAGES/foreman_discovery.mo
-- locale/fr/foreman_discovery.edit.po
 - locale/fr/foreman_discovery.po
 - locale/gl/LC_MESSAGES/foreman_discovery.mo
-- locale/gl/foreman_discovery.edit.po
 - locale/gl/foreman_discovery.po
 - locale/it/LC_MESSAGES/foreman_discovery.mo
-- locale/it/foreman_discovery.edit.po
 - locale/it/foreman_discovery.po
 - locale/ja/LC_MESSAGES/foreman_discovery.mo
-- locale/ja/foreman_discovery.edit.po
 - locale/ja/foreman_discovery.po
 - locale/ko/LC_MESSAGES/foreman_discovery.mo
-- locale/ko/foreman_discovery.edit.po
 - locale/ko/foreman_discovery.po
-- locale/messages.mo
 - locale/pt_BR/LC_MESSAGES/foreman_discovery.mo
-- locale/pt_BR/foreman_discovery.edit.po
 - locale/pt_BR/foreman_discovery.po
 - locale/ru/LC_MESSAGES/foreman_discovery.mo
-- locale/ru/foreman_discovery.edit.po
 - locale/ru/foreman_discovery.po
 - locale/sv_SE/LC_MESSAGES/foreman_discovery.mo
-- locale/sv_SE/foreman_discovery.edit.po
 - locale/sv_SE/foreman_discovery.po
 - locale/zh_CN/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_CN/foreman_discovery.edit.po
 - locale/zh_CN/foreman_discovery.po
 - locale/zh_TW/LC_MESSAGES/foreman_discovery.mo
-- locale/zh_TW/foreman_discovery.edit.po
 - locale/zh_TW/foreman_discovery.po
 - package.json
 - test/factories/discovery_host_related.rb
@@ -327,17 +311,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
 - test/factories/discovery_host_related.rb
 - test/factories/discovery_rule_related.rb
+- test/facts/bond0-eth0-eth1-active-passive.json
 - test/facts/default.json
 - test/facts/dell_npars.json
 - test/facts/dell_vlan.json
 - test/facts/facts_with_lldp.json
+- test/facts/facts_with_lldp_bond_candidate.json
 - test/facts/pxeless-vlan.json
 - test/facts/regular_host.json
 - test/facts/rhel-dl380-1kdisks.json
@@ -346,27 +332,25 @@ test_files:
 - test/facts/simple-bond.json
 - test/facts/suse-vmware.json
 - test/facts/vmware_local.json
-- test/facts/bond0-eth0-eth1-active-passive.json
-- test/facts/facts_with_lldp_bond_candidate.json
 - test/facts/only-ipv6.json
 - test/facts/skylake-ipv6.json
 - test/functional/api/v2/discovery_rules_controller_test.rb
 - test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb
 - test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
-- test/functional/discovery_rules_controller_test.rb
 - test/functional/discovered_hosts_controller_test.rb
+- test/functional/discovery_rules_controller_test.rb
 - 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_mailer_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/lldp_neighbors_test.rb
-- test/unit/discovery_rule_test.rb
-- test/unit/fact_to_category_resolver_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/discovery_attribute_set_test.rb
+- test/unit/discovery_rule_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/discovered_extensions_test.rb
+- test/unit/fact_to_category_resolver_test.rb
 - test/unit/host_discovered_test.rb
 - test/unit/managed_extensions_test.rb
 - test/test_helper_discovery.rb