foreman_discovery 15.0.2 → 16.2.0

data/test/unit/discovery_attribute_set_test.rb

@@ -14,6 +14,7 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
                        :name => 'discovery_prefix',
                        :value => 'mac',
                        :category => 'Setting::Discovered')
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   test "can search discovered hosts by cpu" do
@@ -41,15 +42,17 @@ class DiscoveryAttributeSetTest < ActiveSupport::TestCase
   end
 
   test "can search discovered hosts by disks_size" do
-    excluded = Setting[:excluded_facts]
-    Setting[:excluded_facts] = ["test"]
-    host = discover_host_from_facts(@facts)
-    disks_size = (host.facts_hash['blockdevice_sda_size'].to_f / 1024 / 1024).ceil
-    results = Host::Discovered.unscoped.search_for("disks_size = #{disks_size}")
-    assert_equal 1, results.count
-    results = Host::Discovered.unscoped.search_for("disks_size > #{disks_size}")
-    assert_equal 0, results.count
-  ensure
-    Setting[:excluded_facts] = excluded
+    begin
+      excluded = Setting[:excluded_facts]
+      Setting[:excluded_facts] = ["test"]
+      host = discover_host_from_facts(@facts)
+      disks_size = (host.facts_hash['blockdevice_sda_size'].to_f / 1024 / 1024).ceil
+      results = Host::Discovered.unscoped.search_for("disks_size = #{disks_size}")
+      assert_equal 1, results.count
+      results = Host::Discovered.unscoped.search_for("disks_size > #{disks_size}")
+      assert_equal 0, results.count
+    ensure
+      Setting[:excluded_facts] = excluded
+    end
   end
 end

data/test/unit/discovery_rule_test.rb

@@ -3,6 +3,7 @@ require_relative '../test_plugin_helper'
 class DiscoveryRuleTest < ActiveSupport::TestCase
   setup do
     @hostgroup = FactoryBot.create(:hostgroup)
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   should allow_values(*valid_name_list).for(:name)

data/test/unit/host_discovered_test.rb

@@ -7,6 +7,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   setup do
     @facts = parse_json_fixture('regular_host', true)
     set_default_settings
+    ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
   end
 
   test "should be able to create Host::Discovered objects" do
@@ -38,9 +39,20 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     assert_equal discovered_host.id, fact_value.host.id
   end
 
+  test "should detect bridge as the primary" do
+    # Detected primary should be the bridge (.2)
+    # "ipaddress_br180": "10.35.27.2"
+    # "ipaddress_eth0": "10.35.27.3"
+    # "ipaddress": "10.35.27.2"
+    subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
+    host = discover_host_from_facts(@facts)
+    assert_equal '10.35.27.2', host.primary_interface.ip
+  end
+
   test "should setup subnet" do
     subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
-    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
@@ -48,7 +60,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
   test "should setup subnet when update_subnets_from_facts is true" do
     Setting[:update_subnets_from_facts] = true
     subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [organization_one], :locations => [location_one])
-    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
   end
@@ -59,7 +71,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     Setting['discovery_organization'] = org.name
     Setting['discovery_location'] = loc.name
     subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
-    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
     assert_equal org, host.organization
@@ -74,7 +86,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     Setting['discovery_organization'] = nil
     Setting['discovery_location'] = nil
     subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org, org2], :locations => [loc, loc2])
-    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal subnet, host.primary_interface.subnet
     assert host.organization
@@ -92,7 +104,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       Setting['discovery_organization'] = org.name
       Setting['discovery_location'] = loc.name
       subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
-      Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+      Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
       host = discover_host_from_facts(@facts.merge("test_org" => bad_org.title, "test_loc" => bad_loc.title))
       assert_equal subnet, host.primary_interface.subnet
       assert_equal org, host.organization
@@ -111,7 +123,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     Setting['discovery_organization'] = org.name
     Setting['discovery_location'] = loc.name
     subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org, bad_org], :locations => [loc, bad_loc])
-    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts.merge("foreman_organization" => bad_org.title, "foreman_location" => bad_loc.title))
     assert_equal subnet, host.primary_interface.subnet
     assert_equal org, host.organization
@@ -129,7 +141,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
       Setting['discovery_organization'] = org.name
       Setting['discovery_location'] = loc.name
       subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org, bad_org], :locations => [loc, bad_loc])
-      Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+      Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
       host = discover_host_from_facts(@facts)
       assert_equal subnet, host.primary_interface.subnet
       assert_equal org, host.organization
@@ -148,7 +160,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     Setting['discovery_organization'] = org.name
     Setting['discovery_location'] = loc.name
     subnet = FactoryBot.create(:subnet_ipv4, :name => 'Subnet99', :network => '10.35.27.0', :organizations => [org], :locations => [loc])
-    Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+    Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
     host = discover_host_from_facts(@facts)
     assert_equal org, host.organization
     assert_equal loc, host.location
@@ -188,7 +200,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
                                   :organizations => [organization_one],
                                   :locations => [location_one]
       )
-      Subnet.expects(:subnet_for).with('10.35.27.3').returns(subnet)
+      Subnet.expects(:subnet_for).with('10.35.27.2').returns(subnet)
       ProxyAPI::TFTP.any_instance.expects(:set).with(anything, 'e4:1f:13:cc:36:58', anything).returns(true).times(3)
       TemplateKind::PXE.each do |kind|
         ProvisioningTemplate.where(:name => "#{kind.downcase}_discovery").first_or_create(
@@ -248,25 +260,19 @@ 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
     assert_equal 'IBM System x -[7870K4G]-', host1.facts["productname"]
     assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count
-    assert_equal '10.35.27.3', host1.ip
+    assert_equal '10.35.27.2', host1.ip
 
     @facts["ipaddress_eth0"] = "1.2.3.4"
     @facts["productname"] = "Dishwasher DW400"
     host2 = discover_host_from_facts(@facts)
     assert_equal 'mace41f13cc3658', host2.name
     assert_equal 'Dishwasher DW400', host2.facts["productname"]
-    assert_equal '1.2.3.4', host2.ip
+    assert_equal '10.35.27.2', host2.ip
     assert_equal 1, Host::Discovered.where(:name => 'mace41f13cc3658').count
   end
 
@@ -278,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)
@@ -438,12 +434,19 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     end
   end
 
+  test "primary interface via tagged VLAN is discovered with an IP" do
+    raw = parse_json_fixture('rhel7-vlan')
+    host = discover_host_from_facts(raw)
+    assert_equal "192.168.1.16", host.ip
+    assert_equal "eno49.444", host.primary_interface.identifier
+  end
+
   test "primary interface isn't touched with no LLDP facts" do
     Setting[:discovery_auto_bond] = true
     raw = parse_json_fixture('regular_host', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
-    assert_equal "eth0", host.primary_interface.identifier
+    assert_equal "br180", host.primary_interface.identifier
   end
 
   test "provision_interface isn't touched with no peer on the same VLAN" do
@@ -451,7 +454,7 @@ class HostDiscoveredTest < ActiveSupport::TestCase
     raw = parse_json_fixture('facts_with_lldp', true)
     host = discover_host_from_facts(raw)
     refute_nil host.primary_interface
-    assert_equal "eth0", host.primary_interface.identifier
+    assert_equal "br180", host.primary_interface.identifier
   end
 
   test "provision_interface is switched to bond0 with more than one interface on the same VLAN" do

data/test/unit/managed_extensions_test.rb

@@ -18,6 +18,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
 
       @host = StubHost.new
       @host.type = "Host::Discovered"
+      @host.stubs(:ip).returns("192.168.1.1")
       @host.stubs(:old).returns(@host)
       @facts = {}
       @host.stubs(:facts).returns(@facts)
@@ -30,6 +31,7 @@ class ManagedExtensionsTest < ActiveSupport::TestCase
       @host.stubs(:medium).returns('http://a_medium')
       @host.stubs(:architecture).returns(FactoryBot.create(:architecture))
       ::MediumProviders::Default.any_instance.stubs(:validate).returns([])
+      ::ForemanDiscovery::HostConverter.stubs(:unused_ip_for_host)
     end
 
     test "queue_reboot enques reboot command when there is no kexec fact" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 15.0.2
+  version: 16.2.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -9,6 +9,7 @@ authors:
 - Alon Goldboim
 - amirfefer
 - Amit Karsale
+- Amit Upadhye
 - Amos Benari
 - Avi Sharvit
 - Bryan Kearney
@@ -34,6 +35,7 @@ authors:
 - kgaikwad
 - Lars Berntzon
 - ldjebran
+- Leos Stejskal
 - Lukas Zapletal
 - Lukáš Zapletal
 - Marek Hulan
@@ -45,6 +47,7 @@ authors:
 - odovzhenko
 - Ohad Levy
 - Ondrej Prazak
+- Ondřej Ezr
 - Ori Rabin
 - orrabin
 - Partha Aji
@@ -68,7 +71,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-01 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
@@ -103,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
@@ -114,6 +118,7 @@ files:
 - app/services/foreman_discovery/node_api/node_resource.rb
 - app/services/foreman_discovery/node_api/power.rb
 - app/services/foreman_discovery/node_api/power_service.rb
+- app/services/foreman_discovery/subnet_suggestion.rb
 - app/services/foreman_discovery/ui_notifications/destroy_host.rb
 - app/services/foreman_discovery/ui_notifications/new_host.rb
 - app/views/api/v2/discovered_hosts/base.json.rabl
@@ -234,17 +239,20 @@ files:
 - locale/zh_TW/foreman_discovery.po
 - 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/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
@@ -289,46 +297,49 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: MaaS Discovery Plugin for Foreman
 test_files:
-- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
-- test/functional/discovered_hosts_controller_test.rb
-- test/functional/api/v2/discovered_hosts_controller_test.rb
-- test/functional/api/v2/fact_value_extensions_test.rb
-- test/functional/api/v2/settings_controller_test.rb
-- test/functional/api/v2/discovery_rules_controller_test.rb
-- test/functional/discovery_rules_controller_test.rb
-- test/integration/discovered_hosts_test.rb
-- test/test_plugin_helper.rb
-- test/facts/facts_with_lldp.json
-- test/facts/dell_vlan.json
-- test/facts/simple-bond.json
-- test/facts/rhel-r730.json
+- 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/facts_with_lldp_bond_candidate.json
-- test/facts/rhel7-vlan.json
-- test/facts/default.json
 - test/facts/rhel-dl380-1kdisks.json
+- test/facts/rhel-r730.json
+- test/facts/rhel7-vlan.json
+- 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
+- test/functional/api/v2/settings_controller_test.rb
+- test/functional/discovery_rules_controller_test.rb
+- test/functional/foreman_discovery/concerns/hosts_controller_extensions_test.rb
+- test/functional/discovered_hosts_controller_test.rb
+- test/integration/discovered_hosts_test.rb
+- test/models/setting_test.rb
+- test/test_helper_discovery.rb
+- test/test_plugin_helper.rb
+- test/unit/discovered_mailer_test.rb
+- test/unit/discovery_attribute_set_test.rb
 - test/unit/discovery_rule_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
-- test/unit/discovered_mailer_test.rb
 - test/unit/fact_parser_test.rb
-- test/unit/discovered_extensions_test.rb
-- test/unit/setting_discovered_test.rb
-- test/unit/host_discovered_test.rb
 - test/unit/lldp_neighbors_test.rb
+- test/unit/setting_discovered_test.rb
 - test/unit/ui_notifications/destroy_host_test.rb
 - test/unit/ui_notifications/new_host_test.rb
-- test/unit/discovery_attribute_set_test.rb
+- test/unit/host_discovered_test.rb
+- test/unit/discovered_extensions_test.rb
 - test/unit/managed_extensions_test.rb
-- test/models/setting_test.rb
-- test/test_helper_discovery.rb
-- test/factories/discovery_rule_related.rb
-- test/factories/discovery_host_related.rb