foreman_discovery 26.1.1 → 26.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 798557f5da1b5389707a24374695e2b3b2e15558b573f1a46531c99f75a0457f
-  data.tar.gz: 9cc87937026166f919566bffb7c583c983d00db8474af9929ddc6a225456e4e4
+  metadata.gz: 6112ecd76ae40ea9268e05f91f16c0b69de5674281e8912536450e5b8ab19a38
+  data.tar.gz: bcef41d260a1474a25847b342a49f091a1295192f9b48adee255ca7703c0c4e3
 SHA512:
-  metadata.gz: 12fb499ba6dbad59e154c811e7f4181d622d767a1fc106bfa90fab8b27af0d64c5495eea5ca5717b590b69fd99c229679ce82b9f25e6960622339198110ddaa7
-  data.tar.gz: 757769807266f12bd5691dcee33f7c2b2e6d7294cbf9952a5f45a005651263e701a01f4c1e100cfa04f37b6a1b450712ea2fb86129d506235959d2c6c0f29476
+  metadata.gz: dce53b728b4203c75b59afbcff27b98169042dbee6c2e9ab12d25e3ddf18d89105ea8ddcef49fe1324712de97a8987fe3baecb5bd9c549c657896bf9ab3b3819
+  data.tar.gz: 89919e7074fdb7d484d861940ae3f6dbc249443471594cdc8d239b301c08a29b7f9e38c1d427568f04d1a07c4aa59e5112fb53aa18cca5c0c06c7c59473a581f

data/app/controllers/foreman_discovery/concerns/hosts_controller_extensions.rb

@@ -2,7 +2,7 @@ module ForemanDiscovery
   module Concerns
     module HostsControllerExtensions
       extend ActiveSupport::Concern
-      included do
+      prepended do
         before_action :set_discovered_params
       end
 
@@ -13,6 +13,12 @@ module ForemanDiscovery
         return if params[:discovered_host].nil?
         params[:host] ||= params.delete(:discovered_host)
       end
+
+      def host_for_template_used
+        super
+
+        @host = ::ForemanDiscovery::HostConverter.to_managed(@host, true, false, host_params) if @host.is_a?(Host::Discovered)
+      end
     end
   end
 end

data/lib/foreman_discovery/engine.rb

@@ -347,7 +347,7 @@ module ForemanDiscovery
       ::Nic::Managed.send :include, Nic::ManagedExtensions
 
       # Controller extensions
-      ::HostsController.send :include, ForemanDiscovery::Concerns::HostsControllerExtensions
+      ::HostsController.send :prepend, ForemanDiscovery::Concerns::HostsControllerExtensions
       ::Api::V2::FactValuesController.send :include, Api::V2::FactValuesControllerExtensions
 
       Foreman::Plugin.fact_importer_registry.register(:foreman_discovery, DiscoveryFactImporter)

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "26.1.1"
+  VERSION = "26.1.2"
 end

data/test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb

@@ -18,6 +18,38 @@ module ForemanDiscovery
           assert_match(/"#{os.id}"/, response.body)
         end
       end
+
+      describe 'template_used' do
+        include FactImporterIsolation
+        allow_transactions_for_any_importer
+
+        setup do
+          @facts = {
+            "interfaces" => "lo,eth0",
+            "ipaddress" => "192.168.100.42",
+            "ipaddress_eth0" => "192.168.100.42",
+            "macaddress_eth0" => "AA:BB:CC:DD:EE:FF",
+            "discovery_bootif" => "AA:BB:CC:DD:EE:FF",
+            "physicalprocessorcount" => "42",
+            "discovery_version" => "3.0.0",
+          }
+        end
+
+        test 'converts the discovered host to a managed host' do
+          host = discover_host_from_facts(@facts)
+          params = {
+            id: host.id,
+            host: {
+              architecture_id: architectures(:x86_64).id, # rubocop:disable Naming/VariableNumber
+              operatingsystem_id: operatingsystems(:redhat).id,
+            }
+          }
+          get :template_used, params: params, session: set_session_user
+
+          assert_response :success
+          assert_instance_of Host::Managed, assigns(:host)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 26.1.1
+  version: 26.1.2
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -329,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files: