foreman_discovery 16.1.2 → 16.2.0

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

@@ -6,10 +6,10 @@ class Api::V2::SettingsControllerTest < ActionController::TestCase
   end
 
   test_attributes :pid => '2c5ecb7e-87bc-4980-9620-7ae00e3f360e'
-  test "should update hostname prefix without value" do
+  test "should not update hostname prefix without value" do
     setting = Setting.find_by_name("discovery_prefix")
     put :update, params: { :id => setting.id, :setting => { :value => '' } }
-    assert_equal JSON.parse(@response.body)['value'], '', "Can't update discovery_prefix setting with empty value"
+    assert_nil JSON.parse(@response.body)['value']
   end
 
   test_attributes :pid => '4969994d-f934-4f0e-9a98-476b87eb0527'

data/test/unit/host_discovered_test.rb

@@ -260,12 +260,6 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal 'teste41f13cc3658', host.name
   end
 
-  test "should create discovered host without prefix" do
-    Setting[:discovery_prefix] = ''
-    host = discover_host_from_facts(@facts)
-    assert_equal 'e41f13cc3658',host.name
-  end
-
   test "should refresh facts and NICs of an existing discovered host" do
     host1 = discover_host_from_facts(@facts)
     assert_equal 'mace41f13cc3658', host1.name
@@ -290,16 +284,6 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_match(/Invalid facts: hash does not contain a valid value for any of the facts in the discovery_hostname setting:/, exception.message)
   end
 
-  test "should raise when hostname cannot be computed due to normlization and no prefix" do
-    @facts['invalidhostnamefact'] = '...'
-    Setting[:discovery_hostname] = 'invalidhostnamefact'
-    Setting[:discovery_prefix] = ''
-    exception = assert_raises(::Foreman::Exception) do
-      discover_host_from_facts(@facts)
-    end
-    assert_match(/Invalid hostname: Could not normalize the hostname/, exception.message)
-  end
-
   test 'discovered host can be searched in multiple taxonomies' do
     org1 = FactoryBot.create(:organization)
     org2 = FactoryBot.create(:organization)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 16.1.2
+  version: 16.2.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -71,7 +71,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-09-16 00:00:00.000000000 Z
 dependencies: []
 description: MaaS Discovery Plugin engine for Foreman
 email: gsutclif@redhat.com
@@ -106,6 +106,7 @@ files:
 - app/models/setting/discovered.rb
 - app/services/foreman_discovery/fact_parser.rb
 - app/services/foreman_discovery/host_converter.rb
+- app/services/foreman_discovery/host_fact_importer.rb
 - app/services/foreman_discovery/import_hook.rb
 - app/services/foreman_discovery/import_hook_service.rb
 - app/services/foreman_discovery/import_hooks/discovery_attribute.rb
@@ -244,12 +245,14 @@ files:
 - test/facts/dell_vlan.json
 - test/facts/facts_with_lldp.json
 - test/facts/facts_with_lldp_bond_candidate.json
+- test/facts/only-ipv6.json
 - test/facts/pxeless-vlan.json
 - test/facts/regular_host.json
 - test/facts/rhel-dl380-1kdisks.json
 - test/facts/rhel-r730.json
 - test/facts/rhel7-vlan.json
 - test/facts/simple-bond.json
+- test/facts/skylake-ipv6.json
 - test/facts/suse-vmware.json
 - test/facts/vmware_local.json
 - test/functional/api/v2/discovered_hosts_controller_test.rb
@@ -315,6 +318,8 @@ test_files:
 - test/facts/simple-bond.json
 - test/facts/suse-vmware.json
 - test/facts/vmware_local.json
+- test/facts/only-ipv6.json
+- test/facts/skylake-ipv6.json
 - test/functional/api/v2/discovered_hosts_controller_test.rb
 - test/functional/api/v2/discovery_rules_controller_test.rb
 - test/functional/api/v2/fact_value_extensions_test.rb