foreman_discovery 18.0.0 → 18.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e5ed6f9be99d08e38902acdbfff3e02aa7b086415cc6c8208a446ad8195fe18
-  data.tar.gz: cebfddeec98ce1ce01778dbe3c94fa1581132462a01e5ee04c2f78a6812a8c02
+  metadata.gz: 1a6708c354c29e3e5f53cf0368d5e3fbaa2b478a61f54c8fd93a321e24f45df7
+  data.tar.gz: f1ba15c2d1c069dd694ec9356765c78eb58b8b1fb9b41f28d5d33722c074017b
 SHA512:
-  metadata.gz: 42a2c9cfe529fbf8e22c11ce4b7260ae6bd61d0005688b5b50199c6c7e2a432cbe8a99b1a4fd1f94757246892fa60426181382dd6de874bfe0d495d1e98b140c
-  data.tar.gz: 5a151a76f41f68258a90154209c81e2fa3a16dc6049191269d8b261dca51d9c5ed536ad7c18180079d9186c58a80ed145640541bbd2534f6c666a78aea407cc8
+  metadata.gz: 910af2e79a1ddde6022df9a851eabc357da0f79e2d7bae2c1106c8413cab21b70dd9a1e6b0f5c66ecedb2c39a3a768f19f071962b9d28a46e66556489f374fe0
+  data.tar.gz: ff026ad7368f99a13e847263771c8f5e53ae6f9ee756b52d2ea3cb51b61219f6184f2600d216c534fe74c8c19dcb807e8c146881083c78a98adecb5a4ad74eb3

data/app/controllers/concerns/foreman/controller/parameters/discovered_host.rb

@@ -1,6 +1,9 @@
 module Foreman::Controller::Parameters::DiscoveredHost
   extend ActiveSupport::Concern
   include Foreman::Controller::Parameters::Host
+  if defined?(ForemanPuppet)
+    include ForemanPuppet::Extensions::ParametersHost
+  end
 
   class_methods do
     def discovered_host_params_filter
@@ -9,23 +12,32 @@ module Foreman::Controller::Parameters::DiscoveredHost
 
         add_host_base_params_filter(filter)
         add_host_common_params_filter(filter)
+        add_host_puppet_params_filter(filter) if defined?(ForemanPuppet)
       end
     end
   end
 
   def discovered_host_params
-    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def discovered_host_params_host
-    self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+    filtered_params = self.class.discovered_host_params_filter.filter_params(params, parameter_filter_context, :host)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def managed_host_params_host
-    self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context, :host)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 
   def managed_host_params
-    self.class.host_params_filter.filter_params(params, parameter_filter_context)
+    filtered_params = self.class.host_params_filter.filter_params(params, parameter_filter_context)
+    process_deprecated_puppet_params!(filtered_params) if defined?(ForemanPuppet)
+    filtered_params
   end
 end

data/app/controllers/discovered_hosts_controller.rb

@@ -15,7 +15,10 @@ class DiscoveredHostsController < ::ApplicationController
 
   helper :hosts
   if defined?(ForemanPuppet)
+    helper ForemanPuppet::HostsHelper
     helper ForemanPuppet::HostsAndHostgroupsHelper
+    helper ForemanPuppet::PuppetclassesHelper
+    helper ForemanPuppet::PuppetclassLookupKeysHelper
   end
 
   layout 'layouts/application'

data/app/controllers/discovery_rules_controller.rb

@@ -20,7 +20,7 @@ class DiscoveryRulesController < ApplicationController
   end
 
   def clone
-    @discovery_rule = @discovery_rule.deep_clone except: [:name, :priority]
+    @discovery_rule = @discovery_rule.deep_clone except: [:name, :priority], include: [:organizations, :locations]
     @discovery_rule.priority = DiscoveryRule.suggest_priority
   end
 

data/app/services/foreman_discovery/subnet_suggestion.rb

@@ -14,7 +14,14 @@ module ForemanDiscovery
     def call
       return unless ip
 
-      subnet = Subnet.unscoped.subnet_for(ip)
+      begin
+        subnet = Subnet.unscoped.subnet_for(ip)
+      rescue Exception => e
+        Rails.logger.error "Error while detecting subnet for IP #{ip}"
+        Foreman::Logging.exception "Unable to detect subnet", e
+        subnet = nil
+      end
+
       if subnet
         Rails.logger.info "Detected #{kind} subnet: #{subnet} with taxonomy #{subnet.organizations.collect(&:name)}/#{subnet.locations.collect(&:name)}"
       else

data/lib/foreman_discovery/engine.rb

@@ -126,14 +126,12 @@ module ForemanDiscovery
           :assign_locations,
           :view_architectures,
           :view_domains,
-          :view_environments,
           :view_hostgroups,
           :view_media,
           :view_models,
           :view_operatingsystems,
           :view_provisioning_templates,
           :view_ptables,
-          :view_puppetclasses,
           :view_realms,
           :view_smart_proxies,
           :view_subnets,
@@ -149,6 +147,9 @@ module ForemanDiscovery
           :edit_discovery_rules,
           :destroy_discovery_rules,
         ]
+        if defined?(ForemanPuppet::VERSION) 
+          MANAGER += [ :view_environments, :view_puppetclasses ]
+        end
         role "Discovery Reader", READER, "Role granting permissions to view discovered hosts"
         role "Discovery Manager", MANAGER, "Role granting permissions to perform provisioning of discovered hosts"
 

data/lib/foreman_discovery/version.rb

@@ -1,3 +1,3 @@
 module ForemanDiscovery
-  VERSION = "18.0.0"
+  VERSION = "18.0.5"
 end

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

@@ -83,9 +83,11 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     assert_equal hostgroup.medium_id, actual.medium_id
     assert_equal hostgroup.ptable_id, actual.ptable_id
     assert_equal hostgroup.domain_id, actual.domain_id
-    assert_equal hostgroup.environment_id, actual.environment_id
-    assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
-    assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
+    if defined?(ForemanPuppet)
+      assert_equal hostgroup.environment_id, actual.environment_id
+      assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
+      assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
+    end
     assert actual.build?
   end
 

data/test/functional/discovered_hosts_controller_test.rb

@@ -161,9 +161,11 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     assert_equal hostgroup.medium_id, actual.medium_id
     assert_equal hostgroup.ptable_id, actual.ptable_id
     assert_equal hostgroup.domain_id, actual.domain_id
-    assert_equal hostgroup.environment_id, actual.environment_id
-    assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
-    assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
+    if defined?(ForemanPuppet)
+      assert_equal hostgroup.environment_id, actual.environment_id
+      assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
+      assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
+    end
   end
 
   def test_add_entry_to_nav_menu

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 18.0.0
+  version: 18.0.5
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -74,7 +74,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-11-23 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -360,12 +360,12 @@ test_files:
 - test/unit/discovered_mailer_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/lldp_neighbors_test.rb
-- test/unit/host_discovered_test.rb
 - test/unit/discovery_rule_test.rb
 - test/unit/fact_to_category_resolver_test.rb
 - test/unit/managed_extensions_test.rb
+- test/unit/host_discovered_test.rb
+- test/unit/discovered_extensions_test.rb
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/discovered_extensions_test.rb
 - test/test_helper_discovery.rb
 - test/test_plugin_helper.rb